Selaa lähdekoodia

bumped up code to 9.0.1 upstream

Nicole Portas 1 kuukausi sitten
vanhempi
sitoutus
36dc57db20

+ 1 - 1
build-helion

@@ -1,5 +1,5 @@
 #!/bin/bash
-BRANCH="8.0.1"
+BRANCH="9.0.1"
 rm -rf inav && echo "Cleaning up..."
 git clone -b $BRANCH --single-branch https://github.com/iNavFlight/inav.git && echo "Latest code fetched succesfully"
 diff -crB inav patch/inav > custom.patch

+ 1 - 8
patch/inav/src/main/io/vtx_tramp.c

@@ -111,7 +111,7 @@ typedef struct {
     uint8_t         sendPkt[VTX_PKT_SIZE];
     uint8_t         recvPkt[VTX_PKT_SIZE];
     unsigned        recvPtr;
-    serialPort_t *  port;
+    serialPort_t * port;
 } vtxProtoState_t;
 
 static vtxProtoState_t vtxState;
@@ -212,13 +212,6 @@ static void vtxProtoQueryStatus(void)
     vtxState.lastStatusQueryMs = millis();
 }
 
-/*
-static void vtxProtoQueryTemperature(void)
-{
-    vtxProtoSend('s', 0);
-}
-*/
-
 static vtxProtoResponseType_e vtxProtoProcessResponse(void)
 {
     const uint8_t respCode = vtxState.recvPkt[1];

+ 0 - 1
patch/inav/src/main/rx/crsf.h

@@ -47,7 +47,6 @@ enum {
     CRSF_FRAME_BATTERY_SENSOR_PAYLOAD_SIZE = 8,
     CRSF_FRAME_BAROMETER_ALTITUDE_PAYLOAD_SIZE = 2,       // 0x09 Altitude only
     CRSF_FRAME_BAROMETER_ALTITUDE_VARIO_PAYLOAD_SIZE = 3, // 0x09 Altitude + Vario (TBS CRSF standard)
-    // CRSF_FRAME_BAROMETER_ALTITUDE_VARIO_PAYLOAD_SIZE = 4,   // 0x09 Altitude + Vario (EdgeTX / ELRS historical standard)
     CRSF_FRAME_AIRSPEED_PAYLOAD_SIZE = 2,
     CRSF_FRAME_LINK_STATISTICS_PAYLOAD_SIZE = 10,
     CRSF_FRAME_RC_CHANNELS_PAYLOAD_SIZE = 22, // 11 bits per channel * 16 channels = 22 bytes.

+ 4 - 3
patch/inav/src/main/telemetry/crsf.c

@@ -485,12 +485,13 @@ static uint8_t crsfSchedule[CRSF_SCHEDULE_COUNT_MAX];
 
 static bool mspReplyPending;
 
-void crsfScheduleMspResponse(void)
+void crsfScheduleMspResponse(uint8_t requestOriginID)
 {
+    UNUSED(requestOriginID);
     mspReplyPending = true;
 }
 
-void crsfSendMspResponse(uint8_t *payload)
+void crsfSendMspResponse(uint8_t *payload, const uint8_t requestOriginID)
 {
     sbuf_t crsfPayloadBuf;
     sbuf_t *dst = &crsfPayloadBuf;
@@ -498,7 +499,7 @@ void crsfSendMspResponse(uint8_t *payload)
     crsfInitializeFrame(dst);
     sbufWriteU8(dst, CRSF_FRAME_TX_MSP_FRAME_SIZE + CRSF_FRAME_LENGTH_EXT_TYPE_CRC);
     crsfSerialize8(dst, CRSF_FRAMETYPE_MSP_RESP);
-    crsfSerialize8(dst, CRSF_ADDRESS_RADIO_TRANSMITTER);
+    crsfSerialize8(dst, requestOriginID);
     crsfSerialize8(dst, CRSF_ADDRESS_FLIGHT_CONTROLLER);
     crsfSerializeData(dst, (const uint8_t*)payload, CRSF_FRAME_TX_MSP_FRAME_SIZE);
     crsfFinalize(dst);