Cosmetics
This commit is contained in:
+12
-6
@@ -1112,12 +1112,18 @@ enum FrskyUsrProtocols {
|
|||||||
USR_PROTO_LAST = USR_PROTO_WS_HOW_HIGH,
|
USR_PROTO_LAST = USR_PROTO_WS_HOW_HIGH,
|
||||||
};
|
};
|
||||||
|
|
||||||
enum FrskySource {
|
enum FrskyCurrentSource {
|
||||||
FRSKY_SOURCE_NONE,
|
FRSKY_CURRENT_SOURCE_NONE,
|
||||||
FRSKY_SOURCE_A1,
|
FRSKY_CURRENT_SOURCE_A1,
|
||||||
FRSKY_SOURCE_A2,
|
FRSKY_CURRENT_SOURCE_A2,
|
||||||
FRSKY_SOURCE_FAS,
|
FRSKY_CURRENT_SOURCE_FAS,
|
||||||
FRSKY_SOURCE_CELLS,
|
};
|
||||||
|
|
||||||
|
enum FrskyVoltsSource {
|
||||||
|
FRSKY_VOLTS_SOURCE_A1,
|
||||||
|
FRSKY_VOLTS_SOURCE_A2,
|
||||||
|
FRSKY_VOLTS_SOURCE_FAS,
|
||||||
|
FRSKY_VOLTS_SOURCE_CELLS,
|
||||||
};
|
};
|
||||||
|
|
||||||
#if defined(CPUARM)
|
#if defined(CPUARM)
|
||||||
|
|||||||
@@ -723,7 +723,7 @@ void telemetryInterrupt10ms()
|
|||||||
uint16_t current = 0;
|
uint16_t current = 0;
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
channel = g_model.frsky.currentSource - FRSKY_SOURCE_A1;
|
channel = g_model.frsky.currentSource - FRSKY_CURRENT_SOURCE_A1;
|
||||||
if (channel <= 1) {
|
if (channel <= 1) {
|
||||||
current = applyChannelRatio(channel, frskyData.analog[channel].value) / 10;
|
current = applyChannelRatio(channel, frskyData.analog[channel].value) / 10;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -595,7 +595,7 @@ void telemetryInterrupt10ms()
|
|||||||
uint16_t current = 0;
|
uint16_t current = 0;
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
channel = g_model.frsky.currentSource - FRSKY_SOURCE_A1;
|
channel = g_model.frsky.currentSource - FRSKY_CURRENT_SOURCE_A1;
|
||||||
if (channel <= 1) {
|
if (channel <= 1) {
|
||||||
current = applyChannelRatio(channel, frskyData.analog[channel].value) / 10;
|
current = applyChannelRatio(channel, frskyData.analog[channel].value) / 10;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -319,8 +319,8 @@
|
|||||||
#define LEN_VTELPROTO "\007"
|
#define LEN_VTELPROTO "\007"
|
||||||
#define TR_VTELPROTO "None\0 ""Hub\0 ""WSHHigh"
|
#define TR_VTELPROTO "None\0 ""Hub\0 ""WSHHigh"
|
||||||
|
|
||||||
#define LEN_VOLTSRC "\003"
|
#define LEN_VOLTSRC TR("\003", "\007")
|
||||||
#define TR_VOLTSRC "---""A1\0""A2\0""FAS""Cel"
|
#define TR_VOLTSRC TR("---""A1\0""A2\0""FAS""Cel", "---\0 ""A1\0 ""A2\0 ""FAS\0 ""Cells\0 ")
|
||||||
|
|
||||||
#define LEN_VARIOSRC "\004"
|
#define LEN_VARIOSRC "\004"
|
||||||
#if defined(FRSKY_SPORT)
|
#if defined(FRSKY_SPORT)
|
||||||
|
|||||||
Reference in New Issue
Block a user