Bsongis/9x fixes (#4463)

[9x] Fixes + make firmware target added
This commit is contained in:
Bertrand Songis
2017-02-17 17:11:38 +01:00
committed by GitHub
parent 6106d1b228
commit 3e84e7930c
20 changed files with 209 additions and 187 deletions
+1 -1
View File
@@ -315,7 +315,7 @@ void frskySendPacket(uint8_t type, uint8_t value, uint8_t p1, uint8_t p2)
#endif
}
inline void frskyDSendNextAlarm(void)
void frskyDSendNextAlarm(void)
{
if (frskyTxBufferCount)
return; // we only have one buffer. If it's in use, then we can't send yet.
+7 -10
View File
@@ -25,10 +25,6 @@
#include "telemetry/mavlink.h"
#if defined(SIMU)
void telemetryPortInitFromIndex(uint8_t index) {}
#endif
// this might need to move to the flight software
//static
mavlink_system_t mavlink_system = { 7, MAV_COMP_ID_MISSIONPLANNER, 0, 0, 0, 0 };
@@ -78,10 +74,11 @@ void MAVLINK_reset(uint8_t warm_reset) {
}
//! \brief initalize mavlink extension
void MAVLINK_Init(void) {
mav_statustext[0] = 0;
MAVLINK_reset(0);
telemetryPortInitFromIndex(g_eeGeneral.mavbaud);
void MAVLINK_Init(void)
{
mav_statustext[0] = 0;
MAVLINK_reset(0);
telemetryPortInit(g_eeGeneral.mavbaud);
}
/*! \brief Status log message
@@ -580,10 +577,10 @@ void telemetryWakeup() {
if (tmr10ms - last_time > 15) {
if (mav_heartbeat > -30) {
mav_heartbeat--;
if (mav_heartbeat == -30) {
MAVLINK_reset(1);
telemetryPortInitFromIndex(g_eeGeneral.mavbaud);
telemetryPortInit(g_eeGeneral.mavbaud);
}
}
last_time = tmr10ms;
+2
View File
@@ -320,5 +320,7 @@ inline uint8_t getPrecisMavlinParamsValue(uint8_t idx) {
void lcd_outdezFloat(uint8_t x, uint8_t y, float val, uint8_t precis, uint8_t mode);
#endif
void telemetryPortInit(uint8_t baudrate);
#endif // _MAVLINK_H_