Wismy/x10(s) upgrade kit (#7049)

Add a popup for auth-failure
This commit is contained in:
WismyYao
2019-11-06 16:23:21 +01:00
committed by Bertrand Songis
parent b86658acfb
commit 0cce9097ea
15 changed files with 23 additions and 0 deletions
+2
View File
@@ -65,6 +65,8 @@
#define SPECTRUM_ANALYSER_POWER_FLOOR -120 /*dBm*/
#endif
#define PXX2_AUTH_REFUSED_FLAG 0xA5
enum PXX2ModuleModelID {
PXX2_MODULE_NONE,
PXX2_MODULE_XJT,
+5
View File
@@ -227,6 +227,11 @@ void processAuthenticationFrame(uint8_t module, uint8_t * frame)
uint8_t cryptoType = frame[3];
uint8_t messageDigest[16] = {0};
if (frame[0] == 4 && PXX2_AUTH_REFUSED_FLAG == frame[4]) {
POPUP_INFORMATION(STR_AUTH_FAILURE);
return;
}
if (INTERNAL_MODULE == module && accessCRL(cryptoType, frame+4, messageDigest)) {
moduleState[module].mode = MODULE_MODE_AUTHENTICATION;
Pxx2Pulses & pxx2 = intmodulePulsesData.pxx2;
+2
View File
@@ -770,3 +770,5 @@ const char STR_ABOUT_PARENTS_1[] = TR_ABOUT_PARENTS_1;
const char STR_ABOUT_PARENTS_2[] = TR_ABOUT_PARENTS_2;
const char STR_ABOUT_PARENTS_3[] = TR_ABOUT_PARENTS_3;
const char STR_ABOUT_PARENTS_4[] = TR_ABOUT_PARENTS_4;
const char STR_AUTH_FAILURE[] = TR_AUTH_FAILURE;
+2
View File
@@ -910,6 +910,8 @@ extern const char STR_ABOUT_PARENTS_2[];
extern const char STR_ABOUT_PARENTS_3[];
extern const char STR_ABOUT_PARENTS_4[];
extern const char STR_AUTH_FAILURE[];
#define CHR_HOUR TR_CHR_HOUR
#define CHR_INPUT TR_CHR_INPUT
+1
View File
@@ -1152,6 +1152,7 @@
#define TR_MENU_INVERT "Invertovat"
#define TR_JITTER_FILTER "ADC Filtr"
#define TR_RTC_CHECK TR("Check RTC", "Check RTC voltage")
#define TR_AUTH_FAILURE "Auth-failure"
#define ZSTR_RSSI "RSSI"
#define ZSTR_R9PW "R9PW"
+2
View File
@@ -1157,6 +1157,8 @@
#define TR_MENU_INVERT "Invertieren<!>"
#define TR_JITTER_FILTER "ADC Filter"
#define TR_RTC_CHECK TR("Check RTC", "Check RTC voltage")
#define TR_AUTH_FAILURE "Auth-failure"
// ----------------------------------------------------------------
#define ZSTR_RSSI "RSSI"
#define ZSTR_R9PW "R9PW"
+1
View File
@@ -1156,6 +1156,7 @@
#define TR_MENU_INVERT "Invert"
#define TR_JITTER_FILTER "ADC filter"
#define TR_RTC_CHECK TR("Check RTC", "Check RTC voltage")
#define TR_AUTH_FAILURE "Auth-failure"
#define ZSTR_RSSI "RSSI"
#define ZSTR_R9PW "R9PW"
+1
View File
@@ -1177,6 +1177,7 @@
#define TR_MENU_INVERT "Invert"
#define TR_JITTER_FILTER "ADC Filter"
#define TR_RTC_CHECK TR("Check RTC", "Check RTC voltage")
#define TR_AUTH_FAILURE "Auth-failure"
#define ZSTR_RSSI "RSSI"
#define ZSTR_R9PW "R9PW"
+1
View File
@@ -1165,6 +1165,7 @@
#define TR_MENU_INVERT "Invert"
#define TR_JITTER_FILTER "ADC Filter"
#define TR_RTC_CHECK TR("Check RTC", "Check RTC voltage")
#define TR_AUTH_FAILURE "Auth-failure"
#define ZSTR_RSSI "RSSI"
#define ZSTR_R9PW "R9PW"
+1
View File
@@ -1180,6 +1180,7 @@
#define TR_MENU_INVERT "Inverser"
#define TR_JITTER_FILTER "Filtre ADC"
#define TR_RTC_CHECK TR("Vérif. RTC", "Vérif. pile RTC")
#define TR_AUTH_FAILURE "Auth-failure"
#define ZSTR_RSSI "RSSI"
#define ZSTR_R9PW "R9PW"
+1
View File
@@ -1174,6 +1174,7 @@
#define TR_MENU_INVERT "Inverti"
#define TR_JITTER_FILTER "Filtro ADC"
#define TR_RTC_CHECK TR("Controllo RTC", "Controllo voltaggio RTC")
#define TR_AUTH_FAILURE "Auth-failure"
#define ZSTR_RSSI "RSSI"
#define ZSTR_R9PW "R9PW"
+1
View File
@@ -1166,6 +1166,7 @@
#define TR_MENU_INVERT "Inverteer"
#define TR_JITTER_FILTER "ADC Filter"
#define TR_RTC_CHECK TR("Check RTC", "Check RTC voltage")
#define TR_AUTH_FAILURE "Auth-failure"
#define ZSTR_RSSI "RSSI"
#define ZSTR_R9PW "R9PW"
+1
View File
@@ -1173,6 +1173,7 @@
#define TR_MENU_INVERT "Odwróć"
#define TR_JITTER_FILTER "ADC Filter"
#define TR_RTC_CHECK TR("Check RTC", "Check RTC voltage")
#define TR_AUTH_FAILURE "Auth-failure"
#define ZSTR_RSSI "RSSI"
#define ZSTR_R9PW "R9PW"
+1
View File
@@ -1162,6 +1162,7 @@
#define TR_MENU_INVERT "Invert"
#define TR_JITTER_FILTER "ADC Filter"
#define TR_RTC_CHECK TR("Check RTC", "Check RTC voltage")
#define TR_AUTH_FAILURE "Auth-failure"
#define ZSTR_RSSI "RSSI"
#define ZSTR_R9PW "R9PW"
+1
View File
@@ -1173,6 +1173,7 @@
#define TR_MENU_INVERT "Invertera"
#define TR_JITTER_FILTER "ADC Filter"
#define TR_RTC_CHECK TR("Check RTC", "Check RTC voltage")
#define TR_AUTH_FAILURE "Auth-failure"
#define ZSTR_RSSI "RSSI"
#define ZSTR_R9PW "R9PW"