Mirror/betaflight
1
0
Fork 0
mirror of https://github.com/betaflight/betaflight.git synced 2025-07-19 06:15:16 +03:00
Code Issues Wiki Activity

Merge pull request #4611 from mikeller/add_msp_tx_data

Browse source 
Added data for lua TX scripts to MSP.
This commit is contained in:
Michael Keller 2017-11-20 21:18:48 +13:00 • committed by GitHub
commit dcdf7dd872
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 52 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

39
src/main/interface/msp.c
View file

@ -150,6 +150,8 @@ typedef enum {
#define RATEPROFILE_MASK (1 << 7) #define RATEPROFILE_MASK (1 << 7)
#endif //USE_OSD_SLAVE #endif //USE_OSD_SLAVE
#define RTC_NOT_SUPPORTED 0xff
#ifdef USE_SERIAL_4WAY_BLHELI_INTERFACE #ifdef USE_SERIAL_4WAY_BLHELI_INTERFACE
#define ESC_4WAY 0xff #define ESC_4WAY 0xff
@ -1220,9 +1222,41 @@ static bool mspProcessOutCommand(uint8_t cmdMSP, sbuf_t *dst)
sbufWriteU8(dst, VTXDEV_UNKNOWN); // no VTX detected sbufWriteU8(dst, VTXDEV_UNKNOWN); // no VTX detected
} }
} }
#endif
break;
break;
#endif
case MSP_TX_INFO:
sbufWriteU8(dst, rssiSource);
uint8_t rtcDateTimeIsSet = 0;
#ifdef USE_RTC_TIME
dateTime_t dt;
if (rtcGetDateTime(&dt)) {
rtcDateTimeIsSet = 1;
}
#else
rtcDateTimeIsSet = RTC_NOT_SUPPORTED;
#endif
sbufWriteU8(dst, rtcDateTimeIsSet);
break;
#ifdef USE_RTC_TIME
case MSP_RTC:
{
dateTime_t dt;
if (rtcGetDateTime(&dt)) {
sbufWriteU16(dst, dt.year);
sbufWriteU8(dst, dt.month);
sbufWriteU8(dst, dt.day);
sbufWriteU8(dst, dt.hours);
sbufWriteU8(dst, dt.minutes);
sbufWriteU8(dst, dt.seconds);
sbufWriteU16(dst, dt.millis);
}
}
break;
#endif
default: default:
return false; return false;
} }
@ -1955,6 +1989,7 @@ static mspResult_e mspProcessInCommand(uint8_t cmdMSP, sbuf_t *src)
dt.millis = 0; dt.millis = 0;
rtcSetDateTime(&dt); rtcSetDateTime(&dt);
} }
break; break;
#endif #endif

4
src/main/interface/msp_protocol.h
View file

@ -230,7 +230,8 @@
#define MSP_BEEPER_CONFIG 184 #define MSP_BEEPER_CONFIG 184
#define MSP_SET_BEEPER_CONFIG 185 #define MSP_SET_BEEPER_CONFIG 185
#define MSP_TX_INFO 186 #define MSP_SET_TX_INFO 186 // in message Used to send runtime information from TX lua scripts to the firmware
#define MSP_TX_INFO 187 // out message Used by TX lua scripts to read information from the firmware
// //
// Multwii original MSP commands // Multwii original MSP commands
@ -324,3 +325,4 @@
#define MSP_SET_SERVO_MIX_RULE 242 //in message Sets servo mixer configuration #define MSP_SET_SERVO_MIX_RULE 242 //in message Sets servo mixer configuration
#define MSP_SET_4WAY_IF 245 //in message Sets 4way interface #define MSP_SET_4WAY_IF 245 //in message Sets 4way interface
#define MSP_SET_RTC 246 //in message Sets the RTC clock #define MSP_SET_RTC 246 //in message Sets the RTC clock
#define MSP_RTC 247 //out message Gets the RTC clock