Merge branch 'main' of https://github.com/KNX-IOT/KNX-IOT-Virtual int…

…o build-test # Conflicts: # knx_iot_virtual_pb.c # knx_iot_virtual_sa.c
KNX-IOT · Oct 12, 2023 · dd23296 · dd23296
2 parents d96ee65 + 23b0703
commit dd23296
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 5 deletions.
diff --git a/knx_iot_virtual_pb.c b/knx_iot_virtual_pb.c
@@ -429,7 +429,6 @@ app_init(void)
   /* set the hardware version 0.4.0 */
   oc_core_set_device_hwv(0, 0, 4, 0);
 
-
   /* set the firmware version 0.4.0 */
   oc_core_set_device_fwv(0, 0, 4, 0);
 

diff --git a/knx_iot_virtual_pb.cpp b/knx_iot_virtual_pb.cpp
@@ -915,7 +915,7 @@ void MyFrame::OnAbout(wxCommandEvent& event)
   strcat(text,"model            : KNX virtual - PB\n");
   strcat(text,"hardware type    : LW0001\n");
   strcat(text,"hardware version : [0, 1, 3]\n");
-  strcat(text,"firmware version : [0, 1, 9]\n\n");
+  strcat(text,"firmware version : [0, 2, 0]\n\n");
 
   strcat(text, "data points:\n");
   strcat(text,"url:/p/o_1_1 rt:urn:knx:dpa.421.61 if:if.s inst:1 name:OnOff_1\n");

diff --git a/knx_iot_virtual_sa.c b/knx_iot_virtual_sa.c
@@ -473,11 +473,9 @@ app_init(void)
   /* set the hardware version 0.4.0 */
   oc_core_set_device_hwv(0, 0, 4, 0);
 
-
   /* set the firmware version 0.4.0 */
   oc_core_set_device_fwv(0, 0, 4, 0);
 
-
   /* set the hardware type*/
   //                         123456789012
   oc_core_set_device_hwt(0, "000000000002");

diff --git a/knx_iot_virtual_sa.cpp b/knx_iot_virtual_sa.cpp
@@ -939,7 +939,7 @@ void MyFrame::OnAbout(wxCommandEvent& event)
   strcat(text,"model            : KNX virtual - SA\n");
   strcat(text,"hardware type    : LW0001\n");
   strcat(text,"hardware version : [0, 1, 3]\n");
-  strcat(text,"firmware version : [0, 1, 9]\n\n");
+  strcat(text,"firmware version : [0, 2, 0]\n\n");
 
   strcat(text, "data points:\n");
   strcat(text,"url:/p/o_1_1 rt:urn:knx:dpa.417.61 if:if.a inst:1 name:OnOff_1\n");