Another big refactoring
This commit is contained in:
Bertrand Songis
@@ -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;
|
||||
|
||||
Reference in New Issue
Block a user