Merge with latest 2.3
This commit is contained in:
@@ -39,6 +39,8 @@ class Pxx2Telemetry
|
||||
|
||||
static void processPowerMeterFrame(uint8_t module, uint8_t * frame);
|
||||
|
||||
static void processAuthenticationFrame(uint8_t module, uint8_t * frame);
|
||||
|
||||
public:
|
||||
};
|
||||
|
||||
@@ -221,6 +223,29 @@ void processTelemetryFrame(uint8_t module, uint8_t * frame)
|
||||
}
|
||||
}
|
||||
|
||||
#if defined(ACCESS_LIB)
|
||||
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;
|
||||
pxx2.setupAuthenticationFrame(module, cryptoType, (const uint8_t *)messageDigest);
|
||||
intmoduleSendBuffer(pxx2.getData(), pxx2.getSize());
|
||||
// we remain in AUTHENTICATION mode to avoid a CHANNELS frame is sent at the end of the mixing process
|
||||
}
|
||||
}
|
||||
#else
|
||||
#define processAuthenticationFrame(module, frame)
|
||||
#endif
|
||||
|
||||
void processSpectrumAnalyserFrame(uint8_t module, uint8_t * frame)
|
||||
{
|
||||
if (moduleState[module].mode != MODULE_MODE_SPECTRUM_ANALYSER) {
|
||||
@@ -313,6 +338,10 @@ void processModuleFrame(uint8_t module, uint8_t *frame)
|
||||
processTelemetryFrame(module, frame);
|
||||
break;
|
||||
|
||||
case PXX2_TYPE_ID_AUTHENTICATION:
|
||||
processAuthenticationFrame(module, frame);
|
||||
break;
|
||||
|
||||
case PXX2_TYPE_ID_RESET:
|
||||
processResetFrame(module, frame);
|
||||
break;
|
||||
|
||||
Reference in New Issue
Block a user