Index: leahi.pro.user =================================================================== diff -u -r7f61f6da0818d40aed3ef528ae498ea3f619ae07 -ra49443eeb1f824a632d50fd876a47a4bee01763d --- leahi.pro.user (.../leahi.pro.user) (revision 7f61f6da0818d40aed3ef528ae498ea3f619ae07) +++ leahi.pro.user (.../leahi.pro.user) (revision a49443eeb1f824a632d50fd876a47a4bee01763d) @@ -1,6 +1,6 @@ - + EnvironmentId @@ -463,46 +463,51 @@ true RemoteLinux.DirectUploadStep - /home/denali/Projects/tmp/build/build-denali-Qt_5_15_10_iMX8-Release/denali - /home/denali/Projects/tmp/build/build-denali-Qt_5_15_10_iMX8-Release/denali /home/denali/Projects/tmp/build/build-denali-Qt_5_15_10_iMX8-Debug/denali /home/denali/Projects/tmp/build/build-denali-Qt_5_15_10_iMX8-Debug/denali /home/denali/Projects/tmp/build/build-denali-Qt_5_15_10_iMX8-Debug/denali - /home/denali/Projects/tmp/build/build-denali-Qt_5_15_10_iMX8-Debug/denali /home/denali/Projects/tmp/build/build-denali-Qt_5_15_10_iMX8-Release/denali /home/denali/Projects/tmp/build/build-denali-Qt_5_15_10_iMX8-Release/denali /home/denali/Projects/tmp/build/build-denali-Qt_5_15_10_iMX8-Debug/denali /home/denali/Projects/tmp/build/build-denali-Qt_5_15_10_iMX8-Debug/denali /home/denali/Projects/tmp/build/build-denali-Qt_5_15_10_iMX8-Debug/denali + /home/denali/Projects/tmp/build/build-denali-Qt_5_15_10_iMX8-Release/denali /home/denali/Projects/tmp/build/build-denali-Qt_5_15_10_iMX8-Debug/denali + /home/denali/Projects/tmp/build/build-denali-Qt_5_15_10_iMX8-Release/denali + /home/denali/Projects/tmp/build/build-denali-Qt_5_15_10_iMX8-Release/denali /home/denali/Projects/tmp/build/build-denali-Qt_5_15_10_iMX8-Debug/denali + /home/denali/Projects/tmp/build/build-denali-Qt_5_15_10_iMX8-Release/denali /home/denali/Projects/tmp/build/build-denali-Qt_5_15_10_iMX8-Debug/denali + /home/denali/Projects/tmp/build/build-denali-Qt_5_15_10_iMX8-Release/denali + /home/denali/Projects/tmp/build/build-denali-Qt_5_15_10_iMX8-Release/denali /home/denali/Projects/tmp/build/build-denali-Qt_5_15_10_iMX8-Debug/denali /home/denali/Projects/tmp/build/build-denali-Qt_5_15_10_iMX8-Release/denali + /home/denali/Projects/tmp/build/build-denali-Qt_5_15_10_iMX8-Release/denali /home/denali/Projects/tmp/build/build-denali-Qt_5_15_10_iMX8-Debug/denali /home/denali/Projects/tmp/build/build-denali-Qt_5_15_10_iMX8-Debug/denali /home/denali/Projects/tmp/build/build-denali-Qt_5_15_10_iMX8-Release/denali + /home/denali/Projects/tmp/build/build-denali-Qt_5_15_10_iMX8-Debug/denali - 192.168.137.170 - 192.168.10.159 - 192.168.137.247 - 192.168.137.202 - 192.168.137.125 - 192.168.137.26 - 192.168.137.170 - 192.168.40.23 - 192.168.137.3 + 192.168.137.210 + 192.168.137.30 + 192.168.10.228 + 192.168.137.36 192.168.10.186 + 192.168.10.138 192.168.137.25 192.168.10.167 192.168.10.228 - 192.168.137.30 - 192.168.137.210 + 192.168.137.3 + 192.168.137.26 + 192.168.137.170 + 192.168.40.23 192.168.10.186 - 192.168.10.138 - 192.168.10.228 - 192.168.137.36 + 192.168.137.170 + 192.168.10.159 + 192.168.137.202 + 192.168.137.125 + 192.168.137.247 /home/root @@ -539,55 +544,53 @@ /opt/b2qt/3.1.18/sysroots /opt/b2qt/3.1.18/sysroots /opt/b2qt/3.1.18/sysroots + /opt/b2qt/3.1.18/sysroots/x86_64-pokysdk-linux + /opt/b2qt/3.1.18/sysroots/x86_64-pokysdk-linux /opt/b2qt/3.1.18/sysroots /opt/b2qt/3.1.18/sysroots /opt/b2qt/3.1.18/sysroots - /opt/b2qt/3.1.18/sysroots - /opt/b2qt/3.1.18/sysroots - /opt/b2qt/3.1.18/sysroots/x86_64-pokysdk-linux - /opt/b2qt/3.1.18/sysroots/x86_64-pokysdk-linux - 2023-01-27T10:15:15.423 - 2023-01-24T18:19:13.179 - 2023-02-02T02:26:33.738 - 2023-02-02T01:46:50.167 - 2023-02-02T02:07:25.922 + 2023-02-02T01:52:20.307 + 2023-02-02T02:30:48.337 + 2023-01-17T18:18:03.749 + 2023-02-01T03:23:15.710 + 2023-01-18T17:47:08.797 + 2023-02-02T09:06:00.862 + 2023-02-02T02:13:54.596 + 2023-02-02T19:40:15.813 + 2023-01-17T18:06:25.579 + 2023-02-02T02:40:56.627 2023-02-01T05:00:56.449 2023-01-27T09:45:11.898 2023-01-24T17:29:54.849 - 2023-02-02T02:40:56.627 2023-01-18T20:13:36.296 - 2023-02-02T02:13:54.596 - 2023-02-02T19:40:15.813 - 2023-01-17T18:06:25.579 - 2023-02-02T02:30:48.337 - 2023-02-02T01:52:20.307 - 2023-01-18T17:47:08.797 - 2023-02-01T03:23:15.710 - 2023-01-17T18:18:03.749 - 2023-02-01T03:23:15.710 + 2023-01-27T10:15:15.423 + 2023-01-24T18:19:13.179 + 2023-02-02T01:46:50.167 + 2023-02-02T02:07:25.922 + 2023-02-02T02:26:33.738 - 2023-01-27T10:15:08.000 - 2023-01-24T18:18:58.000 - 2023-02-02T02:26:46.000 - 2023-02-02T01:47:02.000 - 2023-02-02T02:07:21.000 + 2023-02-02T01:52:16.000 + 2023-02-02T02:31:01.000 + 2023-01-17T18:17:25.000 + 2023-02-01T03:23:28.000 + 2023-01-18T17:47:04.000 + 2023-02-02T09:05:22.000 + 2023-02-02T02:14:08.000 + 2023-02-02T19:39:36.000 + 2023-01-17T18:05:42.000 + 2023-02-02T02:41:10.000 2023-02-01T05:00:51.000 2023-01-27T09:44:58.000 2023-01-24T17:30:03.000 - 2023-02-02T02:41:10.000 2023-01-18T20:13:33.000 - 2023-02-02T02:14:08.000 - 2023-02-02T19:39:36.000 - 2023-01-17T18:05:42.000 - 2023-02-02T02:31:01.000 - 2023-02-02T01:52:16.000 - 2023-01-18T17:47:04.000 - 2023-02-01T03:23:28.000 - 2023-01-17T18:17:25.000 - 2023-02-01T03:23:28.000 + 2023-01-27T10:15:08.000 + 2023-01-24T18:18:58.000 + 2023-02-02T01:47:02.000 + 2023-02-02T02:07:21.000 + 2023-02-02T02:26:46.000 2 Index: sources/canbus/MessageGlobals.h =================================================================== diff -u -r7f61f6da0818d40aed3ef528ae498ea3f619ae07 -ra49443eeb1f824a632d50fd876a47a4bee01763d --- sources/canbus/MessageGlobals.h (.../MessageGlobals.h) (revision 7f61f6da0818d40aed3ef528ae498ea3f619ae07) +++ sources/canbus/MessageGlobals.h (.../MessageGlobals.h) (revision a49443eeb1f824a632d50fd876a47a4bee01763d) @@ -233,10 +233,10 @@ // ---- Versions {Gui::GuiActionType::ID_AdjustVersionsUIReq ,1+1+1+2+4 }, // variable length parameters - {Gui::GuiActionType::ID_AdjustVersionsHDRsp ,3*1+2+4*1+4 }, // variable length parameters - {Gui::GuiActionType::ID_AdjustVersionsDGRsp ,3*1+2+4*1+4 }, // variable length parameters - {Gui::GuiActionType::ID_AdjustSerialHDRsp , 1 * 1 }, // minimum 1 parameter 1 byte - {Gui::GuiActionType::ID_AdjustSerialDGRsp , 1 * 1 }, // minimum 1 parameter 1 byte + {Gui::GuiActionType::ID_AdjustVersionsTDRsp ,3*1+2+4*1+4 }, // variable length parameters + {Gui::GuiActionType::ID_AdjustVersionsDDRsp ,3*1+2+4*1+4 }, // variable length parameters + {Gui::GuiActionType::ID_AdjustSerialTDRsp , 1 * 1 }, // minimum 1 parameter 1 byte + {Gui::GuiActionType::ID_AdjustSerialDDRsp , 1 * 1 }, // minimum 1 parameter 1 byte // ---- {Gui::GuiActionType::ID_AdjustVersionsTDReq , 0 * 4 }, // 0 parameter {Gui::GuiActionType::ID_AdjustVersionsUIRsp ,1+1+1+2+4 }, // variable length parameters Index: sources/gui/qml/pages/settings/SettingsDeviceRegistration.qml =================================================================== diff -u -raf9b5ee3e759ca45c4e55488f46601f30143edae -ra49443eeb1f824a632d50fd876a47a4bee01763d --- sources/gui/qml/pages/settings/SettingsDeviceRegistration.qml (.../SettingsDeviceRegistration.qml) (revision af9b5ee3e759ca45c4e55488f46601f30143edae) +++ sources/gui/qml/pages/settings/SettingsDeviceRegistration.qml (.../SettingsDeviceRegistration.qml) (revision a49443eeb1f824a632d50fd876a47a4bee01763d) @@ -70,24 +70,24 @@ label.width : _root.labelWidth } - TextEntry { id : _serial_HD + TextEntry { id : _serial_TD textInput.clip : true hasCursor : false textInput.text : vAdjustmentVersions .tdSerial textInput.horizontalAlignment: Text.AlignLeft - label.text : qsTr("HD Serial") + label.text : qsTr("TD Serial") separator.text : _root.separatorText separator.width : _root.separatorGap textInput.width : _root.entryWidth label.width : _root.labelWidth } - TextEntry { id : _serial_DG + TextEntry { id : _serial_DD textInput.clip : true hasCursor : false - textInput.text : vAdjustmentVersions .dgSerial + textInput.text : vAdjustmentVersions .ddSerial textInput.horizontalAlignment: Text.AlignLeft - label.text : qsTr("DG Serial") + label.text : qsTr("DD Serial") separator.text : _root.separatorText separator.width : _root.separatorGap textInput.width : _root.entryWidth @@ -145,7 +145,7 @@ let mHasNetworkConnection = (_ipAddress_eth0.isValid || _ipAddress_wlan0.isValid) if ( ! mHasNetworkConnection) { _root.notificationText = qsTr("No Network Connection"); return } - let mHasSerials = ( _serial_HD != "" && _serial_DG != "") + let mHasSerials = ( _serial_TD != "" && _serial_DD != "") if ( ! mHasSerials ) { _root.notificationText = qsTr("No device Serial" ); return } vCloudSync .doRegister () } // start device registration