Another big refactoring

This commit is contained in:
Bertrand Songis
2016-08-02 22:15:29 +02:00
parent 52435703a0
commit 7fbd963b3f
140 changed files with 1311 additions and 1292 deletions
+54 -54
View File
@@ -1,23 +1,23 @@
/*
* Copyright (C) OpenTX
*
* Based on code named
* th9x - http://code.google.com/p/th9x
* er9x - http://code.google.com/p/er9x
* gruvin9x - http://code.google.com/p/gruvin9x
*
* License GPLv2: http://www.gnu.org/licenses/gpl-2.0.html
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License version 2 as
* published by the Free Software Foundation.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*/
/*
* Copyright (C) OpenTX
*
* Based on code named
* th9x - http://code.google.com/p/th9x
* er9x - http://code.google.com/p/er9x
* gruvin9x - http://code.google.com/p/gruvin9x
*
* License GPLv2: http://www.gnu.org/licenses/gpl-2.0.html
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License version 2 as
* published by the Free Software Foundation.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*/
#include "opentx.h"
#define NB_BUF 2
@@ -145,14 +145,14 @@ uint8_t ibuf[NB_BUF]; // subscripts on buffers values
char rbuf[NB_BUF][LG_BUF]; // receive buffers
const char val_unknown[] = "?";
void menuTelemetryArduPilot1(uint8_t event);
void menuTelemetryArduPilot2(uint8_t event);
void menuTelemetryArduPilot3(uint8_t event);
void menuTelemetryArduPilot4(uint8_t event);
void menuTelemetryArduPilot5(uint8_t event);
void menuTelemetryArduPilot6(uint8_t event);
void menuTelemetryArduPilot7(uint8_t event);
void menuTelemetryArduPilot8(uint8_t event);
void menuViewTelemetryArduPilot1(uint8_t event);
void menuViewTelemetryArduPilot2(uint8_t event);
void menuViewTelemetryArduPilot3(uint8_t event);
void menuViewTelemetryArduPilot4(uint8_t event);
void menuViewTelemetryArduPilot5(uint8_t event);
void menuViewTelemetryArduPilot6(uint8_t event);
void menuViewTelemetryArduPilot7(uint8_t event);
void menuViewTelemetryArduPilot8(uint8_t event);
void title(char x);
void initval(uint8_t num, uint8_t pack, uint8_t val);
@@ -427,22 +427,22 @@ void ARDUPILOT_EnableRXD (void)
UCSR0B |= (1 << RXCIE0); // enable Interrupt
}
void menuTelemetryArduPilot(uint8_t event)
void menuViewTelemetryArduPilot(uint8_t event)
{
menuTelemetryArduPilot1(event);
menuViewTelemetryArduPilot1(event);
}
// Start of ArduPilot menus 1-8 <<<<<<<<<<<<<<<<<<<<<<<<<<<
void menuTelemetryArduPilot1(uint8_t event)
void menuViewTelemetryArduPilot1(uint8_t event)
{
switch(event) // new event received, branch accordingly
{
case EVT_KEY_FIRST(KEY_UP):
chainMenu(menuTelemetryArduPilot8);
chainMenu(menuViewTelemetryArduPilot8);
break;
case EVT_KEY_FIRST(KEY_DOWN):
chainMenu(menuTelemetryArduPilot2);
chainMenu(menuViewTelemetryArduPilot2);
break;
case EVT_KEY_FIRST(KEY_MENU):
ARDUPILOT_DisableRXD();
@@ -504,15 +504,15 @@ void menuTelemetryArduPilot1(uint8_t event)
lcdDrawText (1*FW, 5*FH, VALSTR(1), APSIZE);
}
void menuTelemetryArduPilot2(uint8_t event)
void menuViewTelemetryArduPilot2(uint8_t event)
{
switch(event)
{
case EVT_KEY_FIRST(KEY_UP):
chainMenu(menuTelemetryArduPilot1);
chainMenu(menuViewTelemetryArduPilot1);
break;
case EVT_KEY_FIRST(KEY_DOWN):
chainMenu(menuTelemetryArduPilot3);
chainMenu(menuViewTelemetryArduPilot3);
break;
case EVT_KEY_FIRST(KEY_EXIT):
ARDUPILOT_DisableRXD();
@@ -528,15 +528,15 @@ void menuTelemetryArduPilot2(uint8_t event)
lcdDrawText (2*FW, 5*FH, VALSTR(1), APSIZE);
}
void menuTelemetryArduPilot3(uint8_t event)
void menuViewTelemetryArduPilot3(uint8_t event)
{
switch(event)
{
case EVT_KEY_FIRST(KEY_UP):
chainMenu(menuTelemetryArduPilot2);
chainMenu(menuViewTelemetryArduPilot2);
break;
case EVT_KEY_FIRST(KEY_DOWN):
chainMenu(menuTelemetryArduPilot4);
chainMenu(menuViewTelemetryArduPilot4);
break;
case EVT_KEY_FIRST(KEY_EXIT):
ARDUPILOT_DisableRXD();
@@ -552,15 +552,15 @@ void menuTelemetryArduPilot3(uint8_t event)
lcdDrawText (2*FW, 5*FH, VALSTR(1), APSIZE);
}
void menuTelemetryArduPilot4(uint8_t event)
void menuViewTelemetryArduPilot4(uint8_t event)
{
switch(event)
{
case EVT_KEY_FIRST(KEY_UP):
chainMenu(menuTelemetryArduPilot3);
chainMenu(menuViewTelemetryArduPilot3);
break;
case EVT_KEY_FIRST(KEY_DOWN):
chainMenu(menuTelemetryArduPilot5);
chainMenu(menuViewTelemetryArduPilot5);
break;
case EVT_KEY_FIRST(KEY_EXIT):
ARDUPILOT_DisableRXD();
@@ -576,15 +576,15 @@ void menuTelemetryArduPilot4(uint8_t event)
lcdDrawText (2*FW, 5*FH, VALSTR(1), APSIZE);
}
void menuTelemetryArduPilot5(uint8_t event)
void menuViewTelemetryArduPilot5(uint8_t event)
{
switch(event)
{
case EVT_KEY_FIRST(KEY_UP):
chainMenu(menuTelemetryArduPilot4);
chainMenu(menuViewTelemetryArduPilot4);
break;
case EVT_KEY_FIRST(KEY_DOWN):
chainMenu(menuTelemetryArduPilot6);
chainMenu(menuViewTelemetryArduPilot6);
break;
case EVT_KEY_FIRST(KEY_MENU):
break;
@@ -602,15 +602,15 @@ void menuTelemetryArduPilot5(uint8_t event)
lcdDrawText (2*FW, 5*FH, VALSTR(1), APSIZE);
}
void menuTelemetryArduPilot6(uint8_t event)
void menuViewTelemetryArduPilot6(uint8_t event)
{
switch(event)
{
case EVT_KEY_FIRST(KEY_UP):
chainMenu(menuTelemetryArduPilot5);
chainMenu(menuViewTelemetryArduPilot5);
break;
case EVT_KEY_FIRST(KEY_DOWN):
chainMenu(menuTelemetryArduPilot7);
chainMenu(menuViewTelemetryArduPilot7);
break;
case EVT_KEY_FIRST(KEY_MENU):
break;
@@ -628,15 +628,15 @@ void menuTelemetryArduPilot6(uint8_t event)
lcdDrawText (2*FW, 5*FH, VALSTR(1), APSIZE);
}
void menuTelemetryArduPilot7(uint8_t event)
void menuViewTelemetryArduPilot7(uint8_t event)
{
switch(event)
{
case EVT_KEY_FIRST(KEY_UP):
chainMenu(menuTelemetryArduPilot6);
chainMenu(menuViewTelemetryArduPilot6);
break;
case EVT_KEY_FIRST(KEY_DOWN):
chainMenu(menuTelemetryArduPilot8);
chainMenu(menuViewTelemetryArduPilot8);
break;
case EVT_KEY_FIRST(KEY_MENU):
break;
@@ -654,15 +654,15 @@ void menuTelemetryArduPilot7(uint8_t event)
lcdDrawText (2*FW, 5*FH, VALSTR(1), APSIZE);
}
void menuTelemetryArduPilot8(uint8_t event)
void menuViewTelemetryArduPilot8(uint8_t event)
{
switch(event)
{
case EVT_KEY_FIRST(KEY_UP):
chainMenu(menuTelemetryArduPilot7);
chainMenu(menuViewTelemetryArduPilot7);
break;
case EVT_KEY_FIRST(KEY_DOWN):
chainMenu(menuTelemetryArduPilot1);
chainMenu(menuViewTelemetryArduPilot1);
break;
case EVT_KEY_FIRST(KEY_MENU):
break;
+4 -4
View File
@@ -20,8 +20,8 @@
#ifndef _ARDUPILOT_H_
#define _ARDUPILOT_H_
void ARDUPILOT_Init(void);
void ARDUPILOT_EnableRXD (void);
void menuTelemetryArduPilot(uint8_t event);
void ARDUPILOT_Init(void);
void ARDUPILOT_EnableRXD (void);
void menuViewTelemetryArduPilot(uint8_t event);
#endif // _ARDUPILOT_H_
+1 -1
View File
@@ -162,7 +162,7 @@ void parseTelemHubByte(uint8_t byte)
// First received GPS position => Pilot GPS position
getGpsPilotPosition();
}
else if (telemetryData.hub.gpsDistNeeded || menuHandlers[menuLevel] == menuTelemetryFrsky) {
else if (telemetryData.hub.gpsDistNeeded || menuHandlers[menuLevel] == menuViewTelemetryFrsky) {
getGpsDistance();
}
break;
+1 -1
View File
@@ -190,7 +190,7 @@ void JETI_put_stop (void)
}
#endif
void menuTelemetryJeti(uint8_t event)
void menuViewTelemetryJeti(uint8_t event)
{
lcdDrawTelemetryTopBar();
+1 -1
View File
@@ -34,7 +34,7 @@ void JETI_EnableTXD (void);
void JETI_DisableTXD (void);
void telemetryInterrupt10ms();
void menuTelemetryJeti(uint8_t event);
void menuViewTelemetryJeti(uint8_t event);
#endif // _JETI_H_
+1 -1
View File
@@ -228,7 +228,7 @@ extern inline uint8_t MAVLINK_Action2CtrlMode(uint8_t action) {
#endif
void telemetryWakeup();
void MAVLINK_Init(void);
void menuTelemetryMavlink(uint8_t event);
void menuViewTelemetryMavlink(uint8_t event);
void MAVLINK10mspoll(uint16_t time);
#ifdef MAVLINK_PARAMS
+38 -38
View File
@@ -1,23 +1,23 @@
/*
* Copyright (C) OpenTX
*
* Based on code named
* th9x - http://code.google.com/p/th9x
* er9x - http://code.google.com/p/er9x
* gruvin9x - http://code.google.com/p/gruvin9x
*
* License GPLv2: http://www.gnu.org/licenses/gpl-2.0.html
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License version 2 as
* published by the Free Software Foundation.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*/
/*
* Copyright (C) OpenTX
*
* Based on code named
* th9x - http://code.google.com/p/th9x
* er9x - http://code.google.com/p/er9x
* gruvin9x - http://code.google.com/p/gruvin9x
*
* License GPLv2: http://www.gnu.org/licenses/gpl-2.0.html
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License version 2 as
* published by the Free Software Foundation.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*/
#include "opentx.h"
#define LG_BUF 14
@@ -159,10 +159,10 @@ $GPRMC - Recommended Minimum Navigation Information
#define WAIT_VAL_END 7
#define READ_VALUE 8
void menuTelemetryNMEA1(uint8_t event);
void menuTelemetryNMEA2(uint8_t event);
void menuTelemetryNMEA3(uint8_t event);
void menuTelemetryNMEA4(uint8_t event);
void menuViewTelemetryNMEA1(uint8_t event);
void menuViewTelemetryNMEA2(uint8_t event);
void menuViewTelemetryNMEA3(uint8_t event);
void menuViewTelemetryNMEA4(uint8_t event);
void title(char x);
void initval(uint8_t num, uint8_t pack, uint8_t val);
int32_t binary (char *str);
@@ -367,22 +367,22 @@ void NMEA_EnableRXD (void)
UCSR0B |= (1 << RXCIE0); // enable Interrupt
}
void menuTelemetryNMEA(uint8_t event)
void menuViewTelemetryNMEA(uint8_t event)
{
menuTelemetryNMEA1(event);
menuViewTelemetryNMEA1(event);
}
// Start of NMEA menus 1-4 <<<<<<<<<<<<<<<<<<<<<<<<<<<
void menuTelemetryNMEA1(uint8_t event)
void menuViewTelemetryNMEA1(uint8_t event)
{
switch(event) // new event received, branch accordingly
{
case EVT_KEY_BREAK(KEY_LEFT):
chainMenu(menuTelemetryNMEA4);
chainMenu(menuViewTelemetryNMEA4);
break;
case EVT_KEY_BREAK(KEY_RIGHT):
chainMenu(menuTelemetryNMEA2);
chainMenu(menuViewTelemetryNMEA2);
break;
case EVT_KEY_LONG(KEY_UP):
NMEA_DisableRXD();
@@ -480,7 +480,7 @@ void menuTelemetryNMEA1(uint8_t event)
void menuTelemetryNMEA2(uint8_t event)
void menuViewTelemetryNMEA2(uint8_t event)
{
static uint8_t ignore_break;
@@ -492,13 +492,13 @@ void menuTelemetryNMEA2(uint8_t event)
if (ignore_break==1) {
ignore_break=0;
break;}
chainMenu(menuTelemetryNMEA1);
chainMenu(menuViewTelemetryNMEA1);
break;
case EVT_KEY_BREAK(KEY_RIGHT):
if (ignore_break==1) {
ignore_break=0;
break;}
chainMenu(menuTelemetryNMEA3);
chainMenu(menuViewTelemetryNMEA3);
break;
case EVT_KEY_LONG(KEY_UP):
NMEA_DisableRXD();
@@ -642,15 +642,15 @@ void menuTelemetryNMEA2(uint8_t event)
void menuTelemetryNMEA3(uint8_t event)
void menuViewTelemetryNMEA3(uint8_t event)
{
switch(event)
{
case EVT_KEY_BREAK(KEY_LEFT):
chainMenu(menuTelemetryNMEA2);
chainMenu(menuViewTelemetryNMEA2);
break;
case EVT_KEY_BREAK(KEY_RIGHT):
chainMenu(menuTelemetryNMEA4);
chainMenu(menuViewTelemetryNMEA4);
break;
case EVT_KEY_LONG(KEY_UP):
NMEA_DisableRXD();
@@ -691,15 +691,15 @@ void menuTelemetryNMEA3(uint8_t event)
void menuTelemetryNMEA4(uint8_t event)
void menuViewTelemetryNMEA4(uint8_t event)
{
switch(event) // new event received, branch accordingly
{
case EVT_KEY_BREAK(KEY_LEFT):
chainMenu(menuTelemetryNMEA3);
chainMenu(menuViewTelemetryNMEA3);
break;
case EVT_KEY_BREAK(KEY_RIGHT):
chainMenu(menuTelemetryNMEA1);
chainMenu(menuViewTelemetryNMEA1);
break;
case EVT_KEY_LONG(KEY_UP):
NMEA_DisableRXD();
+6 -6
View File
@@ -20,10 +20,10 @@
#ifndef _NMEA_H_
#define _NMEA_H_
void NMEA_Init(void);
void NMEA_EnableRXD (void);
void menuTelemetryNMEA(uint8_t event);
void NMEA_Init(void);
void NMEA_EnableRXD (void);
void menuViewTelemetryNMEA(uint8_t event);
#endif // _NMEA_H_