Issue 166 continued (2nd 3-pos switch)
Issue 177 fixed (Vario range) Halcyon again selectable
This commit is contained in:
bsongis
+11
-5
@@ -344,6 +344,9 @@ CPPDEFS += -DTRANSLATIONS_$(TRANSLATIONS)
|
||||
# TTS language
|
||||
CPPDEFS += -DTTS_$(TTS)
|
||||
|
||||
GVARS_VARIANT = +1
|
||||
FRSKY_VARIANT = +2
|
||||
3POS_VARIANT = +4
|
||||
EEPROM_VARIANT = 0
|
||||
|
||||
ifeq ($(UNITS), IMPERIAL)
|
||||
@@ -406,7 +409,7 @@ endif
|
||||
|
||||
ifeq ($(GVARS), YES)
|
||||
CPPDEFS += -DGVARS
|
||||
EEPROM_VARIANT += +1
|
||||
EEPROM_VARIANT += ${GVARS_VARIANT}
|
||||
endif
|
||||
|
||||
# If STD-Support is enabled
|
||||
@@ -450,7 +453,7 @@ ifeq ($(EXT), FRSKY)
|
||||
ifeq ($(VARIO), YES)
|
||||
CPPDEFS += -DVARIO
|
||||
endif
|
||||
EEPROM_VARIANT += +2
|
||||
EEPROM_VARIANT += ${FRSKY_VARIANT}
|
||||
endif
|
||||
|
||||
ifeq ($(DEBUG), YES)
|
||||
@@ -719,13 +722,16 @@ ifeq ($(IRPROTOS), YES)
|
||||
endif
|
||||
|
||||
ifeq ($(3POS), POT1)
|
||||
CPPDEFS += -DP13POS
|
||||
CPPDEFS += -DEXTRA_3POS=1
|
||||
# EEPROM_VARIANT += ${3POS_VARIANT}
|
||||
endif
|
||||
ifeq ($(3POS), POT2)
|
||||
CPPDEFS += -DP23POS
|
||||
CPPDEFS += -DEXTRA_3POS=2
|
||||
# EEPROM_VARIANT += ${3POS_VARIANT}
|
||||
endif
|
||||
ifeq ($(3POS), POT3)
|
||||
CPPDEFS += -DP33POS
|
||||
CPPDEFS += -DEXTRA_3POS=3
|
||||
# EEPROM_VARIANT += ${3POS_VARIANT}
|
||||
endif
|
||||
|
||||
#---------------- Compiler Options C++ ----------------
|
||||
|
||||
+2
-2
@@ -779,7 +779,7 @@ NOINLINE void check_frsky()
|
||||
// conversion in cm/s
|
||||
do {
|
||||
int16_t verticalSpeed;
|
||||
int16_t varioCenterMax = (int16_t)g_model.frsky.varioCenterMax * 10;
|
||||
int16_t varioCenterMax = (int16_t)g_model.frsky.varioCenterMax * 10 + 50;
|
||||
if (frskyData.varioSpeed >= varioCenterMax) {
|
||||
verticalSpeed = frskyData.varioSpeed - varioCenterMax;
|
||||
int16_t varioMax = (10+(int16_t)g_model.frsky.varioMax) * 100;
|
||||
@@ -787,7 +787,7 @@ NOINLINE void check_frsky()
|
||||
verticalSpeed = (verticalSpeed * 10) / ((varioMax-varioCenterMax) / 100);
|
||||
}
|
||||
else {
|
||||
int16_t varioCenterMin = (int16_t)g_model.frsky.varioCenterMin * 10;
|
||||
int16_t varioCenterMin = (int16_t)g_model.frsky.varioCenterMin * 10 - 50;
|
||||
if (frskyData.varioSpeed <= varioCenterMin) {
|
||||
verticalSpeed = frskyData.varioSpeed - varioCenterMin;
|
||||
int16_t varioMin = (-10+(int16_t)g_model.frsky.varioMin) * 100;
|
||||
|
||||
@@ -220,6 +220,20 @@ bool switchState(EnumKeys enuk)
|
||||
result = !(PINB & (1<<INP_B_ID2));
|
||||
break;
|
||||
|
||||
#if 0
|
||||
case SW_ID3:
|
||||
result = (calibratedStick[POT1+EXTRA_3POS-1] < 0);
|
||||
break;
|
||||
|
||||
case SW_ID4:
|
||||
result = (calibratedStick[POT1+EXTRA_3POS-1] == 0);
|
||||
break;
|
||||
|
||||
case SW_ID5:
|
||||
result = (calibratedStick[POT1+EXTRA_3POS-1] > 0);
|
||||
break;
|
||||
#endif
|
||||
|
||||
case SW_GEA:
|
||||
result = PING & (1<<INP_G_Gear);
|
||||
break;
|
||||
|
||||
@@ -62,7 +62,15 @@
|
||||
#define JACK_PPM_OUT() PORTG |= (1<<OUT_G_SIM_CTL)
|
||||
#define JACK_PPM_IN() PORTG &= ~(1<<OUT_G_SIM_CTL)
|
||||
|
||||
extern void sdPoll10ms();
|
||||
// SD driver
|
||||
#if !defined(SIMU)
|
||||
void sdMountPoll();
|
||||
void sdPoll10ms();
|
||||
#define SD_IS_HC() (0)
|
||||
#define SD_GET_BLOCKNR() (0)
|
||||
#define SD_GET_SIZE_MB() (0)
|
||||
#define SD_GET_SPEED() (0)
|
||||
#endif
|
||||
|
||||
#define SPEAKER_ON TCCR0A |= (1 << COM0A0)
|
||||
#define SPEAKER_OFF TCCR0A &= ~(1 << COM0A0)
|
||||
|
||||
+7
-7
@@ -3164,7 +3164,7 @@ enum menuModelTelemetryItems {
|
||||
ITEM_TELEMETRY_USR_CURRENT_SOURCE,
|
||||
IF_VARIO(ITEM_TELEMETRY_VARIO_LABEL)
|
||||
IF_VARIO(ITEM_TELEMETRY_VARIO_SOURCE)
|
||||
IF_VARIO(ITEM_TELEMETRY_VARIO_SPEED)
|
||||
IF_VARIO(ITEM_TELEMETRY_VARIO_RANGE)
|
||||
ITEM_TELEMETRY_SCREEN_LABEL1,
|
||||
ITEM_TELEMETRY_SCREEN_LINE1,
|
||||
ITEM_TELEMETRY_SCREEN_LINE2,
|
||||
@@ -3333,7 +3333,7 @@ void menuModelTelemetry(uint8_t event)
|
||||
case ITEM_TELEMETRY_USR_PROTO:
|
||||
lcd_putsLeft(y, STR_PROTO);
|
||||
lcd_putsiAtt(TELEM_COL2, y, STR_VTELPROTO, g_model.frsky.usrProto, attr);
|
||||
if (attr) CHECK_INCDEC_MODELVAR(event, g_model.frsky.usrProto, 0, 2);
|
||||
if (attr) CHECK_INCDEC_MODELVAR(event, g_model.frsky.usrProto, 0, 3);
|
||||
break;
|
||||
|
||||
case ITEM_TELEMETRY_USR_BLADES:
|
||||
@@ -3366,11 +3366,11 @@ void menuModelTelemetry(uint8_t event)
|
||||
if (attr) CHECK_INCDEC_MODELVAR(event, g_model.frsky.varioSource, VARIO_SOURCE_FIRST, VARIO_SOURCE_LAST);
|
||||
break;
|
||||
|
||||
case ITEM_TELEMETRY_VARIO_SPEED:
|
||||
case ITEM_TELEMETRY_VARIO_RANGE:
|
||||
lcd_putsLeft(y, STR_LIMIT);
|
||||
lcd_outdezAtt(TELEM_COL2, y, -10+g_model.frsky.varioMin, ((attr && m_posHorz==0) ? blink : 0)|LEFT);
|
||||
lcd_outdezAtt(TELEM_COL2+7*FW, y, g_model.frsky.varioCenterMin, ((attr && m_posHorz==1) ? blink : 0)|PREC1);
|
||||
lcd_outdezAtt(TELEM_COL2+10*FW, y, g_model.frsky.varioCenterMax, ((attr && m_posHorz==2) ? blink : 0)|PREC1);
|
||||
lcd_outdezAtt(TELEM_COL2+7*FW-2, y, -5+g_model.frsky.varioCenterMin, ((attr && m_posHorz==1) ? blink : 0)|PREC1);
|
||||
lcd_outdezAtt(TELEM_COL2+10*FW, y, 5+g_model.frsky.varioCenterMax, ((attr && m_posHorz==2) ? blink : 0)|PREC1);
|
||||
lcd_outdezAtt(TELEM_COL2+13*FW+2, y, 10+g_model.frsky.varioMax, ((attr && m_posHorz==3) ? blink : 0));
|
||||
if (attr && (s_editMode>0 || p1valdiff)) {
|
||||
switch (m_posHorz) {
|
||||
@@ -3378,10 +3378,10 @@ void menuModelTelemetry(uint8_t event)
|
||||
CHECK_INCDEC_MODELVAR(event, g_model.frsky.varioMin, -7, 7);
|
||||
break;
|
||||
case 1:
|
||||
CHECK_INCDEC_MODELVAR(event, g_model.frsky.varioCenterMin, -10, min<int8_t>(0, g_model.frsky.varioCenterMax));
|
||||
CHECK_INCDEC_MODELVAR(event, g_model.frsky.varioCenterMin, -15, 5+min<int8_t>(0, g_model.frsky.varioCenterMax+5));
|
||||
break;
|
||||
case 2:
|
||||
CHECK_INCDEC_MODELVAR(event, g_model.frsky.varioCenterMax, max<int8_t>(-10, g_model.frsky.varioCenterMin), +10);
|
||||
CHECK_INCDEC_MODELVAR(event, g_model.frsky.varioCenterMax, -5+max<int8_t>(-10, g_model.frsky.varioCenterMin-5), +15);
|
||||
break;
|
||||
case 3:
|
||||
CHECK_INCDEC_MODELVAR(event, g_model.frsky.varioMax, -7, 7);
|
||||
|
||||
+1
-1
@@ -709,7 +709,7 @@ enum MixSources {
|
||||
MIXSRC_TrimEle,
|
||||
MIXSRC_TrimThr,
|
||||
MIXSRC_TrimAil,
|
||||
MIXSRC_MAX ,
|
||||
MIXSRC_MAX,
|
||||
#if defined(PCBX9D) || defined(PCBACT)
|
||||
MIXSRC_SA,
|
||||
MIXSRC_SB,
|
||||
|
||||
+29
-19
@@ -636,25 +636,25 @@ int16_t getValue(uint8_t i)
|
||||
{
|
||||
/*srcRaw is shifted +1!*/
|
||||
|
||||
if(i<NUM_STICKS+NUM_POTS) return calibratedStick[i];
|
||||
if (i<NUM_STICKS+NUM_POTS) return calibratedStick[i];
|
||||
#if defined(PCBGRUVIN9X) || defined(PCBSKY9X)
|
||||
else if(i<NUM_STICKS+NUM_POTS+NUM_ROTARY_ENCODERS) return getRotaryEncoder(i-(NUM_STICKS+NUM_POTS));
|
||||
else if (i<NUM_STICKS+NUM_POTS+NUM_ROTARY_ENCODERS) return getRotaryEncoder(i-(NUM_STICKS+NUM_POTS));
|
||||
#endif
|
||||
else if(i<MIXSRC_TrimAil) return calc1000toRESX((int16_t)8 * getTrimValue(s_perout_flight_phase, i-(NUM_STICKS+NUM_POTS+NUM_ROTARY_ENCODERS)));
|
||||
else if(i<MIXSRC_MAX) return 1024;
|
||||
else if (i<MIXSRC_TrimAil) return calc1000toRESX((int16_t)8 * getTrimValue(s_perout_flight_phase, i-(NUM_STICKS+NUM_POTS+NUM_ROTARY_ENCODERS)));
|
||||
else if (i<MIXSRC_MAX) return 1024;
|
||||
#if defined(PCBX9D) || defined(PCBACT)
|
||||
else if(i<MIXSRC_SA) return (switchState(SW_SA0) ? -1024 : (switchState(SW_SA1) ? 0 : 1024));
|
||||
else if(i<MIXSRC_SB) return (switchState(SW_SB0) ? -1024 : (switchState(SW_SB1) ? 0 : 1024));
|
||||
else if(i<MIXSRC_SC) return (switchState(SW_SC0) ? -1024 : (switchState(SW_SC1) ? 0 : 1024));
|
||||
else if(i<MIXSRC_SD) return (switchState(SW_SD0) ? -1024 : (switchState(SW_SD1) ? 0 : 1024));
|
||||
else if(i<MIXSRC_SE) return (switchState(SW_SE0) ? -1024 : (switchState(SW_SE1) ? 0 : 1024));
|
||||
else if(i<MIXSRC_SF) return (switchState(SW_SF0) ? -1024 : 1024);
|
||||
else if(i<MIXSRC_SG) return (switchState(SW_SG0) ? -1024 : (switchState(SW_SG1) ? 0 : 1024));
|
||||
else if(i<MIXSRC_SH) return (switchState(SW_SH0) ? -1024 : 1024);
|
||||
else if (i<MIXSRC_SA) return (switchState(SW_SA0) ? -1024 : (switchState(SW_SA1) ? 0 : 1024));
|
||||
else if (i<MIXSRC_SB) return (switchState(SW_SB0) ? -1024 : (switchState(SW_SB1) ? 0 : 1024));
|
||||
else if (i<MIXSRC_SC) return (switchState(SW_SC0) ? -1024 : (switchState(SW_SC1) ? 0 : 1024));
|
||||
else if (i<MIXSRC_SD) return (switchState(SW_SD0) ? -1024 : (switchState(SW_SD1) ? 0 : 1024));
|
||||
else if (i<MIXSRC_SE) return (switchState(SW_SE0) ? -1024 : (switchState(SW_SE1) ? 0 : 1024));
|
||||
else if (i<MIXSRC_SF) return (switchState(SW_SF0) ? -1024 : 1024);
|
||||
else if (i<MIXSRC_SG) return (switchState(SW_SG0) ? -1024 : (switchState(SW_SG1) ? 0 : 1024));
|
||||
else if (i<MIXSRC_SH) return (switchState(SW_SH0) ? -1024 : 1024);
|
||||
#else
|
||||
else if(i<MIXSRC_3POS) return (switchState(SW_ID0) ? -1024 : (switchState(SW_ID1) ? 0 : 1024));
|
||||
else if (i<MIXSRC_3POS) return (switchState(SW_ID0) ? -1024 : (switchState(SW_ID1) ? 0 : 1024));
|
||||
// here the switches are skipped
|
||||
else if(i<MIXSRC_3POS+3)
|
||||
else if (i<MIXSRC_3POS+3)
|
||||
#if defined(HELI)
|
||||
return cyc_anas[i-MIXSRC_3POS];
|
||||
#else
|
||||
@@ -1833,15 +1833,25 @@ BeepANACenter evalSticks(uint8_t mode)
|
||||
if(v < -RESX) v = -RESX;
|
||||
if(v > RESX) v = RESX;
|
||||
|
||||
#if defined(PCBX9D)
|
||||
// TODO constants
|
||||
if(i == 2 || i == 3 || i == 4 || i == 6)
|
||||
v = -v;
|
||||
#endif
|
||||
#if defined(PCBX9D)
|
||||
if (i == STICK3 || i == STICK4 || i == POT1 || i == SLIDER1)
|
||||
v = -v;
|
||||
#endif
|
||||
|
||||
if (g_eeGeneral.throttleReversed && ch==THR_STICK)
|
||||
v = -v;
|
||||
|
||||
#if defined(EXTRA_3POS)
|
||||
if (i == POT1+EXTRA_3POS-1) {
|
||||
if (v < -RESX/2)
|
||||
v = -RESX;
|
||||
else if (v > +RESX/2)
|
||||
v = +RESX;
|
||||
else
|
||||
v = 0;
|
||||
}
|
||||
#endif
|
||||
|
||||
if (i < NUM_STICKS+NUM_POTS) {
|
||||
calibratedStick[ch] = v; //for show in expo
|
||||
|
||||
|
||||
+6
-10
@@ -170,15 +170,6 @@
|
||||
#define CONVERT_PTR(x) ((uint32_t)(x))
|
||||
#endif
|
||||
|
||||
/*
|
||||
#define HELI_VARIANT 0x0004
|
||||
#define VOICE_VARIANT 0x0008
|
||||
#define PHASES_VARIANT 0x0010
|
||||
#define PXX_VARIANT 0x0020
|
||||
#define DSM2_VARIANT 0x0040
|
||||
#define VARIO_VARIANT 0x0080
|
||||
#define HAPTIC_VARIANT 0x0100 */
|
||||
|
||||
#if defined(PCBACT)
|
||||
#include "act/board_act.h"
|
||||
#elif defined(PCBX9D)
|
||||
@@ -570,6 +561,11 @@ enum EnumKeys {
|
||||
SW_ID0,
|
||||
SW_ID1,
|
||||
SW_ID2,
|
||||
#if 0
|
||||
SW_ID3,
|
||||
SW_ID4,
|
||||
SW_ID5,
|
||||
#endif
|
||||
SW_AIL,
|
||||
SW_GEA,
|
||||
SW_TRN,
|
||||
@@ -938,7 +934,7 @@ extern uint16_t maxMixerDuration;
|
||||
extern uint16_t lastMixerDuration;
|
||||
|
||||
#if defined(THRTRACE)
|
||||
#define MAXTRACE 120
|
||||
#define MAXTRACE (LCD_W - 8)
|
||||
extern uint8_t s_traceBuf[MAXTRACE];
|
||||
extern uint8_t s_traceWr;
|
||||
extern int8_t s_traceCnt;
|
||||
|
||||
@@ -73,23 +73,6 @@ inline const pm_char *SDCARD_ERROR(FRESULT result)
|
||||
return STR_SDCARD_ERROR;
|
||||
}
|
||||
|
||||
#if defined(SIMU)
|
||||
#define sdMountPoll()
|
||||
#define sdPoll10ms()
|
||||
#else
|
||||
extern void sdMountPoll();
|
||||
#endif
|
||||
|
||||
#if defined(CPUARM) && !defined(SIMU)
|
||||
extern "C" {
|
||||
extern uint32_t sd_card_ready();
|
||||
extern uint32_t sdMounted();
|
||||
}
|
||||
#else
|
||||
#define sd_card_ready() (true)
|
||||
#define sdMounted() (true)
|
||||
#endif
|
||||
|
||||
#if defined(PCBACT)
|
||||
#define O9X_FOURCC 0x3478396F // o9x for ACT
|
||||
#elif defined(PCBX9D)
|
||||
@@ -100,12 +83,5 @@ extern uint32_t sdMounted();
|
||||
#define O9X_FOURCC 0x3178396F // o9x for gruvin9x
|
||||
#endif
|
||||
|
||||
#if defined(PCBGRUVIN9X) || defined(SIMU)
|
||||
#define SD_IS_HC() (0)
|
||||
#define SD_GET_BLOCKNR() (0)
|
||||
#define SD_GET_SIZE_MB() (0)
|
||||
#define SD_GET_SPEED() (0)
|
||||
#endif
|
||||
|
||||
#endif
|
||||
|
||||
|
||||
@@ -362,4 +362,13 @@ inline void GPIO_Init(GPIO_TypeDef* GPIOx, GPIO_InitTypeDef* GPIO_InitStruct) {
|
||||
|
||||
#define configure_pins(...)
|
||||
|
||||
#define sdMountPoll()
|
||||
#define sdPoll10ms()
|
||||
#define sd_card_ready() (true)
|
||||
#define sdMounted() (true)
|
||||
#define SD_IS_HC() (0)
|
||||
#define SD_GET_BLOCKNR() (0)
|
||||
#define SD_GET_SIZE_MB() (0)
|
||||
#define SD_GET_SPEED() (0)
|
||||
|
||||
#endif
|
||||
|
||||
+12
-7
@@ -39,11 +39,6 @@
|
||||
#include "board.h"
|
||||
#include "audio_driver.h"
|
||||
|
||||
extern "C" {
|
||||
extern void init_SDcard();
|
||||
extern void sdInit();
|
||||
}
|
||||
|
||||
#if defined(REVA)
|
||||
#define GPIO_BUTTON_MENU PIOB->PIO_PDSR
|
||||
#define GPIO_BUTTON_EXIT PIOA->PIO_PDSR
|
||||
@@ -72,8 +67,6 @@ extern void sdInit();
|
||||
#define PIN_BUTTON_LEFT 0x00000008
|
||||
#endif
|
||||
|
||||
#define sdPoll10ms()
|
||||
|
||||
void usbMassStorage();
|
||||
|
||||
#define PIN_ENABLE 0x001
|
||||
@@ -134,6 +127,18 @@ extern uint16_t sessionTimer;
|
||||
|
||||
void setSticksGain(uint8_t gains);
|
||||
|
||||
// SD driver
|
||||
#if !defined(SIMU)
|
||||
#define sdPoll10ms()
|
||||
void sdMountPoll();
|
||||
extern "C" {
|
||||
void init_SDcard();
|
||||
void sdInit();
|
||||
uint32_t sd_card_ready();
|
||||
uint32_t sdMounted();
|
||||
}
|
||||
#endif
|
||||
|
||||
// WDT driver
|
||||
#if !defined(SIMU)
|
||||
#define wdt_disable()
|
||||
|
||||
@@ -229,6 +229,20 @@ uint32_t switchState(EnumKeys enuk)
|
||||
xxx = ~c & 0x00000800; // SW_IDL2 PC11
|
||||
break;
|
||||
|
||||
#if 0
|
||||
case SW_ID3:
|
||||
result = (calibratedStick[POT1+EXTRA_3POS-1] < 0);
|
||||
break;
|
||||
|
||||
case SW_ID4:
|
||||
result = (calibratedStick[POT1+EXTRA_3POS-1] == 0);
|
||||
break;
|
||||
|
||||
case SW_ID5:
|
||||
result = (calibratedStick[POT1+EXTRA_3POS-1] > 0);
|
||||
break;
|
||||
#endif
|
||||
|
||||
case SW_GEA:
|
||||
xxx = c & 0x00010000; // SW_GEAR PC16
|
||||
break;
|
||||
|
||||
@@ -64,19 +64,17 @@ void menuStatisticsView(uint8_t event)
|
||||
uint8_t traceRd = (s_traceCnt < 0 ? s_traceWr : 0);
|
||||
const uint8_t x=5;
|
||||
const uint8_t y=60;
|
||||
lcd_hline(x-3,y,120+3+3);
|
||||
lcd_hline(x-3,y,MAXTRACE+3+3);
|
||||
lcd_vline(x,y-32,32+3);
|
||||
|
||||
for(uint8_t i=0; i<120; i+=6)
|
||||
{
|
||||
for (uint8_t i=0; i<MAXTRACE; i+=6) {
|
||||
lcd_vline(x+i+6,y-1,3);
|
||||
}
|
||||
for(uint8_t i=1; i<=120; i++)
|
||||
{
|
||||
lcd_vline(x+i,y-s_traceBuf[traceRd],s_traceBuf[traceRd]);
|
||||
for (uint8_t i=1; i<=MAXTRACE; i++) {
|
||||
lcd_vline(x+i, y-s_traceBuf[traceRd], s_traceBuf[traceRd]);
|
||||
traceRd++;
|
||||
if(traceRd>=MAXTRACE) traceRd=0;
|
||||
if(traceRd==s_traceWr) break;
|
||||
if (traceRd>=MAXTRACE) traceRd = 0;
|
||||
if (traceRd==s_traceWr) break;
|
||||
}
|
||||
#endif
|
||||
}
|
||||
|
||||
@@ -119,6 +119,20 @@ bool switchState(EnumKeys enuk)
|
||||
result = !(PINE & (1<<INP_E_ID2));
|
||||
break;
|
||||
|
||||
#if 0
|
||||
case SW_ID3:
|
||||
result = (calibratedStick[POT1+EXTRA_3POS-1] < 0);
|
||||
break;
|
||||
|
||||
case SW_ID4:
|
||||
result = (calibratedStick[POT1+EXTRA_3POS-1] == 0);
|
||||
break;
|
||||
|
||||
case SW_ID5:
|
||||
result = (calibratedStick[POT1+EXTRA_3POS-1] > 0);
|
||||
break;
|
||||
#endif
|
||||
|
||||
case SW_GEA:
|
||||
result = PINE & (1<<INP_E_Gear);
|
||||
break;
|
||||
|
||||
@@ -217,14 +217,14 @@
|
||||
#define TR_CYC_VSRCRAW "[C1]""[C2]""[C3]"
|
||||
#endif
|
||||
|
||||
#if defined (P13POS)
|
||||
#define TR_VSRCRAW "Sm\203r""V\212\207k""Plyn""K\206id""3PO2""Pot2""Pot3" TR_ROTARY_ENCODERS_VSRCRAW "TrmS" "TrmV" "TrmP" "TrmK" "MAX ""3PO1" TR_CYC_VSRCRAW
|
||||
#elif defined (P23POS)
|
||||
#define TR_VSRCRAW "Sm\203r""V\212\207k""Plyn""K\206id""Pot1""3PO2""Pot3" TR_ROTARY_ENCODERS_VSRCRAW "TrmS" "TrmV" "TrmP" "TrmK" "MAX ""3PO1" TR_CYC_VSRCRAW
|
||||
#elif defined (P33POS)
|
||||
#define TR_VSRCRAW "Sm\203r""V\212\207k""Plyn""K\206id""Pot1""Pot3""3PO2" TR_ROTARY_ENCODERS_VSRCRAW "TrmS" "TrmV" "TrmP" "TrmK" "MAX ""3PO1" TR_CYC_VSRCRAW
|
||||
#elseN
|
||||
#define TR_VSRCRAW "Sm\203r""V\212\207k""Plyn""K\206id""Pot1""Pot2""Pot3" TR_ROTARY_ENCODERS_VSRCRAW "TrmS" "TrmV" "TrmP" "TrmK" "MAX ""3POS" TR_CYC_VSRCRAW
|
||||
#if EXTRA_3POS == 1
|
||||
#define TR_VSRCRAW "Sm\203r""V\212\207k""Plyn""K\206id""3PO2""Pot2""Pot3" TR_ROTARY_ENCODERS_VSRCRAW "TrmS" "TrmV" "TrmP" "TrmK" "MAX ""3PO1" TR_CYC_VSRCRAW
|
||||
#elif EXTRA_3POS == 2
|
||||
#define TR_VSRCRAW "Sm\203r""V\212\207k""Plyn""K\206id""Pot1""3PO2""Pot3" TR_ROTARY_ENCODERS_VSRCRAW "TrmS" "TrmV" "TrmP" "TrmK" "MAX ""3PO1" TR_CYC_VSRCRAW
|
||||
#elif EXTRA_3POS == 3
|
||||
#define TR_VSRCRAW "Sm\203r""V\212\207k""Plyn""K\206id""Pot1""Pot3""3PO2" TR_ROTARY_ENCODERS_VSRCRAW "TrmS" "TrmV" "TrmP" "TrmK" "MAX ""3PO1" TR_CYC_VSRCRAW
|
||||
#else
|
||||
#define TR_VSRCRAW "Sm\203r""V\212\207k""Plyn""K\206id""Pot1""Pot2""Pot3" TR_ROTARY_ENCODERS_VSRCRAW "TrmS" "TrmV" "TrmP" "TrmK" "MAX ""3POS" TR_CYC_VSRCRAW
|
||||
#endif
|
||||
|
||||
#define LEN_VTMRMODES "\003"
|
||||
|
||||
@@ -218,14 +218,14 @@
|
||||
#define TR_CYC_VSRCRAW "[C1]""[C2]""[C3]"
|
||||
#endif
|
||||
|
||||
#if defined (P13POS)
|
||||
#define TR_VSRCRAW "StR\0""H\203R\0""Gas\0""QuR\0""3PO2""P2\0 ""P3\0 " TR_ROTARY_ENCODERS_VSRCRAW "TrmS" "TrmH" "TrmG" "TrmQ" "MAX\0""3PO1" TR_CYC_VSRCRAW
|
||||
#elif defined (P23POS)
|
||||
#define TR_VSRCRAW "StR\0""H\203R\0""Gas\0""QuR\0""P1\0 ""3PO2""P3\0 " TR_ROTARY_ENCODERS_VSRCRAW "TrmS" "TrmH" "TrmG" "TrmQ" "MAX\0""3PO1" TR_CYC_VSRCRAW
|
||||
#elif defined (P33POS)
|
||||
#define TR_VSRCRAW "StR\0""H\203R\0""Gas\0""QuR\0""P1\0 ""P2\0 ""3PO2" TR_ROTARY_ENCODERS_VSRCRAW "TrmS" "TrmH" "TrmG" "TrmQ" "MAX\0""3PO1" TR_CYC_VSRCRAW
|
||||
#if EXTRA_3POS == 1
|
||||
#define TR_VSRCRAW "StR\0""H\203R\0""Gas\0""QuR\0""3PO2""P2\0 ""P3\0 " TR_ROTARY_ENCODERS_VSRCRAW "TrmS" "TrmH" "TrmG" "TrmQ" "MAX\0""3PO1" TR_CYC_VSRCRAW
|
||||
#elif EXTRA_3POS == 2
|
||||
#define TR_VSRCRAW "StR\0""H\203R\0""Gas\0""QuR\0""P1\0 ""3PO2""P3\0 " TR_ROTARY_ENCODERS_VSRCRAW "TrmS" "TrmH" "TrmG" "TrmQ" "MAX\0""3PO1" TR_CYC_VSRCRAW
|
||||
#elif EXTRA_3POS == 3
|
||||
#define TR_VSRCRAW "StR\0""H\203R\0""Gas\0""QuR\0""P1\0 ""P2\0 ""3PO2" TR_ROTARY_ENCODERS_VSRCRAW "TrmS" "TrmH" "TrmG" "TrmQ" "MAX\0""3PO1" TR_CYC_VSRCRAW
|
||||
#else
|
||||
#define TR_VSRCRAW "StR\0""H\203R\0""Gas\0""QuR\0""P1\0 ""P2\0 ""P3\0 " TR_ROTARY_ENCODERS_VSRCRAW "TrmS" "TrmH" "TrmG" "TrmQ" "MAX\0""3POS" TR_CYC_VSRCRAW
|
||||
#define TR_VSRCRAW "StR\0""H\203R\0""Gas\0""QuR\0""P1\0 ""P2\0 ""P3\0 " TR_ROTARY_ENCODERS_VSRCRAW "TrmS" "TrmH" "TrmG" "TrmQ" "MAX\0""3POS" TR_CYC_VSRCRAW
|
||||
#endif
|
||||
|
||||
#define LEN_VTMRMODES "\003"
|
||||
|
||||
+13
-6
@@ -210,12 +210,19 @@
|
||||
#define TR_VRENCODERS "REa""REb"
|
||||
|
||||
#define LEN_VSWITCHES "\003"
|
||||
|
||||
#if 0
|
||||
#define TR_EXTRA_3POS_SWITCHES "ID3""ID4""ID5"
|
||||
#else
|
||||
#define TR_EXTRA_3POS_SWITCHES
|
||||
#endif
|
||||
|
||||
#if defined(PCBX9D)
|
||||
#define TR_VSWITCHES "SA\300""SA-""SA\301""SB\300""SB-""SB\301""SC\300""SC-""SC\301""SD\300""SD-""SD\301""SE\300""SE-""SE\301""SF\300""SF\301""SG\300""SG-""SG\301""SH\300""SH\301""CS1""CS2""CS3""CS4""CS5""CS6""CS7""CS8""CS9""CSA""CSB""CSC""CSD""CSE""CSF""CSG""CSH""CSI""CSJ""CSK""CSL""CSM""CSN""CSO""CSP""CSQ""CSR""CSS""CST""CSU""CSV""CSW"" ON"
|
||||
#elif defined(PCBSKY9X)
|
||||
#define TR_VSWITCHES "THR""RUD""ELE""ID0""ID1""ID2""AIL""GEA""TRN""CS1""CS2""CS3""CS4""CS5""CS6""CS7""CS8""CS9""CSA""CSB""CSC""CSD""CSE""CSF""CSG""CSH""CSI""CSJ""CSK""CSL""CSM""CSN""CSO""CSP""CSQ""CSR""CSS""CST""CSU""CSV""CSW"" ON"
|
||||
#define TR_VSWITCHES "THR""RUD""ELE""ID0""ID1""ID2" TR_EXTRA_3POS_SWITCHES "AIL""GEA""TRN""CS1""CS2""CS3""CS4""CS5""CS6""CS7""CS8""CS9""CSA""CSB""CSC""CSD""CSE""CSF""CSG""CSH""CSI""CSJ""CSK""CSL""CSM""CSN""CSO""CSP""CSQ""CSR""CSS""CST""CSU""CSV""CSW"" ON"
|
||||
#else
|
||||
#define TR_VSWITCHES "THR""RUD""ELE""ID0""ID1""ID2""AIL""GEA""TRN""CS1""CS2""CS3""CS4""CS5""CS6""CS7""CS8""CS9""CSA""CSB""CSC"" ON"
|
||||
#define TR_VSWITCHES "THR""RUD""ELE""ID0""ID1""ID2" TR_EXTRA_3POS_SWITCHES "AIL""GEA""TRN""CS1""CS2""CS3""CS4""CS5""CS6""CS7""CS8""CS9""CSA""CSB""CSC"" ON"
|
||||
#endif
|
||||
|
||||
#define LEN_VSRCRAW "\004"
|
||||
@@ -223,13 +230,13 @@
|
||||
#if defined(PCBX9D)
|
||||
#define TR_POTS_VSRCRAW "S1\0 ""S2\0 ""LS\0 ""RS\0 "
|
||||
#define TR_SW_VSRCRAW "SA\0 ""SB\0 ""SC\0 ""SD\0 ""SE\0 ""SF\0 ""SG\0 ""SH\0 "
|
||||
#elif defined (P13POS)
|
||||
#elif EXTRA_3POS == 1
|
||||
#define TR_POTS_VSRCRAW "3PO2""P2\0 ""P3\0 "
|
||||
#define TR_SW_VSRCRAW "3PO1"
|
||||
#elif defined (P23POS)
|
||||
#elif EXTRA_3POS == 2
|
||||
#define TR_POTS_VSRCRAW "P1\0 ""3PO2""P3\0 "
|
||||
#define TR_SW_VSRCRAW "3PO1"
|
||||
#elif defined (P33POS)
|
||||
#elif EXTRA_3POS == 3
|
||||
#define TR_POTS_VSRCRAW "P1\0 ""P2\0 ""3PO2"
|
||||
#define TR_SW_VSRCRAW "3PO1"
|
||||
#else
|
||||
@@ -290,7 +297,7 @@
|
||||
#define TR_ELIMITS TR("E.Limits","Extended Limits")
|
||||
#define TR_ETRIMS TR("E.Trims","Extended Trims")
|
||||
#define TR_TRIMINC "Trim Step"
|
||||
#define TR_TTRACE TR("T-Trace","Throttle Trace")
|
||||
#define TR_TTRACE TR("T-Source","Throttle Source")
|
||||
#define TR_TTRIM TR("T-Trim","Throttle Trim")
|
||||
#define TR_BEEPCTR TR("Ctr Beep","Center Beep")
|
||||
#define TR_PROTO TR(INDENT"Proto",INDENT"Protocol")
|
||||
|
||||
@@ -210,14 +210,14 @@
|
||||
#define TR_CYC_VSRCRAW "[C1]""[C2]""[C3]"
|
||||
#endif
|
||||
|
||||
#if defined (P13POS)
|
||||
#define TR_VSRCRAW "Dir ""Ele ""Acel""Ail ""3PO2""P2 ""P3 " TR_ROTARY_ENCODERS_VSRCRAW "TrmR" "TrmE" "TrmT" "TrmA" "MAX ""3PO1" TR_CYC_VSRCRAW
|
||||
#elif defined (P23POS)
|
||||
#define TR_VSRCRAW "Dir ""Ele ""Acel""Ail ""P1 ""3PO2""P3 " TR_ROTARY_ENCODERS_VSRCRAW "TrmR" "TrmE" "TrmT" "TrmA" "MAX ""3PO1" TR_CYC_VSRCRAW
|
||||
#elif defined (P33POS)
|
||||
#define TR_VSRCRAW "Dir ""Ele ""Acel""Ail ""P1 ""P2 ""3PO2" TR_ROTARY_ENCODERS_VSRCRAW "TrmR" "TrmE" "TrmT" "TrmA" "MAX ""3PO1" TR_CYC_VSRCRAW
|
||||
#if EXTRA_3POS == 1
|
||||
#define TR_VSRCRAW "Dir ""Ele ""Acel""Ail ""3PO2""P2 ""P3 " TR_ROTARY_ENCODERS_VSRCRAW "TrmR" "TrmE" "TrmT" "TrmA" "MAX ""3PO1" TR_CYC_VSRCRAW
|
||||
#elif EXTRA_3POS == 2
|
||||
#define TR_VSRCRAW "Dir ""Ele ""Acel""Ail ""P1 ""3PO2""P3 " TR_ROTARY_ENCODERS_VSRCRAW "TrmR" "TrmE" "TrmT" "TrmA" "MAX ""3PO1" TR_CYC_VSRCRAW
|
||||
#elif EXTRA_3POS == 3
|
||||
#define TR_VSRCRAW "Dir ""Ele ""Acel""Ail ""P1 ""P2 ""3PO2" TR_ROTARY_ENCODERS_VSRCRAW "TrmR" "TrmE" "TrmT" "TrmA" "MAX ""3PO1" TR_CYC_VSRCRAW
|
||||
#else
|
||||
#define TR_VSRCRAW "Dir ""Ele ""Acel""Ail ""P1 ""P2 ""P3 " TR_ROTARY_ENCODERS_VSRCRAW "TrmR" "TrmE" "TrmT" "TrmA" "MAX ""3POS" TR_CYC_VSRCRAW
|
||||
#define TR_VSRCRAW "Dir ""Ele ""Acel""Ail ""P1 ""P2 ""P3 " TR_ROTARY_ENCODERS_VSRCRAW "TrmR" "TrmE" "TrmT" "TrmA" "MAX ""3POS" TR_CYC_VSRCRAW
|
||||
#endif
|
||||
|
||||
#define LEN_VTMRMODES "\003"
|
||||
|
||||
@@ -218,14 +218,14 @@
|
||||
#define TR_CYC_VSRCRAW "[C1]""[C2]""[C3]"
|
||||
#endif
|
||||
|
||||
#if defined (P13POS)
|
||||
#define TR_VSRCRAW "Dir\0""Prf\0""Gaz\0""Ail\0""3PO2""P2\0 ""P3\0 " TR_ROTARY_ENCODERS_VSRCRAW "TrmD" "TrmP" "TrmG" "TrmA" "MAX\0""3PO1" TR_CYC_VSRCRAW
|
||||
#elif defined (P23POS)
|
||||
#define TR_VSRCRAW "Dir\0""Prf\0""Gaz\0""Ail\0""P1\0 ""3PO2""P3\0 " TR_ROTARY_ENCODERS_VSRCRAW "TrmD" "TrmP" "TrmG" "TrmA" "MAX\0""3PO1" TR_CYC_VSRCRAW
|
||||
#elif defined (P33POS)
|
||||
#define TR_VSRCRAW "Dir\0""Prf\0""Gaz\0""Ail\0""P1\0 ""P2\0 ""3PO2" TR_ROTARY_ENCODERS_VSRCRAW "TrmD" "TrmP" "TrmG" "TrmA" "MAX\0""3PO1" TR_CYC_VSRCRAW
|
||||
#if EXTRA_3POS == 1
|
||||
#define TR_VSRCRAW "Dir\0""Prf\0""Gaz\0""Ail\0""3PO2""P2\0 ""P3\0 " TR_ROTARY_ENCODERS_VSRCRAW "TrmD" "TrmP" "TrmG" "TrmA" "MAX\0""3PO1" TR_CYC_VSRCRAW
|
||||
#elif EXTRA_3POS == 2
|
||||
#define TR_VSRCRAW "Dir\0""Prf\0""Gaz\0""Ail\0""P1\0 ""3PO2""P3\0 " TR_ROTARY_ENCODERS_VSRCRAW "TrmD" "TrmP" "TrmG" "TrmA" "MAX\0""3PO1" TR_CYC_VSRCRAW
|
||||
#elif EXTRA_3POS == 3
|
||||
#define TR_VSRCRAW "Dir\0""Prf\0""Gaz\0""Ail\0""P1\0 ""P2\0 ""3PO2" TR_ROTARY_ENCODERS_VSRCRAW "TrmD" "TrmP" "TrmG" "TrmA" "MAX\0""3PO1" TR_CYC_VSRCRAW
|
||||
#else
|
||||
#define TR_VSRCRAW "Dir\0""Prf\0""Gaz\0""Ail\0""P1\0 ""P2\0 ""P3\0 " TR_ROTARY_ENCODERS_VSRCRAW "TrmD" "TrmP" "TrmG" "TrmA" "MAX\0""3POS" TR_CYC_VSRCRAW
|
||||
#define TR_VSRCRAW "Dir\0""Prf\0""Gaz\0""Ail\0""P1\0 ""P2\0 ""P3\0 " TR_ROTARY_ENCODERS_VSRCRAW "TrmD" "TrmP" "TrmG" "TrmA" "MAX\0""3POS" TR_CYC_VSRCRAW
|
||||
#endif
|
||||
|
||||
#define LEN_VTMRMODES "\003"
|
||||
|
||||
@@ -216,14 +216,14 @@
|
||||
#define TR_CYC_VSRCRAW "[C1]""[C2]""[C3]"
|
||||
#endif
|
||||
|
||||
#if defined (P13POS)
|
||||
#define TR_VSRCRAW "Rud ""Ele ""Thr ""Ail ""3PO2""P2 ""P3 " TR_ROTARY_ENCODERS_VSRCRAW "TrmR" "TrmE" "TrmT" "TrmA" "MAX ""3PO1" TR_CYC_VSRCRAW
|
||||
#elif defined (P23POS)
|
||||
#define TR_VSRCRAW "Rud ""Ele ""Thr ""Ail ""P1 ""3PO2""P3 " TR_ROTARY_ENCODERS_VSRCRAW "TrmR" "TrmE" "TrmT" "TrmA" "MAX ""3PO1" TR_CYC_VSRCRAW
|
||||
#elif defined (P33POS)
|
||||
#define TR_VSRCRAW "Rud ""Ele ""Thr ""Ail ""P1 ""P2 ""3PO2" TR_ROTARY_ENCODERS_VSRCRAW "TrmR" "TrmE" "TrmT" "TrmA" "MAX ""3PO1" TR_CYC_VSRCRAW
|
||||
#if EXTRA_3POS == 1
|
||||
#define TR_VSRCRAW "Rud ""Ele ""Thr ""Ail ""3PO2""P2 ""P3 " TR_ROTARY_ENCODERS_VSRCRAW "TrmR" "TrmE" "TrmT" "TrmA" "MAX ""3PO1" TR_CYC_VSRCRAW
|
||||
#elif EXTRA_3POS == 2
|
||||
#define TR_VSRCRAW "Rud ""Ele ""Thr ""Ail ""P1 ""3PO2""P3 " TR_ROTARY_ENCODERS_VSRCRAW "TrmR" "TrmE" "TrmT" "TrmA" "MAX ""3PO1" TR_CYC_VSRCRAW
|
||||
#elif EXTRA_3POS == 3
|
||||
#define TR_VSRCRAW "Rud ""Ele ""Thr ""Ail ""P1 ""P2 ""3PO2" TR_ROTARY_ENCODERS_VSRCRAW "TrmR" "TrmE" "TrmT" "TrmA" "MAX ""3PO1" TR_CYC_VSRCRAW
|
||||
#else
|
||||
#define TR_VSRCRAW "Rud ""Ele ""Thr ""Ail ""P1 ""P2 ""P3 " TR_ROTARY_ENCODERS_VSRCRAW "TrmR" "TrmE" "TrmT" "TrmA" "MAX ""3POS" TR_CYC_VSRCRAW
|
||||
#define TR_VSRCRAW "Rud ""Ele ""Thr ""Ail ""P1 ""P2 ""P3 " TR_ROTARY_ENCODERS_VSRCRAW "TrmR" "TrmE" "TrmT" "TrmA" "MAX ""3POS" TR_CYC_VSRCRAW
|
||||
#endif
|
||||
|
||||
|
||||
|
||||
@@ -218,18 +218,16 @@
|
||||
#define TR_CYC_VSRCRAW "[C1]""[C2]""[C3]"
|
||||
#endif
|
||||
|
||||
#if defined (P13POS)
|
||||
#define TR_VSRCRAW "Lem\0""Pfd\0""Mot\0""Ail\0""3PO2""Pot2""Pot3" TR_ROTARY_ENCODERS_VSRCRAW "TrmL" "TrmP" "TrmM" "TrmA" "MAX\0""3PO1" TR_CYC_VSRCRAW
|
||||
#elif defined (P23POS)
|
||||
#define TR_VSRCRAW "Lem\0""Pfd\0""Mot\0""Ail\0""Pot1""3PO2""Pot3" TR_ROTARY_ENCODERS_VSRCRAW "TrmL" "TrmP" "TrmM" "TrmA" "MAX\0""3PO1" TR_CYC_VSRCRAW
|
||||
#elif defined (P33POS)
|
||||
#define TR_VSRCRAW "Lem\0""Pfd\0""Mot\0""Ail\0""Pot1""Pot2""3PO2" TR_ROTARY_ENCODERS_VSRCRAW "TrmL" "TrmP" "TrmM" "TrmA" "MAX\0""3PO1" TR_CYC_VSRCRAW
|
||||
#if EXTRA_3POS == 1
|
||||
#define TR_VSRCRAW "Lem\0""Pfd\0""Mot\0""Ail\0""3PO2""Pot2""Pot3" TR_ROTARY_ENCODERS_VSRCRAW "TrmL" "TrmP" "TrmM" "TrmA" "MAX\0""3PO1" TR_CYC_VSRCRAW
|
||||
#elif EXTRA_3POS == 2
|
||||
#define TR_VSRCRAW "Lem\0""Pfd\0""Mot\0""Ail\0""Pot1""3PO2""Pot3" TR_ROTARY_ENCODERS_VSRCRAW "TrmL" "TrmP" "TrmM" "TrmA" "MAX\0""3PO1" TR_CYC_VSRCRAW
|
||||
#elif EXTRA_3POS == 3
|
||||
#define TR_VSRCRAW "Lem\0""Pfd\0""Mot\0""Ail\0""Pot1""Pot2""3PO2" TR_ROTARY_ENCODERS_VSRCRAW "TrmL" "TrmP" "TrmM" "TrmA" "MAX\0""3PO1" TR_CYC_VSRCRAW
|
||||
#else
|
||||
#define TR_VSRCRAW "Lem\0""Pfd\0""Mot\0""Ail\0""Pot1""Pot2""Pot3" TR_ROTARY_ENCODERS_VSRCRAW "TrmL" "TrmP" "TrmM" "TrmA" "MAX\0""3POS" TR_CYC_VSRCRAW
|
||||
#define TR_VSRCRAW "Lem\0""Pfd\0""Mot\0""Ail\0""Pot1""Pot2""Pot3" TR_ROTARY_ENCODERS_VSRCRAW "TrmL" "TrmP" "TrmM" "TrmA" "MAX\0""3POS" TR_CYC_VSRCRAW
|
||||
#endif
|
||||
|
||||
|
||||
|
||||
#define LEN_VTMRMODES "\003"
|
||||
#define TR_VTMRMODES "OFF""ABS""MTs""MT%""MTt"
|
||||
|
||||
|
||||
@@ -221,18 +221,16 @@
|
||||
#define TR_CYC_VSRCRAW "[C1]""[C2]""[C3]"
|
||||
#endif
|
||||
|
||||
#if defined (P13POS)
|
||||
#define TR_VSRCRAW "ROD ""H\205J ""GAS ""SKE ""3PO2""P2 ""P3 " TR_ROTARY_ENCODERS_VSRCRAW "TrmR" "TrmH" "TrmG" "TrmS" "MAX ""3PO1" TR_CYC_VSRCRAW
|
||||
#elif defined (P23POS)
|
||||
#define TR_VSRCRAW "ROD ""H\205J ""GAS ""SKE ""P1 ""3PO2""P3 " TR_ROTARY_ENCODERS_VSRCRAW "TrmR" "TrmH" "TrmG" "TrmS" "MAX ""3PO1" TR_CYC_VSRCRAW
|
||||
#elif defined (P33POS)
|
||||
#define TR_VSRCRAW "ROD ""H\205J ""GAS ""SKE ""P1 ""P2 ""3PO2" TR_ROTARY_ENCODERS_VSRCRAW "TrmR" "TrmH" "TrmG" "TrmS" "MAX ""3PO1" TR_CYC_VSRCRAW
|
||||
#if EXTRA_3POS == 1
|
||||
#define TR_VSRCRAW "ROD ""H\205J ""GAS ""SKE ""3PO2""P2 ""P3 " TR_ROTARY_ENCODERS_VSRCRAW "TrmR" "TrmH" "TrmG" "TrmS" "MAX ""3PO1" TR_CYC_VSRCRAW
|
||||
#elif EXTRA_3POS == 2
|
||||
#define TR_VSRCRAW "ROD ""H\205J ""GAS ""SKE ""P1 ""3PO2""P3 " TR_ROTARY_ENCODERS_VSRCRAW "TrmR" "TrmH" "TrmG" "TrmS" "MAX ""3PO1" TR_CYC_VSRCRAW
|
||||
#elif EXTRA_3POS == 3
|
||||
#define TR_VSRCRAW "ROD ""H\205J ""GAS ""SKE ""P1 ""P2 ""3PO2" TR_ROTARY_ENCODERS_VSRCRAW "TrmR" "TrmH" "TrmG" "TrmS" "MAX ""3PO1" TR_CYC_VSRCRAW
|
||||
#else
|
||||
#define TR_VSRCRAW "ROD ""H\205J ""GAS ""SKE ""P1 ""P2 ""P3 " TR_ROTARY_ENCODERS_VSRCRAW "TrmR" "TrmH" "TrmG" "TrmS" "MAX ""3POS" TR_CYC_VSRCRAW
|
||||
#define TR_VSRCRAW "ROD ""H\205J ""GAS ""SKE ""P1 ""P2 ""P3 " TR_ROTARY_ENCODERS_VSRCRAW "TrmR" "TrmH" "TrmG" "TrmS" "MAX ""3POS" TR_CYC_VSRCRAW
|
||||
#endif
|
||||
|
||||
|
||||
|
||||
#define LEN_VTMRMODES "\003"
|
||||
#define TR_VTMRMODES "AV ""ABS""THs""TH%""THt"
|
||||
|
||||
|
||||
@@ -103,8 +103,6 @@ void dacInit()
|
||||
void audioInit()
|
||||
{
|
||||
dacInit() ;
|
||||
|
||||
// TODO - for volume, shared with EEPROM?
|
||||
}
|
||||
|
||||
void audioEnd()
|
||||
|
||||
+12
-15
@@ -55,14 +55,6 @@
|
||||
#define TIMER_MULT_APB1 2
|
||||
#define TIMER_MULT_APB2 1
|
||||
|
||||
// TODO elsewhere
|
||||
#if !defined(SIMU)
|
||||
#define SD_IS_HC() (1)
|
||||
#endif
|
||||
|
||||
void sdInit();
|
||||
void sdPoll10ms();
|
||||
|
||||
void usbMassStorage();
|
||||
|
||||
#define JACK_PPM_OUT()
|
||||
@@ -75,12 +67,6 @@ extern uint8_t temperature ; // Raw temp reading
|
||||
extern uint8_t maxTemperature ; // Raw temp reading
|
||||
uint8_t getTemperature();
|
||||
|
||||
#define SD_GET_SIZE_MB() (0)
|
||||
#define SD_GET_BLOCKNR() (0)
|
||||
#define SD_GET_SPEED() (0)
|
||||
|
||||
void pwrOff();
|
||||
|
||||
#define strcpy_P strcpy
|
||||
#define strcat_P strcat
|
||||
|
||||
@@ -96,7 +82,6 @@ void debugInit();
|
||||
void init_trainer_ppm();
|
||||
void init_trainer_capture();
|
||||
|
||||
|
||||
#define DEBUG_UART_BAUDRATE 115200
|
||||
|
||||
void uartInit(void);
|
||||
@@ -105,6 +90,17 @@ void uartSendChar(uint8_t c);
|
||||
void delaysInit(void);
|
||||
void delay_01us(uint16_t nb);
|
||||
|
||||
// SD driver
|
||||
#if !defined(SIMU)
|
||||
#define SD_IS_HC() (1)
|
||||
#define SD_GET_SIZE_MB() (0)
|
||||
#define SD_GET_BLOCKNR() (0)
|
||||
#define SD_GET_SPEED() (0)
|
||||
void sdInit();
|
||||
void sdPoll10ms();
|
||||
#define sdMountPoll()
|
||||
#endif
|
||||
|
||||
// Keys driver
|
||||
void keysInit();
|
||||
uint32_t readKeys();
|
||||
@@ -129,6 +125,7 @@ extern volatile uint16_t Analog_values[];
|
||||
// Power driver
|
||||
void pwrInit();
|
||||
uint32_t pwrCheck();
|
||||
void pwrOff();
|
||||
|
||||
// Backlight driver
|
||||
#define setBacklight(xx)
|
||||
|
||||
@@ -906,15 +906,4 @@ uint32_t sdMounted()
|
||||
return g_FATFS_Obj.fs_type != 0;
|
||||
}
|
||||
|
||||
void sdMountPoll()
|
||||
{
|
||||
/* TODO a define
|
||||
static uint8_t mountTimer;
|
||||
if (mountTimer-- == 0) {
|
||||
mountTimer = 100;
|
||||
if (!sdMounted()) {
|
||||
sdInit();
|
||||
}
|
||||
}*/
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user