Cosmetics

This commit is contained in:
Bertrand Songis
2019-11-22 16:43:56 +01:00
parent 13a6864905
commit 64c3164ed4
5 changed files with 31 additions and 47 deletions
+20 -39
View File
@@ -20,31 +20,7 @@
#include "opentx.h"
class Pxx2Telemetry
{
protected:
static void processGetHardwareInfoFrame(uint8_t module, uint8_t *frame);
static void processReceiverSettingsFrame(uint8_t module, uint8_t *frame);
static void processRegisterFrame(uint8_t module, uint8_t * frame);
static void processBindFrame(uint8_t module, uint8_t * frame);
static void processTelemetryFrame(uint8_t module, uint8_t * frame);
static void processSpectrumFrame(uint8_t module, uint8_t * frame);
static void processRadioFrame(uint8_t module, uint8_t * frame);
static void processPowerMeterFrame(uint8_t module, uint8_t * frame);
static void processAuthenticationFrame(uint8_t module, uint8_t * frame);
public:
};
void processGetHardwareInfoFrame(uint8_t module, uint8_t * frame)
void processGetHardwareInfoFrame(uint8_t module, const uint8_t * frame)
{
if (moduleState[module].mode != MODULE_MODE_GET_HARDWARE_INFO) {
return;
@@ -68,7 +44,7 @@ void processGetHardwareInfoFrame(uint8_t module, uint8_t * frame)
}
}
void processModuleSettingsFrame(uint8_t module, uint8_t * frame)
void processModuleSettingsFrame(uint8_t module, const uint8_t * frame)
{
if (moduleState[module].mode != MODULE_MODE_MODULE_SETTINGS) {
return;
@@ -88,7 +64,7 @@ void processModuleSettingsFrame(uint8_t module, uint8_t * frame)
moduleState[module].mode = MODULE_MODE_NORMAL;
}
void processReceiverSettingsFrame(uint8_t module, uint8_t * frame)
void processReceiverSettingsFrame(uint8_t module, const uint8_t * frame)
{
if (moduleState[module].mode != MODULE_MODE_RECEIVER_SETTINGS) {
return;
@@ -116,7 +92,7 @@ void processReceiverSettingsFrame(uint8_t module, uint8_t * frame)
moduleState[module].mode = MODULE_MODE_NORMAL;
}
void processRegisterFrame(uint8_t module, uint8_t * frame)
void processRegisterFrame(uint8_t module, const uint8_t * frame)
{
if (moduleState[module].mode != MODULE_MODE_REGISTER) {
return;
@@ -149,7 +125,7 @@ void processRegisterFrame(uint8_t module, uint8_t * frame)
}
}
void processBindFrame(uint8_t module, uint8_t * frame)
void processBindFrame(uint8_t module, const uint8_t * frame)
{
if (moduleState[module].mode != MODULE_MODE_BIND) {
return;
@@ -200,7 +176,7 @@ void processBindFrame(uint8_t module, uint8_t * frame)
}
}
void processResetFrame(uint8_t module, uint8_t * frame)
void processResetFrame(uint8_t module, const uint8_t * frame)
{
if (moduleState[module].mode != MODULE_MODE_RESET) {
return;
@@ -213,7 +189,7 @@ void processResetFrame(uint8_t module, uint8_t * frame)
moduleState[module].mode = MODULE_MODE_NORMAL;
}
void processTelemetryFrame(uint8_t module, uint8_t * frame)
void processTelemetryFrame(uint8_t module, const uint8_t * frame)
{
uint8_t origin = (module << 2) + (frame[3] & 0x03);
if (origin != TELEMETRY_ENDPOINT_SPORT) {
@@ -221,8 +197,8 @@ void processTelemetryFrame(uint8_t module, uint8_t * frame)
}
}
#if defined(ACCESS_LIB)
void processAuthenticationFrame(uint8_t module, uint8_t * frame)
#if defined(ACCESS_LIB) && !defined(SIMU)
void processAuthenticationFrame(uint8_t module, const uint8_t * frame)
{
uint8_t cryptoType = frame[3];
uint8_t messageDigest[16] = {0};
@@ -257,7 +233,7 @@ void processAuthenticationFrame(uint8_t module, uint8_t * frame)
#define processAuthenticationFrame(module, frame)
#endif
void processSpectrumAnalyserFrame(uint8_t module, uint8_t * frame)
void processSpectrumAnalyserFrame(uint8_t module, const uint8_t * frame)
{
if (moduleState[module].mode != MODULE_MODE_SPECTRUM_ANALYSER) {
return;
@@ -284,7 +260,7 @@ void processSpectrumAnalyserFrame(uint8_t module, uint8_t * frame)
}
}
void processPowerMeterFrame(uint8_t module, uint8_t * frame)
void processPowerMeterFrame(uint8_t module, const uint8_t * frame)
{
if (moduleState[module].mode != MODULE_MODE_POWER_METER) {
return;
@@ -296,7 +272,7 @@ void processPowerMeterFrame(uint8_t module, uint8_t * frame)
}
}
void processOtaUpdateFrame(uint8_t module, uint8_t * frame)
void processOtaUpdateFrame(uint8_t module, const uint8_t * frame)
{
if (moduleState[module].mode != MODULE_MODE_OTA_UPDATE) {
return;
@@ -322,7 +298,7 @@ void processOtaUpdateFrame(uint8_t module, uint8_t * frame)
}
}
void processModuleFrame(uint8_t module, uint8_t *frame)
void processModuleFrame(uint8_t module, const uint8_t *frame)
{
switch (frame[2]) {
case PXX2_TYPE_ID_HW_INFO:
@@ -359,7 +335,7 @@ void processModuleFrame(uint8_t module, uint8_t *frame)
}
}
void processToolsFrame(uint8_t module, uint8_t * frame)
void processToolsFrame(uint8_t module, const uint8_t * frame)
{
switch (frame[2]) {
case PXX2_TYPE_ID_POWER_METER:
@@ -372,8 +348,13 @@ void processToolsFrame(uint8_t module, uint8_t * frame)
}
}
void processPXX2Frame(uint8_t module, uint8_t *frame)
void processPXX2Frame(uint8_t module, const uint8_t * frame)
{
LOG_TELEMETRY_WRITE_START();
for (uint8_t i = 0; i < 1 + frame[0]; i++) {
LOG_TELEMETRY_WRITE_BYTE(frame[i]);
}
switch (frame[1]) {
case PXX2_TYPE_C_MODULE:
processModuleFrame(module, frame);