diff --git a/Multiprotocol/BUGSMINI_nrf24l01.ino b/Multiprotocol/BUGSMINI_nrf24l01.ino index 02906c4..34a390c 100644 --- a/Multiprotocol/BUGSMINI_nrf24l01.ino +++ b/Multiprotocol/BUGSMINI_nrf24l01.ino @@ -237,12 +237,24 @@ static void __attribute__((unused)) BUGSMINI_update_telemetry() if(packet[0] == checksum) { RX_RSSI = packet[3]; - if(packet[11] & 0x80) - v_lipo1 = 0xff; // Ok - else if(packet[11] & 0x40) - v_lipo1 = 0x80; // Warning + if(sub_protocol==BUGS3H) + { + if(packet[11] & 0x40) + v_lipo1 = 0x40; // Warning + else if(packet[11] & 0x80) + v_lipo1 = 0x20; // Critical + else + v_lipo1 = 0x80; // Ok + } else - v_lipo1 = 0x00; // Critical + { + if(packet[11] & 0x80) + v_lipo1 = 0x80; // Ok + else if(packet[11] & 0x40) + v_lipo1 = 0x40; // Warning + else + v_lipo1 = 0x20; // Critical + } telemetry_link=1; } #endif diff --git a/Multiprotocol/Multi.txt b/Multiprotocol/Multi.txt index 99835c8..6152406 100644 --- a/Multiprotocol/Multi.txt +++ b/Multiprotocol/Multi.txt @@ -39,7 +39,7 @@ 39,Hitec,OPT_FW,OPT_HUB,MINIMA 40,WFLY 41,BUGS -42,BUGSMINI +42,BUGSMINI,BUGSMINI,BUGS3H 43,Traxxas 44,NCC1701 45,E01X,E012,E015,E016H diff --git a/Multiprotocol/Multiprotocol.h b/Multiprotocol/Multiprotocol.h index 1b27125..afd3375 100644 --- a/Multiprotocol/Multiprotocol.h +++ b/Multiprotocol/Multiprotocol.h @@ -19,7 +19,7 @@ #define VERSION_MAJOR 1 #define VERSION_MINOR 2 #define VERSION_REVISION 1 -#define VERSION_PATCH_LEVEL 36 +#define VERSION_PATCH_LEVEL 37 //****************** // Protocols @@ -257,12 +257,16 @@ enum E01X E015 = 1, E016H = 2, }; -enum PROTO_GD00X +enum GD00X { GD_V1 = 0, GD_V2 = 1, }; - +enum BUGSMINI +{ + BUGSMINI= 0, + BUGS3H = 1, +}; #define NONE 0 #define P_HIGH 1 #define P_LOW 0 diff --git a/Multiprotocol/_Config.h b/Multiprotocol/_Config.h index 939d0c4..e2eddc2 100644 --- a/Multiprotocol/_Config.h +++ b/Multiprotocol/_Config.h @@ -468,7 +468,8 @@ const PPM_Parameters PPM_prot[14*NBR_BANKS]= { PROTO_BUGS NONE PROTO_BUGSMINI - NONE + BUGSMINI + BUGS3H PROTO_CABELL CABELL_V3 CABELL_V3_TELEMETRY