Merge branch 'bsongis/pxx2' into 3djc/pxx2

radio/src/gui/480x272/widgets.cpp

@@ -33,12 +33,12 @@ void drawColumnHeader(const char * const * headers, const char * const * descrip
   }
 }
 
-const uint8_t __alpha_button_on[] {
+static const uint8_t __alpha_button_on[] __ALIGNED(4) = {
 #include "alpha_button_on.lbm"
 };
 Bitmap ALPHA_BUTTON_ON(BMP_ARGB4444, (const uint16_t*)__alpha_button_on);
 
-const uint8_t __alpha_button_off[] {
+static const uint8_t __alpha_button_off[] __ALIGNED(4) = {
 #include "alpha_button_off.lbm"
 };
 Bitmap ALPHA_BUTTON_OFF(BMP_ARGB4444, (const uint16_t*)__alpha_button_off);

radio/src/pulses/pxx2.cpp

@@ -44,8 +44,9 @@ void Pxx2Pulses::setupFrame(uint8_t port)
   addChannels(port, flag1 & PXX_SEND_FAILSAFE, sendUpperChannels);
 
 #if defined(LUA)
-  if (outputTelemetryBufferTrigger != 0x00 && outputTelemetryBufferSize > 0) {
+  if (outputTelemetryBufferTrigger != 0x7E && outputTelemetryBufferSize > 0) {
     // primID (1 byte) + dataID (2 bytes) + value (4 bytes)
+    addByte(outputTelemetryBufferTrigger);
     for (uint8_t i=0; i<7; i++) {
       addByte(outputTelemetryBuffer[i]);
     }

radio/src/targets/taranis/telemetry_driver.cpp

@@ -127,7 +127,7 @@ extern "C" void TELEMETRY_DMA_TX_IRQHandler(void)
   if (DMA_GetITStatus(TELEMETRY_DMA_Stream_TX, TELEMETRY_DMA_TX_FLAG_TC)) {
     DMA_ClearITPendingBit(TELEMETRY_DMA_Stream_TX, TELEMETRY_DMA_TX_FLAG_TC);
     TELEMETRY_USART->CR1 |= USART_CR1_TCIE;
-    if (telemetryProtocol == PROTOCOL_TELEMETRY_FRSKY_SPORT) {
+    if (telemetryProtocol == PROTOCOL_TELEMETRY_FRSKY_SPORT || telemetryProtocol == PROTOCOL_TELEMETRY_PXX2) {
       outputTelemetryBufferSize = 0;
       outputTelemetryBufferTrigger = 0x7E;
     }

radio/src/telemetry/frsky.cpp

@@ -73,8 +73,7 @@ void processFrskyPXX2Data(uint8_t data)
             if((telemetryRxBuffer[3] & 0x04) == 0) {
               createFrSkyPXX2Sensor(R9_PWR_ID, (telemetryRxBuffer[3] & 0x03));
             }
-
-            if (telemetryRxBuffer[0] == 0x0c) {
+            if (telemetryRxBuffer[0] == 0x0C) {
               sportProcessTelemetryPacketWithoutCrc(telemetryRxBuffer + 5 /* LEN, TYPE, RSSI/BAT, TP/SS/FW_T, FW_VER, Data ID */);
             }
           }