Fix #2152, Fix SWR value

This commit is contained in:
Andre Bernet
2015-03-20 16:53:51 +04:00
parent da2d821e22
commit 3afd10011a
3 changed files with 6 additions and 5 deletions
+2 -1
View File
@@ -331,7 +331,8 @@ struct FrskyData {
};
#endif
#define IS_VALID_XJT_VERSION() (frskyData.xjtVersion != 0 && frskyData.xjtVersion != 0xff)
#define IS_VALID_XJT_VERSION() (frskyData.xjtVersion != 0 && frskyData.xjtVersion != 0xff)
#define IS_HIDDEN_TELEMETRY_VALUE() ((appId == XJT_VERSION_ID) || ((appId == SWR_ID) && !IS_VALID_XJT_VERSION()))
enum AlarmLevel {
alarm_off = 0,
+2 -2
View File
@@ -221,8 +221,8 @@ void processSportPacket(uint8_t *packet)
uint16_t value = HUB_DATA_U16(packet);
processHubPacket(id, value);
}
else {
if (appId == ADC1_ID || appId == ADC2_ID || appId == BATT_ID) {
else if (!IS_HIDDEN_TELEMETRY_VALUE()) {
if (appId == ADC1_ID || appId == ADC2_ID || appId == BATT_ID || appId == SWR_ID) {
data = SPORT_DATA_U8(packet);
}
const FrSkySportSensor * sensor = getFrSkySportSensor(appId);
+2 -2
View File
@@ -852,8 +852,8 @@
#define TR_PATH_TOO_LONG "Chemin trop long"
#define TR_VIEW_TEXT "Voir texte"
#define TR_FLASH_BOOTLOADER "Flasher BootLoader"
#define TR_FLASH_EXTERNAL_DEVICE "Flash External Device"
#define TR_FLASH_INTERNAL_MODULE "Flash Module Interne"
#define TR_FLASH_EXTERNAL_DEVICE "Flasher module externe"
#define TR_FLASH_INTERNAL_MODULE "Flasher module interne"
#define TR_WRITING "\032Ecriture..."
#define TR_CONFIRM_FORMAT "Confirmer Formatage?"
#define TR_INTERNALRF "HF interne"