Rebuild 1.9 with newest logic and knx stack

OpenKNX · Aug 30, 2023 · 3646f0e · 3646f0e
1 parent 62a32b3
commit 3646f0e
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 11 deletions.
diff --git a/dependencies.txt b/dependencies.txt
diff --git a/platformio.ini b/platformio.ini
@@ -19,14 +19,22 @@ build_flags =
   -D SMALL_GROUPOBJECT
   -D USE_BINSEARCH
   -D ENOCEANGATEWAY
+  -D LOGICMODULE
   -D NO_I2C
   -D MASK_VERSION=0x07B0
   ; use flash directly
   -D KNX_FLASH_SIZE=0x4000
   -D USERDATA_SAVE_SIZE=1004
+  -D OVERRUN_COUNT=31
+  -D EOPR_TIMEOUT=32
   -Wno-unknown-pragmas 
   -Wno-switch
 lib_ldf_mode = deep+
+monitor_speed = 115200
+monitor_filters =
+  time
+extra_scripts = 
+  lib/OAM-LogicModule/show_flash_partitioning.py 
 ; lib_extra_dirs =
 ;   ${PROJECT_DIR}\..
 

diff --git a/src/EnoceanGateway.h b/src/EnoceanGateway.h
@@ -8,6 +8,12 @@
             (time & 0xC000) == 0x8000 ? ((time & 0x3FFF) > 1000 ? 3600000 : \
                                          (time & 0x3FFF) * 3600000 ) : 0 )
 
+#define MAIN_OpenKnxId 0xA2
+#define MAIN_ApplicationNumber 0
+#define MAIN_ApplicationVersion 25
+#define MAIN_ParameterSize 5173
+#define MAIN_MaxKoNumber 469
+#define MAIN_OrderNumber "MFKnxEno"
 // Parameter with single occurrence
 
 
@@ -2295,7 +2301,3 @@
 // GO_BASE_%C%_10
 #define KoENO_GO_BASE__10               (knx.getGroupObject(ENO_KoCalcNumber(ENO_KoGO_BASE__10)))
 
-#define MAIN_OpenKnxId 0xA2
-#define MAIN_ApplicationNumber 0
-#define MAIN_ApplicationVersion 23
-#define MAIN_OrderNumber "MFKnxEno"
diff --git a/src/EnoceanGateway.xml b/src/EnoceanGateway.xml
@@ -12,7 +12,7 @@
         <!-- Each increase of AppliationVersion FORCES the Enduser to update according firmware, too -->
         <!-- If you just want to have a BUGFIX-Update of the ETS-Appliation (without firmware), increase ApplicationVersion AND ApplicationRevision simultaneously -->
         <!-- To sync ETS-Application and firmware again, increase ApplicationVersion AND set ApplicationRevision to 0 -->
-        <op:version OpenKnxId="0xA2" ApplicationNumber="0" ApplicationVersion="23" ReplacesVersions="1 2 4 5 6 7 8 9 16 17 18 19 20 21 22" ApplicationRevision="0" />
+        <op:version OpenKnxId="0xA2" ApplicationNumber="0" ApplicationVersion="25" ReplacesVersions="1 2 4 5 6 7 8 9 16 17 18 19 20 21 22 23 24" ApplicationRevision="0" />
         <ApplicationProgram Id="%AID%" ProgramType="ApplicationProgram" MaskVersion="MV-07B0" Name="KNX-Enocean-Gateway" LoadProcedureStyle="MergedProcedure" PeiType="0" DefaultLanguage="de" DynamicTableManagement="false" Linkable="true" MinEtsVersion="4.0" ApplicationNumber="0" ApplicationVersion="0" ReplacesVersions="0">
           <Static>
             <Code>

diff --git a/src/main.cpp b/src/main.cpp
@@ -49,7 +49,6 @@ void setup()
     digitalWrite(LED_YELLOW_PIN, HIGH);
 #endif
 
-
     // pin or GPIO the programming led is connected to. Default is LED_BUILDIN
     knx.ledPin(PROG_LED_PIN);
     // is the led active on HIGH or low? Default is LOW
@@ -63,17 +62,15 @@ void setup()
     // all MAIN_* parameters are generated by OpenKNXproducer for correct version checking by ETS
     // If you want just a bugfix firmware update without ETS-Application dependency, just increase firmwareRevision.
     // As soon, as you want again a sync between ETS-Application and firmware, set firmwareRevision to 0.
-    const uint8_t firmwareRevision = 5;
+    const uint8_t firmwareRevision = 0;
     OpenKNX::knxRead(MAIN_OpenKnxId, MAIN_ApplicationNumber, MAIN_ApplicationVersion, firmwareRevision);
 
     // print values of parameters if device is already configured
     appSetup();
 
-
     // start the framework.
     knx.start();
 
-
     // start Enocean
     for (int i = 0; i < MAX_NUMBER_OF_DEVICES; i++)
     {
@@ -117,8 +114,8 @@ void loop()
     knx.loop();
 #endif
     // only run the application code if the device was configured with ETS
-#ifdef KNXenable    
+#ifdef KNXenable
     if (knx.configured())
-#endif    
+#endif
         appLoop();
 }