merge conflicts

This commit is contained in:
mhotar
2014-09-29 22:09:26 +02:00
45 changed files with 860 additions and 619 deletions
+2 -2
View File
@@ -797,7 +797,7 @@ void CompareDialog::printMixers()
if (md->swtch.type) str += " " + tr("Switch") + QString("(%1)").arg(md->swtch.toString());
if (md->carryTrim) str += " " + tr("noTrim");
if (md->sOffset) str += " "+ tr("Offset") + QString(" (%1%)").arg(getGVarString(md->sOffset));
if (md->curve.value) str += " " + md->curve.toString().replace("<", "&lt;").replace(">", "&gt;");
if (md->curve.value) str += " " + Qt::escape(md->curve.toString());
if (md->delayDown || md->delayUp) str += tr(" Delay(u%1:d%2)").arg(md->delayUp/scale).arg(md->delayDown/scale);
if (md->speedDown || md->speedUp) str += tr(" Slow(u%1:d%2)").arg(md->speedUp/scale).arg(md->speedDown/scale);
if (md->mixWarn) str += " "+tr("Warn")+QString("(%1)").arg(md->mixWarn);
@@ -875,7 +875,7 @@ void CompareDialog::printMixers()
if (md->swtch.type) str += " " + tr("Switch") + QString("(%1)").arg(md->swtch.toString());
if (md->carryTrim) str += " " + tr("noTrim");
if (md->sOffset) str += " "+ tr("Offset") + QString(" (%1%)").arg(getGVarString(md->sOffset));
if (md->curve.value) str += " " + md->curve.toString().replace("<", "&lt;").replace(">", "&gt;");
if (md->curve.value) str += " " + Qt::escape(md->curve.toString());
if (md->delayDown || md->delayUp) str += tr(" Delay(u%1:d%2)").arg(md->delayUp/scale).arg(md->delayDown/scale);
if (md->speedDown || md->speedUp) str += tr(" Slow(u%1:d%2)").arg(md->speedUp/scale).arg(md->speedDown/scale);
if (md->mixWarn) str += " "+tr("Warn")+QString("(%1)").arg(md->mixWarn);
+12 -2
View File
@@ -6,8 +6,8 @@
<rect>
<x>0</x>
<y>0</y>
<width>717</width>
<height>431</height>
<width>780</width>
<height>450</height>
</rect>
</property>
<property name="windowTitle">
@@ -839,6 +839,16 @@
<string>S-Port Mirror</string>
</property>
</item>
<item>
<property name="text">
<string>Telemetry</string>
</property>
</item>
<item>
<property name="text">
<string>SBUS Trainer</string>
</property>
</item>
<item>
<property name="text">
<string>Debug</string>
+1 -1
View File
@@ -174,7 +174,7 @@ QString InputsPanel::getInputText(int dest, bool * new_ch)
}
}
if (md->curve.value) str += " " + Qt::escape(md->curve.toString());
if (md->curve.value) str += " " + md->curve.toString();
QString phasesStr = getPhasesStr(md->phases, model);
if (!phasesStr.isEmpty()) str += " " + phasesStr;
+20 -11
View File
@@ -67,12 +67,12 @@
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
</property>
<layout class="QGridLayout" name="gridLayout_69" rowstretch="0,0,0,0,0,0,0,0,0" columnstretch="0,0,0,0,0,0,0">
<property name="margin">
<number>0</number>
</property>
<property name="verticalSpacing">
<number>6</number>
</property>
<property name="margin">
<number>0</number>
</property>
<item row="2" column="3" alignment="Qt::AlignLeft">
<widget class="QSpinBox" name="channelsStart">
<property name="maximumSize">
@@ -245,20 +245,29 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="maximumSize">
<size>
<width>125</width>
<height>16777215</height>
</size>
</property>
<item>
<property name="text">
<string>Master</string>
<string>Master/Jack</string>
</property>
</item>
<item>
<property name="text">
<string>Slave</string>
<string>Slave/Jack</string>
</property>
</item>
<item>
<property name="text">
<string>Master/SBUS Module</string>
</property>
</item>
<item>
<property name="text">
<string>Master/CPPM Module</string>
</property>
</item>
<item>
<property name="text">
<string>Master/SBUS in battery compartment</string>
</property>
</item>
</widget>
+1 -29
View File
@@ -586,7 +586,6 @@ void TelemetryPanel::setup()
int varioCap = firmware->getCapability(HasVario);
if (!varioCap) {
ui->varioLimitMax_DSB->hide();
ui->varioLimitMinOff_ChkB->hide();
ui->varioLimitMin_DSB->hide();
ui->varioLimitCenterMin_DSB->hide();
ui->varioLimitCenterMax_DSB->hide();
@@ -600,7 +599,6 @@ void TelemetryPanel::setup()
}
else {
if (!firmware->getCapability(HasVarioSink)) {
ui->varioLimitMinOff_ChkB->hide();
ui->varioLimitMin_DSB->hide();
ui->varioLimitCenterMin_DSB->hide();
ui->VarioLabel_1->hide();
@@ -609,15 +607,7 @@ void TelemetryPanel::setup()
ui->varioLimitMin_DSB->setValue(model->frsky.varioMin-10);
ui->varioLimitMax_DSB->setValue(model->frsky.varioMax+10);
ui->varioLimitCenterMax_DSB->setValue((model->frsky.varioCenterMax/10.0)+0.5);
if (model->frsky.varioCenterMin==-16) {
ui->varioLimitMinOff_ChkB->setChecked(true);
ui->varioLimitCenterMin_DSB->setValue(-2.0);
ui->varioLimitCenterMin_DSB->setDisabled(true);
}
else {
ui->varioLimitMinOff_ChkB->setChecked(false);
ui->varioLimitCenterMin_DSB->setValue((model->frsky.varioCenterMin/10.0)-0.5);
}
ui->varioLimitCenterMin_DSB->setValue((model->frsky.varioCenterMin/10.0)-0.5);
}
ui->altimetryGB->setVisible(firmware->getCapability(HasAltitudeSel) || firmware->getCapability(HasVario)),
@@ -794,24 +784,6 @@ void TelemetryPanel::on_varioLimitCenterMin_DSB_editingFinished()
}
}
void TelemetryPanel::on_varioLimitMinOff_ChkB_toggled(bool checked)
{
if (!lock) {
model->frsky.varioCenterMin = -16;
if (!checked) {
lock=true;
ui->varioLimitCenterMin_DSB->setValue(-2.0);
ui->varioLimitCenterMin_DSB->setEnabled(true);
lock=false;
}
else {
ui->varioLimitCenterMin_DSB->setValue(-2.0);
ui->varioLimitCenterMin_DSB->setDisabled(true);
}
emit modified();
}
}
void TelemetryPanel::on_varioLimitCenterMax_DSB_editingFinished()
{
if (!lock) {
-1
View File
@@ -97,7 +97,6 @@ class TelemetryPanel : public ModelPanel
void on_varioLimitMin_DSB_editingFinished();
void on_varioLimitMax_DSB_editingFinished();
void on_varioLimitCenterMin_DSB_editingFinished();
void on_varioLimitMinOff_ChkB_toggled(bool checked);
void on_varioLimitCenterMax_DSB_editingFinished();
void on_fasOffset_DSB_editingFinished();
void on_mahCount_SB_editingFinished();
+2 -15
View File
@@ -281,10 +281,10 @@
<number>1</number>
</property>
<property name="minimum">
<double>-2.000000000000000</double>
<double>-2.100000000000000</double>
</property>
<property name="maximum">
<double>0.000000000000000</double>
<double>1.000000000000000</double>
</property>
<property name="singleStep">
<double>0.100000000000000</double>
@@ -363,19 +363,6 @@
</property>
</widget>
</item>
<item row="2" column="1">
<widget class="QCheckBox" name="varioLimitMinOff_ChkB">
<property name="sizePolicy">
<sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="text">
<string>Off</string>
</property>
</widget>
</item>
<item row="0" column="3">
<widget class="QLabel" name="VarioLabel_2">
<property name="sizePolicy">
+26 -4
View File
@@ -328,7 +328,7 @@ PACK(typedef struct {
uint8_t blades; // How many blades for RPMs, 0=2 blades, 1=3 blades
uint8_t currentSource;
uint8_t screensType;
FrSkyScreenData screens[MAX_TELEMETRY_SCREENS];
FrSkyScreenData screens[3];
uint8_t varioSource;
int8_t varioCenterMax;
int8_t varioCenterMin;
@@ -337,7 +337,27 @@ PACK(typedef struct {
FrSkyRSSIAlarm rssiAlarms[2];
}) FrSkyData_v215;
PACK(typedef struct t_ScriptData {
PACK(typedef struct {
FrSkyChannelData channels[4];
uint8_t usrProto; // Protocol in FrSky user data, 0=None, 1=FrSky hub, 2=WS HowHigh, 3=Halcyon
uint8_t voltsSource:7;
uint8_t altitudeDisplayed:1;
int8_t blades; // How many blades for RPMs, 0=2 blades
uint8_t currentSource;
uint8_t screensType; // 2bits per screen (None/Gauges/Numbers/Script)
FrSkyScreenData screens[3];
uint8_t varioSource;
int8_t varioCenterMax;
int8_t varioCenterMin;
int8_t varioMin;
int8_t varioMax;
FrSkyRSSIAlarm rssiAlarms[2];
uint16_t mAhPersistent:1;
uint16_t storedMah:15;
int8_t fasOffset;
}) FrSkyData_v216;
PACK(typedef struct {
char file[10];
char name[10];
int8_t inputs[10];
@@ -419,7 +439,7 @@ PACK(typedef struct {
global_gvar_t gvars[MAX_GVARS];
FrSkyData frsky;
FrSkyData_v216 frsky;
#if defined(PCBTARANIS)
uint8_t externalModule;
@@ -1214,7 +1234,9 @@ void ConvertModel_216_to_217(ModelData &model)
newModel.switchWarningStates = oldModel.switchWarningStates;
newModel.nSwToWarn = oldModel.nSwToWarn;
memcpy(newModel.gvars, oldModel.gvars, sizeof(newModel.gvars));
newModel.frsky = oldModel.frsky;
memcpy(&newModel.frsky, &oldModel.frsky, sizeof(newModel.frsky.channels)+5+sizeof(oldModel.frsky.screens));
memcpy(&newModel.frsky.varioSource, &oldModel.frsky.varioSource, 5+sizeof(newModel.frsky.rssiAlarms)+3);
newModel.externalModule = oldModel.externalModule;
memcpy(newModel.moduleData, oldModel.moduleData, sizeof(newModel.moduleData));
#if defined(PCBTARANIS)
+1 -1
View File
@@ -1403,7 +1403,7 @@ void menuGeneralHardware(uint8_t event)
}
case ITEM_SETUP_HW_UART3_MODE:
g_eeGeneral.uart3Mode = selectMenuItem(HW_SETTINGS_COLUMN, y, STR_UART3MODE, STR_UART3MODES, g_eeGeneral.uart3Mode, 0, UART_MODE_MAX, attr, event);
if (checkIncDec_Ret) {
if (attr && checkIncDec_Ret) {
uart3Init(g_eeGeneral.uart3Mode, MODEL_TELEMETRY_PROTOCOL());
}
break;
+2 -2
View File
@@ -994,7 +994,7 @@ void menuModelSetup(uint8_t event)
#if defined(PCBTARANIS)
#define IF_INTERNAL_MODULE_ON(x) (g_model.moduleData[INTERNAL_MODULE].rfProtocol == RF_PROTO_OFF ? HIDDEN_ROW : (uint8_t)(x))
#define IF_EXTERNAL_MODULE_ON(x) (g_model.externalModule == MODULE_TYPE_NONE ? HIDDEN_ROW : (uint8_t)(x))
#define IF_TRAINER_ON(x) (g_model.trainerMode ? (uint8_t)(x) : HIDDEN_ROW)
#define IF_TRAINER_ON(x) (g_model.trainerMode == TRAINER_MODE_SLAVE ? (uint8_t)(x) : HIDDEN_ROW)
#define IF_EXTERNAL_MODULE_XJT(x) (IS_MODULE_XJT(EXTERNAL_MODULE) ? (uint8_t)x : HIDDEN_ROW)
#define IS_D8_RX(x) (g_model.moduleData[x].rfProtocol == RF_PROTO_D8)
#define INTERNAL_MODULE_CHANNELS_ROWS() IF_INTERNAL_MODULE_ON(1)
@@ -1467,7 +1467,7 @@ void menuModelSetup(uint8_t event)
break;
case ITEM_MODEL_TRAINER_MODE:
g_model.trainerMode = selectMenuItem(MODEL_SETUP_2ND_COLUMN, y, STR_MODE, STR_VTRAINERMODES, g_model.trainerMode, 0, 1, attr, event);
g_model.trainerMode = selectMenuItem(MODEL_SETUP_2ND_COLUMN, y, STR_MODE, STR_VTRAINERMODES, g_model.trainerMode, 0, HAS_WIRELESS_TRAINER_HARDWARE() ? TRAINER_MODE_MASTER_BATTERY_COMPARTMENT : TRAINER_MODE_MASTER_CPPM_EXTERNAL_MODULE, attr, event);
break;
#endif
+1 -1
View File
@@ -136,11 +136,11 @@ void lcdPutPattern(coord_t x, coord_t y, const uint8_t * pattern, uint8_t width,
void lcd_putcAtt(coord_t x, coord_t y, const unsigned char c, LcdFlags flags)
{
const pm_uchar * q;
uint32_t fontsize = FONTSIZE(flags);
lcdNextPos = x-1;
#if !defined(BOOT)
uint32_t fontsize = FONTSIZE(flags);
unsigned char c_remapped = 0;
if (fontsize == DBLSIZE || (flags&BOLD)) {
+17 -1
View File
@@ -113,6 +113,20 @@ static int luaGetTime(lua_State *L)
return 1;
}
static int luaGetDateTime(lua_State *L)
{
struct gtm utm;
gettime(&utm);
lua_newtable(L);
lua_pushtableinteger(L, "year", utm.tm_year+1900);
lua_pushtableinteger(L, "mon", utm.tm_mon+1);
lua_pushtableinteger(L, "day", utm.tm_mday);
lua_pushtableinteger(L, "hour", utm.tm_hour);
lua_pushtableinteger(L, "min", utm.tm_min);
lua_pushtableinteger(L, "sec", utm.tm_sec);
return 1;
}
static void luaGetValueAndPush(int src)
{
if (src >= MIXSRC_FIRST_TELEM && src <= MIXSRC_LAST_TELEM) {
@@ -328,6 +342,7 @@ static int luaGetGeneralSettings(lua_State *L)
lua_newtable(L);
lua_pushtablenumber(L, "battMin", double(90+g_eeGeneral.vBatMin)/10);
lua_pushtablenumber(L, "battMax", double(120+g_eeGeneral.vBatMax)/10);
lua_pushtableinteger(L, "imperial", g_eeGeneral.imperial);
return 1;
}
@@ -1379,6 +1394,7 @@ int luaGetOutputs(ScriptInputsOutputs & sid)
const luaL_Reg opentxLib[] = {
{ "getTime", luaGetTime },
{ "getDateTime", luaGetDateTime },
{ "getVersion", luaGetVersion },
{ "getGeneralSettings", luaGetGeneralSettings },
{ "getValue", luaGetValue },
@@ -1910,8 +1926,8 @@ void luaDoOneRunPermanentScript(uint8_t evt, int i)
lua_rawgeti(L, LUA_REGISTRYINDEX, sid.run);
}
else {
TelemetryScriptData & script = g_model.frsky.screens[sid.reference-SCRIPT_TELEMETRY_FIRST].script;
#if defined(SIMU) || defined(DEBUG)
TelemetryScriptData & script = g_model.frsky.screens[sid.reference-SCRIPT_TELEMETRY_FIRST].script;
filename = script.file;
#endif
if (g_menuStack[0]==menuTelemetryFrsky && sid.reference==SCRIPT_TELEMETRY_FIRST+s_frsky_view) {
+13 -1
View File
@@ -645,10 +645,22 @@ void evalFlightModeMixes(uint8_t mode, uint8_t tick10ms)
bool mixCondition = (md->flightModes != 0 || md->swtch);
delayval_t mixEnabled = (!(md->flightModes & (1 << mixerCurrentFlightMode)) && getSwitch(md->swtch)) ? DELAY_POS_MARGIN+1 : 0;
#define MIXER_LINE_DISABLE() (mixCondition = true, mixEnabled = 0)
if (mixEnabled && md->srcRaw >= MIXSRC_FIRST_TRAINER && md->srcRaw <= MIXSRC_LAST_TRAINER && !ppmInValid) {
mixEnabled = 0;
MIXER_LINE_DISABLE();
}
#if defined(PCBTARANIS) && defined(LUA_MODEL_SCRIPTS)
// disable mixer if Lua script is used as source and script was killed
if (mixEnabled && md->srcRaw >= MIXSRC_FIRST_LUA && md->srcRaw <= MIXSRC_LAST_LUA) {
div_t qr = div(md->srcRaw-MIXSRC_FIRST_LUA, MAX_SCRIPT_OUTPUTS);
if (scriptInternalData[qr.quot].state != SCRIPT_OK) {
MIXER_LINE_DISABLE();
}
}
#endif
//========== VALUE ===============
getvalue_t v = 0;
if (mode > e_perout_mode_inactive_flight_mode) {
+12
View File
@@ -309,6 +309,7 @@ enum uartModes {
UART_MODE_TELEMETRY_MIRROR,
UART_MODE_TELEMETRY,
UART_MODE_SBUS_TRAINER,
// UART_MODE_CPPM_TRAINER,
#if defined(DEBUG)
UART_MODE_DEBUG,
#endif
@@ -316,6 +317,7 @@ enum uartModes {
UART_MODE_MAX = UART_MODE_COUNT-1
};
#define HAS_WIRELESS_TRAINER_HARDWARE() (g_eeGeneral.uart3Mode==UART_MODE_SBUS_TRAINER/* || g_eeGeneral.uart3Mode==UART_MODE_CPPM_TRAINER*/)
#define EXTRA_GENERAL_FIELDS \
EXTRA_GENERAL_FIELDS_ARM \
uint8_t uart3Mode; \
@@ -357,6 +359,14 @@ PACK(typedef struct {
EXTERNAL_MODULE,
TRAINER_MODULE
};
enum TrainerMode {
TRAINER_MODE_MASTER,
TRAINER_MODE_SLAVE,
TRAINER_MODE_MASTER_SBUS_EXTERNAL_MODULE,
TRAINER_MODE_MASTER_CPPM_EXTERNAL_MODULE,
TRAINER_MODE_MASTER_BATTERY_COMPARTMENT,
};
#define IS_TRAINER_EXTERNAL_MODULE() (g_model.trainerMode == TRAINER_MODE_MASTER_SBUS_EXTERNAL_MODULE || g_model.trainerMode == TRAINER_MODE_MASTER_CPPM_EXTERNAL_MODULE)
#define MODELDATA_BITMAP char bitmap[LEN_BITMAP_NAME];
#define MODELDATA_EXTRA uint8_t externalModule; uint8_t trainerMode; ModuleData moduleData[NUM_MODULES+1]; char curveNames[MAX_CURVES][6]; ScriptData scriptsData[MAX_SCRIPTS]; char inputNames[MAX_INPUTS][LEN_INPUT_NAME]; uint8_t nPotsToWarn; int8_t potPosition[NUM_POTS]; uint8_t spare[2];
#define swstate_t uint16_t
@@ -1759,6 +1769,8 @@ enum ModuleTypes {
MODULE_TYPE_COUNT
};
#define IS_PULSES_EXTERNAL_MODULE() (g_model.externalModule != MODULE_TYPE_NONE)
enum FailsafeModes {
FAILSAFE_HOLD,
FAILSAFE_CUSTOM,
+52 -15
View File
@@ -87,6 +87,56 @@ uint8_t g_tmr1Latency_min;
uint16_t lastMixerDuration;
#endif
#if defined(PCBTARANIS)
uint8_t currentTrainerMode = 0xff;
void checkTrainerSettings()
{
uint8_t requiredTrainerMode = g_model.trainerMode;
if (requiredTrainerMode != currentTrainerMode) {
switch (currentTrainerMode) {
case TRAINER_MODE_MASTER:
stop_trainer_capture();
break;
case TRAINER_MODE_SLAVE:
stop_trainer_ppm();
break;
case TRAINER_MODE_MASTER_CPPM_EXTERNAL_MODULE:
stop_cppm_on_heartbeat_capture() ;
break;
case TRAINER_MODE_MASTER_SBUS_EXTERNAL_MODULE:
stop_sbus_on_heartbeat_capture() ;
break;
case TRAINER_MODE_MASTER_BATTERY_COMPARTMENT:
uart3Stop();
}
currentTrainerMode = requiredTrainerMode;
switch (requiredTrainerMode) {
case TRAINER_MODE_SLAVE:
init_trainer_ppm();
break;
case TRAINER_MODE_MASTER_CPPM_EXTERNAL_MODULE:
init_cppm_on_heartbeat_capture() ;
break;
case TRAINER_MODE_MASTER_SBUS_EXTERNAL_MODULE:
init_sbus_on_heartbeat_capture() ;
break;
case TRAINER_MODE_MASTER_BATTERY_COMPARTMENT:
if (g_eeGeneral.uart3Mode == UART_MODE_SBUS_TRAINER) {
uart3SbusInit();
break;
}
// no break
default:
// master is default
init_trainer_capture();
break;
}
}
}
#endif
uint8_t unexpectedShutdown = 0;
/* AVR: mixer duration in 1/16ms */
@@ -2247,20 +2297,7 @@ void perMain()
#endif
#if defined(PCBTARANIS)
uint8_t requiredTrainerMode = g_model.trainerMode;
if (requiredTrainerMode != currentTrainerMode) {
currentTrainerMode = requiredTrainerMode;
if (requiredTrainerMode) {
// slave
stop_trainer_capture();
init_trainer_ppm();
}
else {
// master
stop_trainer_ppm();
init_trainer_capture();
}
}
checkTrainerSettings();
#endif
#if defined(PCBTARANIS) && !defined(SIMU)
@@ -2567,7 +2604,7 @@ ISR(TIMER3_CAPT_vect) // G: High frequency noise can cause stack overflo with IS
else {
if (ppmInState>0 && ppmInState<=8) {
if (val>800 && val<2200) { // if valid pulse-width range
ppmInValid = 100;
ppmInValid = PPM_IN_VALID_TIMEOUT;
g_ppmIns[ppmInState++ - 1] = (int16_t)(val - 1500) * (uint8_t)(g_eeGeneral.PPM_Multiplier+10)/10; //+-500 != 512, but close enough.
}
else {
+2 -1
View File
@@ -923,7 +923,7 @@ extern uint16_t maxLuaDuration;
#endif
#if defined(PCBTARANIS)
static inline uint16_t getTmr2MHz() { return TIM3->CNT; }
static inline uint16_t getTmr2MHz() { return TIM7->CNT; }
#elif defined(PCBSKY9X)
static inline uint16_t getTmr2MHz() { return TC1->TC_CHANNEL[0].TC_CV; }
#else
@@ -1123,6 +1123,7 @@ extern uint8_t g_beepVal[5];
extern uint8_t ppmInState; //0=unsync 1..8= wait for value i-1
extern uint8_t ppmInValid;
#define PPM_IN_VALID_TIMEOUT 100
extern int16_t g_ppmIns[NUM_TRAINER];
extern int32_t chans[NUM_CHNOUT];
extern int16_t ex_chans[NUM_CHNOUT]; // Outputs (before LIMITS) of the last perMain
+3 -1
View File
@@ -36,7 +36,7 @@
#include "opentx.h"
Fifo<28> sbusFifo;
Fifo<32> sbusFifo;
uint8_t SbusFrame[28] ;
uint16_t SbusTimer ;
uint8_t SbusIndex = 0 ;
@@ -59,6 +59,8 @@ void processSbusFrame(uint8_t *sbus, int16_t *pulses)
inputbitsavailable -= 11;
inputbits >>= 11;
}
ppmInValid = PPM_IN_VALID_TIMEOUT;
}
#define SBUS_DELAY 1000 // 500uS
+7
View File
@@ -36,8 +36,14 @@
#include "opentx.h"
#if !defined(BOOT)
const pm_char s_charTab[] PROGMEM = "_-.,";
char hex2zchar(uint8_t hex)
{
return (hex >= 10 ? hex-9 : 27+hex);
}
char idx2char(int8_t idx)
{
if (idx == 0) return ' ';
@@ -142,6 +148,7 @@ char * strcat_zchar(char * dest, char * name, uint8_t size, const char *defaultN
return &dest[len];
}
#endif
#endif
#if defined(CPUARM) || defined(SDCARD)
char * strAppend(char * dest, const char * source)
+67 -98
View File
@@ -37,33 +37,26 @@
#include "../../opentx.h"
#ifndef SIMU
inline void boardInit() // Done 2013.10.09 : trims, keyboard, LCD, ID1+2 SW warning PORTF-3 (1.2V ADC_ref)
inline void boardInit()
{
// Set up I/O port data directions and initial states
// Set up I/O port data directions and initial states (unused pin setting : input, pull-up on)
DDRA = 0b11111111; PORTA = 0b00000000; // LCD data
DDRB = 0b11000111; PORTB = 0b00111111; // 7:SPKR, 6:PPM_OUT, 5:TrainSW, 4:xxxxx, SDCARD[3:MISO 2:MOSI 1:SCK 0:CS]
DDRC = 0b11111100; PORTC = 0b00000011; // LCD[7,6,5,4,3], 2:BackLight, 1:ID2_Sw, 0:ID1_Sw
DDRD = 0b11000000; PORTD = 0b11111100; // 7:VIB, 6:LED BL, 5:RENC2_PUSH, 4:RENC1_PUSH, 3:RENC2_B, 2:RENC2_A, 1:I2C_SDA, 0:I2C_SCL
DDRE = 0b00001010; PORTE = 0b11110100; // 7:PPM_IN, 6: RENC1_B, 5:RENC1_A, 4:USB_DNEG, 3:BUZZER, 2:USB_DPOS, 1:TELEM_TX, 0:TELEM_RX(pull-up off)
//DDRF = 0b00000000; PORTF = 0b00000000; // 7-4:JTAG, 3:ADC_REF_1.2V input, 2-0:ADC_SPARE_2-0
DDRB = 0b01000111; PORTB = 0b00101111; // 7:PPM_IN 6:PPM_OUT, 5:SimCTRL, 4:Buzzer, SDCARD[3:MISO 2:MOSI 1:SCK 0:CS]
DDRC = 0b11111100; PORTC = 0b00000011; // 7-3:LCD, 2:BackLight, 1:ID2_SW, 0:ID1_SW
DDRD = 0b00000000; PORTD = 0b11110000; // 7:AilDR_SW, 6:N/A, 5:N/A, 4:N/A, 3:RENC2_B, 2:RENC2_A, 1:N/A, 0:N/A
DDRE = 0b00001010; PORTE = 0b11110100; // 7:N/A, 6:N/A, 5:RENC1_B, 4:RENC1_A, 3:Buzzer(old), 2:N/A, 1:TELEM_TX, 0:TELEM_RX(pull-up off)
DDRF = 0b00000000; PORTF = 0b11111111; // 7-0:Trim switch inputs
DDRG = 0b00010000; PORTG = 0b00111111; // 7-6:N/A, 5:GearSW, 4: Sim_Ctrl[out], 3:xxxxx, 2:TCut_Sw, 1:RF_Power[in], 0: RudDr_Sw
DDRH = 0b10111000; PORTH = 0b11010111; // [7:0 DSM/PPM TX-caddy control. 1=PPM, 0=DSM ]
// [6:SOMO14D-BUSY 5:SOMO14D-DATA 4:SOMO14D-CLK 3:SOMO14D-RESET]
// [2:VIB_OPTION -- setting to input for now]
// [1:TxD 0:RxD Spare serial port]
//DDRJ = 0b00000000; PORTJ = 0b11111111; // 7-0:Trim switch inputs
DDRG = 0b00000000; PORTG = 0b11111111; // 7:N/A, 6:N/A, 5:N/A, 4:N/A, 3:N/A, 2:TCut_SW, 1:Gear_SW, 0: RudDr_SW
DDRH = 0b00011000; PORTH = 0b11010111; // 7:N/A, 6:RFPw, 5:JackPres, 4:HoldPw, 3:Speaker, 2:N/A, 1:N/A, 0:N/A
DDRJ = 0b00000000; PORTJ = 0b11111111; // 7:N/A, 6:N/A, 5:N/A, 4:N/A, 3:N/A, 2:N/A, 1:RENC2_push, 0:RENC1_push
DDRK = 0b00000000; PORTK = 0b00000000; // Analogic input (no pull-ups)
DDRL = 0b10000000; PORTL = 0b11111111; // 7: Hold_PWR_On (1=On, default Off), 6:Jack_Presence_TTL, 5-0: Keyboard inputs
ADMUX=ADC_VREF_TYPE;
DDRL = 0b00000000; PORTL = 0b11111111; // 7:TRN_SW 6:EleDR_SW, 5:ESC, 4:MENU 3:Keyb_Left, 2:Keyb_Right, 1:Keyb_Up, 0:Keyb_Down
ADMUX=ADC_VREF_TYPE; // need to be set to internal reference
ADCSRA=0x85; // ADC enabled, pre-scaler division=32 (no interrupt, no auto-triggering)
ADCSRB=(1<<MUX5);
/**** Set up timer/counter 0 ****/
/** Move old 64A Timer0 functions to Timer2 and use WGM on OC0(A) (PB7) for spkear tone output **/
// TCNT0 10ms = 16MHz/1024/156(.25) periodic timer (100ms interval)
// cycles at 9.984ms but includes 1:4 duty cycle correction to /157 to average at 10.0ms
TCCR2B = (0b111 << CS20); // Norm mode, clk/1024 (differs from ATmega64 chip)
@@ -71,40 +64,28 @@ inline void boardInit() // Done 2013.10.09 : trims, keyboard, LCD, ID
TIMSK2 |= (1<<OCIE2A) | (1<<TOIE2); // Enable Output-Compare and Overflow interrrupts
// Set up Phase correct Waveform Gen. mode, at clk/64 = 250,000 counts/second
// (Higher speed allows for finer control of frquencies in the audio range.)
// (Higher speed allows for finer control of frequencies in the audio range.)
// Used for audio tone generation
TCCR0B = (1<<WGM02) | (0b011 << CS00);
TCCR0A = (0b01<<WGM00);
/***************************************************/
/* Rotary encoder interrupt set-up */
EIMSK = 0; // disable ALL external interrupts.
// encoder 1
EICRB = (1<<ISC60) | (1<<ISC50); // 01 = interrupt on any edge
EIFR = (3<<INTF5); // clear the int. flag in case it got set when changing modes
EICRB = (1<<ISC50) | (1<<ISC40); // 01 = interrupt on any edge
EIFR = (3<<INTF4); // clear the int. flag in case it got set when changing modes
// encoder 2
EICRA = (1<<ISC30) | (1<<ISC20); // do the same for encoder 1
EICRA = (1<<ISC30) | (1<<ISC20);
EIFR = (3<<INTF2);
EIMSK = (3<<INT5) | (3<<INT2); // enable the two rot. enc. ext. int. pairs.
/***************************************************/
#if defined (VOICE)
/*
* SOMO set-up (V4 board only)
*/
OCR4A = 0x1F4; //2ms
TCCR4B = (1 << WGM42) | (0b011 << CS40); // CTC OCR1A, 16MHz / 64 (4us ticks)
TIMSK4 |= (1<<OCIE4A); // Start the interrupt so the unit reset can occur
#endif
}
EIMSK = (3<<INT4) | (3<<INT2); // enable the two rot. enc. ext. int. pairs.
}
#endif // !SIMU
uint8_t pwrCheck()
{
#if !defined(SIMU) && !defined(REV0)
if ((PING & 0b00000010) && (~PINL & 0b01000000))
return e_power_off;
#if !defined(SIMU) //&& !defined(REV0)
//if ((PING & 0b00000010) && (~PINL & 0b01000000)) //temporary disabled
//return e_power_off;
#endif
return e_power_on;
}
@@ -112,7 +93,7 @@ uint8_t pwrCheck()
void pwrOff()
{
#ifndef REV0
PORTL = 0x7f;
PORTL = 0b11111111; //to check !
#endif
}
@@ -129,22 +110,22 @@ bool switchState(EnumKeys enuk)
return keys[enuk].state() ? 1 : 0;
switch(enuk){
//case SW_ELE:
// result = PINC & (1<<INP_C_ElevDR);
// break;
case SW_ELE:
result = PINL & (1<<INP_L_ElevDR);
break;
//case SW_AIL:
// result = PINC & (1<<INP_C_AileDR);
// break;
case SW_AIL:
result = PIND & (1<<INP_D_AileDR);
break;
case SW_RUD:
result = PING & (1<<INP_G_RuddDR);
break;
// INP_G_ID1 INP_B_ID2
// id0 0 1
// id1 1 1
// id2 1 0
// INP_C_ID1 INP_C_ID2
// ID0 0 1
// ID1 1 1
// ID2 1 0
case SW_ID0:
result = !(PINC & (1<<INP_C_ID1));
break;
@@ -180,7 +161,7 @@ bool switchState(EnumKeys enuk)
break;
case SW_TRN:
result = PINB & (1<<INP_B_Trainer);
result = PINL & (1<<INP_L_Trainer);
break;
default:
@@ -190,42 +171,31 @@ bool switchState(EnumKeys enuk)
return result;
}
// Trim switches ...
// Trim switches
static const pm_uchar crossTrim[] PROGMEM ={
1<<INP_F_TRM_LH_DWN,
1<<INP_F_TRM_LH_UP,
1<<INP_F_TRM_LV_DWN,
1<<INP_F_TRM_LV_UP,
1<<INP_F_TRM_RV_DWN,
1<<INP_F_TRM_RV_UP,
1<<INP_F_TRM_RH_DWN,
1<<INP_F_TRM_RH_UP
1<<INP_F_TRM_LH_DWN,
1<<INP_F_TRM_LH_UP,
1<<INP_F_TRM_LV_DWN,
1<<INP_F_TRM_LV_UP,
1<<INP_F_TRM_RV_DWN,
1<<INP_F_TRM_RV_UP,
1<<INP_F_TRM_RH_DWN,
1<<INP_F_TRM_RH_UP
};
uint8_t trimDown(uint8_t idx)
{
uint8_t in = ~PIND;
uint8_t in = ~PINF; //was PIND
return (in & pgm_read_byte(crossTrim+idx));
}
FORCEINLINE void readKeysAndTrims()
{
/* Original keys were connected to PORTB as follows:
Bit Key
7 other use
6 LEFT
5 RIGHT
4 UP
3 DOWN
2 EXIT
1 MENU
0 other use
*/
uint8_t enuk = KEY_MENU;
// User buttons ...
keys[BTN_REa].input(~PINJ & 0b00000001, BTN_REa);
keys[BTN_REb].input(~PINJ & 0b00000010, BTN_REb);
uint8_t tin = ~PINL;
uint8_t in;
in = (tin & 0x0f) << 3;
@@ -237,38 +207,37 @@ FORCEINLINE void readKeysAndTrims()
++enuk;
}
// Trims ...
// Trims
in = ~PINF;
for (int i=0; i<8; i++) {
// INP_D_TRM_RH_UP 0 .. INP_D_TRM_LH_UP 7
keys[enuk].input(in & pgm_read_byte(crossTrim+i),(EnumKeys)enuk);
++enuk;
}
keys[BTN_REa].input(REA_DOWN(), BTN_REa);
keys[BTN_REb].input(REB_DOWN(), BTN_REb);
}
ISR(INT2_vect)
// Rotary encoders increment/decrement (0 = rotary 1, 1 = rotary 2)
ISR(INT4_vect) // Arduino2560 IO02 (portE pin4)
{
uint8_t input = (PINE & 0x30);
if (input == 0 || input == 0x30) incRotaryEncoder(0, -1);
}
ISR(INT5_vect) // Arduino2560 IO03 (portE pin5)
{
uint8_t input = (PINE & 0x30);
if (input == 0 || input == 0x30) incRotaryEncoder(0, +1);
}
ISR(INT2_vect) // Arduino2560 IO19 (portD pin2)
{
uint8_t input = (PIND & 0x0C);
if (input == 0 || input == 0x0C) incRotaryEncoder(0, -1);
if (input == 0 || input == 0x0C) incRotaryEncoder(1, -1);
}
ISR(INT3_vect)
ISR(INT3_vect) // Arduino2560 IO18 (portD pin3)
{
uint8_t input = (PIND & 0x0C);
if (input == 0 || input == 0x0C) incRotaryEncoder(0, +1);
}
ISR(INT5_vect)
{
uint8_t input = (PINE & 0x60);
if (input == 0 || input == 0x60) incRotaryEncoder(1, +1);
}
ISR(INT6_vect)
{
uint8_t input = (PINE & 0x60);
if (input == 0 || input == 0x60) incRotaryEncoder(1, -1);
}
if (input == 0 || input == 0x0C) incRotaryEncoder(1, +1);
}
+119 -125
View File
@@ -39,35 +39,35 @@
#include "../common_avr/board_avr.h"
#define GPIO_BUTTON_MENU pinl
#define GPIO_BUTTON_EXIT pinl
#define GPIO_BUTTON_RIGHT pinl
#define GPIO_BUTTON_LEFT pinl
#define GPIO_BUTTON_UP pinl
#define GPIO_BUTTON_DOWN pinl
#define PIN_BUTTON_MENU (1<<INP_L_KEY_MEN)
#define PIN_BUTTON_EXIT (1<<INP_L_KEY_EXT)
#define PIN_BUTTON_UP (1<<INP_L_KEY_UP)
#define PIN_BUTTON_DOWN (1<<INP_L_KEY_DWN)
#define PIN_BUTTON_RIGHT (1<<INP_L_KEY_RGT)
#define PIN_BUTTON_LEFT (1<<INP_L_KEY_LFT)
#define GPIO_BUTTON_MENU pinl //ok
#define GPIO_BUTTON_EXIT pinl //ok
#define GPIO_BUTTON_RIGHT pinl //ok
#define GPIO_BUTTON_LEFT pinl //ok
#define GPIO_BUTTON_UP pinl //ok
#define GPIO_BUTTON_DOWN pinl //ok
#define PIN_BUTTON_MENU (1<<INP_L_KEY_MEN) //ok
#define PIN_BUTTON_EXIT (1<<INP_L_KEY_EXT) //ok
#define PIN_BUTTON_UP (1<<INP_L_KEY_UP) //ok
#define PIN_BUTTON_DOWN (1<<INP_L_KEY_DWN) //ok
#define PIN_BUTTON_RIGHT (1<<INP_L_KEY_RGT) //ok
#define PIN_BUTTON_LEFT (1<<INP_L_KEY_LFT) //ok
#define GPIO_TRIM_LH_L pinf
#define GPIO_TRIM_LV_DN pinf
#define GPIO_TRIM_RV_UP pinf
#define GPIO_TRIM_RH_L pinf
#define GPIO_TRIM_LH_R pinf
#define GPIO_TRIM_LV_UP pinf
#define GPIO_TRIM_RV_DN pinf
#define GPIO_TRIM_RH_R pinf
#define PIN_TRIM_LH_L (1<<INP_F_TRM_LH_DWN)
#define PIN_TRIM_LV_DN (1<<INP_F_TRM_LV_DWN)
#define PIN_TRIM_RV_UP (1<<INP_F_TRM_RV_UP)
#define PIN_TRIM_RH_L (1<<INP_F_TRM_RH_DWN)
#define PIN_TRIM_LH_R (1<<INP_F_TRM_LH_UP)
#define PIN_TRIM_LV_UP (1<<INP_F_TRM_LV_UP)
#define PIN_TRIM_RV_DN (1<<INP_F_TRM_RV_DWN)
#define PIN_TRIM_RH_R (1<<INP_F_TRM_RH_UP)
#define GPIO_TRIM_LH_L pinf //ok
#define GPIO_TRIM_LV_DN pinf //ok
#define GPIO_TRIM_RV_UP pinf //ok
#define GPIO_TRIM_RH_L pinf //ok
#define GPIO_TRIM_LH_R pinf //ok
#define GPIO_TRIM_LV_UP pinf //ok
#define GPIO_TRIM_RV_DN pinf //ok
#define GPIO_TRIM_RH_R pinf //ok
#define PIN_TRIM_LH_L (1<<INP_F_TRM_LH_DWN) //ok
#define PIN_TRIM_LV_DN (1<<INP_F_TRM_LV_DWN) //ok
#define PIN_TRIM_RV_UP (1<<INP_F_TRM_RV_UP) //ok
#define PIN_TRIM_RH_L (1<<INP_F_TRM_RH_DWN) //ok
#define PIN_TRIM_LH_R (1<<INP_F_TRM_LH_UP) //ok
#define PIN_TRIM_LV_UP (1<<INP_F_TRM_LV_UP) //ok
#define PIN_TRIM_RV_DN (1<<INP_F_TRM_RV_DWN) //ok
#define PIN_TRIM_RH_R (1<<INP_F_TRM_RH_UP) //ok
#define TIMER_16KHZ_VECT TIMER2_OVF_vect
#define COUNTER_16KHZ TCNT2
@@ -78,107 +78,108 @@
#define PAUSE_PPMIN_INTERRUPT() TIMSK3 &= ~(1<<ICIE3)
#define RESUME_PPMIN_INTERRUPT() TIMSK3 |= (1<<ICIE3)
#define SLAVE_MODE() (PING & (1<<INP_G_RF_POW))
#define JACK_PPM_OUT() PORTG |= (1<<OUT_G_SIM_CTL)
#define JACK_PPM_IN() PORTG &= ~(1<<OUT_G_SIM_CTL)
// SD driver
#define sdDone()
#if !defined(SIMU)
bool sdMounted();
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 SLAVE_MODE() (PINH & (1<<INP_H_RF_POW))
#define JACK_PPM_OUT() PORTB |= (1<<OUT_B_SIM_CTL)
#define JACK_PPM_IN() PORTB &= ~(1<<OUT_B_SIM_CTL)
#define SPEAKER_ON TCCR0A |= (1 << COM0A0)
#define SPEAKER_OFF TCCR0A &= ~(1 << COM0A0)
#define __BACKLIGHT_ON PORTC |= (1 << OUT_C_LIGHT)
#define __BACKLIGHT_OFF PORTC &= ~(1 << OUT_C_LIGHT)
#define IS_BACKLIGHT_ON() (PORTC & (1<<OUT_C_LIGHT))
#define __BACKLIGHT_ON PORTC |= (1 << OUT_C_LIGHT) //ok
#define __BACKLIGHT_OFF PORTC &= ~(1 << OUT_C_LIGHT) //ok
#define IS_BACKLIGHT_ON() (PORTC & (1<<OUT_C_LIGHT)) //ok
# define INP_L_SPARE6 7
# define INP_L_SPARE5 6
# define INP_L_KEY_EXT 5
# define INP_L_KEY_MEN 4
# define INP_L_KEY_LFT 3
# define INP_L_KEY_RGT 2
# define INP_L_KEY_UP 1
# define INP_L_KEY_DWN 0
# define INP_F_TRM_RH_UP 7
# define INP_F_TRM_RH_DWN 6
# define INP_F_TRM_RV_UP 5
# define INP_F_TRM_RV_DWN 4
# define INP_F_TRM_LV_UP 3
# define INP_F_TRM_LV_DWN 2
# define INP_F_TRM_LH_UP 1
# define INP_F_TRM_LH_DWN 0
# define INP_E_PPM_IN 7
# define INP_E_ROT_ENC_1_B 6
# define INP_E_ROT_ENC_1_A 5
# define INP_E_USB_D_PLS 4
# define OUT_E_BUZZER 3
# define INP_E_USB_D_NEG 2
# define INP_E_TELEM_RX 1
# define OUT_E_TELEM_TX 0
# define OUT_D_HAPTIC 7
# define INP_D_SPARE4 6
# define INP_D_ROT_ENC_2_PUSH 5
# define INP_D_ROT_ENC_1_PUSH 4
# define OUT_D_ROT_ENC_2_B 3
# define INP_D_ROT_ENC_2_A 2
# define INP_D_I2C_SCL 1
# define INP_D_I2C_SDA 0
# define INP_G_Gear 5
# define INP_G_ThrCt 2
# define OUT_G_SIM_CTL 4 //1 : phone-jack=ppm_in
# define INP_C_ID1 0
# define INP_C_ID2 1
# define INP_G_RF_POW 1
# define INP_G_RuddDR 0
# define INP_C_AileDR 7
# define INP_C_ElevDR 6
# define OUT_C_LIGHT 2
# define OUT_B_Speaker 7
# define OUT_B_PPM 6
# define INP_B_Trainer 5
#if defined(VOICE)
# define OUT_H_14DRESET 3
# define OUT_H_14DCLK 4
# define OUT_H_14DDATA 5
# define INP_H_14DBUSY 6
// SD driver //to verify
#define sdDone()
#if !defined(SIMU)
bool sdMounted();
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
// Keys driver
#define TRIMS_PRESSED() (~PINJ)
#define KEYS_PRESSED() (~PINL) // used only for DBLKEYS code.
// Keyboard driver
# define INP_L_KEY_EXT 5 //ok
# define INP_L_KEY_MEN 4 //ok
# define INP_L_KEY_LFT 3 //ok
# define INP_L_KEY_RGT 2 //ok
# define INP_L_KEY_UP 1 //ok
# define INP_L_KEY_DWN 0 //ok
// Trims driver
# define INP_F_TRM_RH_UP 7 //ok
# define INP_F_TRM_RH_DWN 6 //ok
# define INP_F_TRM_RV_UP 5 //ok
# define INP_F_TRM_RV_DWN 4 //ok
# define INP_F_TRM_LV_UP 3 //ok
# define INP_F_TRM_LV_DWN 2 //ok
# define INP_F_TRM_LH_UP 1 //ok
# define INP_F_TRM_LH_DWN 0 //ok
// Switchs driver
# define INP_C_ID2 1 //ok
# define INP_C_ID1 0 //ok
# define INP_D_AileDR 7 //ok
# define INP_G_ThrCt 2 //ok
# define INP_G_Gear 1 //ok
# define INP_G_RuddDR 0 //ok
# define INP_L_ElevDR 6 //ok
# define INP_L_Trainer 7 //ok
// Servitudes driver
# define INP_B_PPM_IN 7 //to verify
# define OUT_B_PPM 6 //to verify
# define OUT_B_SIM_CTL 5 //to verify
# define OUT_B_BUZZER 4 //to verify
# define INP_H_RF_POW 6 //to verify
# define INP_H_SPARE5 5 //hold power OUT_H_xx 4 ?????
# define INP_H_SPARE6 4 //jack presence INP_H_xx 5 ?????
# define OUT_H_Speaker 3 //to verify
# define INP_E_TELEM_RX 1 //same as Gruvin9x
# define OUT_E_TELEM_TX 0 //same as Gruvin9x
// Rotary encoders driver
# define INP_E_ROT_ENC_1_A 4 //ok
# define INP_E_ROT_ENC_1_B 5 //ok
# define INP_D_ROT_ENC_2_A 2 //ok
# define INP_D_ROT_ENC_2_B 3 //ok
# define INP_J_ROT_ENC_1_PUSH 0 //ok
# define INP_J_ROT_ENC_2_PUSH 1 //ok
# define REA_DOWN() (~PINJ & (1<<INP_J_ROT_ENC_1_PUSH))
# define REB_DOWN() (~PINJ & (1<<INP_J_ROT_ENC_2_PUSH))
# define ROTENC_DOWN() (REA_DOWN() || REB_DOWN())
// Old #define from Gruvin9x
# define OUT_E_BUZZER 3 //PB : temporary used, crash otherwise at compilation!!!!!!
/*
# define INP_E_USB_D_PLS 4 //to erase
# define INP_E_USB_D_NEG 2 //to erase
# define OUT_D_HAPTIC 7 //to erase
# define INP_D_SPARE4 6 //to erase
# define INP_D_I2C_SCL 1 //to erase
# define INP_D_I2C_SDA 0 //to erase
*/
// LCD driver
#define PORTA_LCD_DAT PORTA //ok
#define PORTC_LCD_CTRL PORTC //ok
#define OUT_C_LCD_E 7 //ok
#define OUT_C_LCD_RnW 6 //ok
#define OUT_C_LCD_A0 5 //ok
#define OUT_C_LCD_RES 4 //ok
#define OUT_C_LCD_CS1 3 //ok
#define OUT_C_LIGHT 2 //ok
// DBLKeys driver //ok
#define KEYS_PRESSED() (~PINL)
#define DBLKEYS_PRESSED_RGT_LFT(i) ((in & ((1<<INP_L_KEY_RGT) + (1<<INP_L_KEY_LFT))) == ((1<<INP_L_KEY_RGT) + (1<<INP_L_KEY_LFT)))
#define DBLKEYS_PRESSED_UP_DWN(i) ((in & ((1<<INP_L_KEY_UP) + (1<<INP_L_KEY_DWN))) == ((1<<INP_L_KEY_UP) + (1<<INP_L_KEY_DWN)))
#define DBLKEYS_PRESSED_RGT_UP(i) ((in & ((1<<INP_L_KEY_RGT) + (1<<INP_L_KEY_UP))) == ((1<<INP_L_KEY_RGT) + (1<<INP_L_KEY_UP)))
#define DBLKEYS_PRESSED_LFT_DWN(i) ((in & ((1<<INP_L_KEY_LFT) + (1<<INP_L_KEY_DWN))) == ((1<<INP_L_KEY_LFT) + (1<<INP_L_KEY_DWN)))
// LCD driver
#define PORTA_LCD_DAT PORTA
#define PORTC_LCD_CTRL PORTC
#define OUT_C_LCD_E 7
#define OUT_C_LCD_RnW 6
#define OUT_C_LCD_A0 5
#define OUT_C_LCD_RES 4
#define OUT_C_LCD_CS1 3
// Power driver
uint8_t pwrCheck();
void pwrOff();
@@ -189,12 +190,5 @@ void pwrOff();
// Haptic driver
#define hapticOff() // TODO hapticOn() cleaner ...
#define HAPTIC_ON() PORTD &= ~(1 << OUT_D_HAPTIC)
#define HAPTIC_OFF() PORTD |= (1 << OUT_D_HAPTIC)
// Rotary encoder driver
#define REA_DOWN() (~PIND & 0x20)
#define REB_DOWN() (~PIND & 0x10)
#define ROTENC_DOWN() (REA_DOWN() || REB_DOWN())
#endif
+7 -16
View File
@@ -54,22 +54,13 @@ const char *eepromFile = NULL;
FILE *fp = NULL;
#if defined(PCBTARANIS)
uint32_t Peri1_frequency ;
uint32_t Peri2_frequency ;
GPIO_TypeDef gpioa;
GPIO_TypeDef gpiob;
GPIO_TypeDef gpioc;
GPIO_TypeDef gpiod;
GPIO_TypeDef gpioe;
TIM_TypeDef tim1;
TIM_TypeDef tim3;
TIM_TypeDef tim4;
TIM_TypeDef tim8;
TIM_TypeDef tim10;
uint32_t Peri1_frequency, Peri2_frequency;
GPIO_TypeDef gpioa, gpiob, gpioc, gpiod, gpioe;
TIM_TypeDef tim1, tim2, tim3, tim4, tim8, tim10;
RCC_TypeDef rcc;
DMA_Stream_TypeDef dma2_stream2;
DMA_Stream_TypeDef dma2_stream6;
DMA_Stream_TypeDef dma2_stream2, dma2_stream6;
DMA_TypeDef dma2;
USART_TypeDef Usart0, Usart1, Usart2, Usart3, Usart4;
#elif defined(PCBSKY9X)
Pio Pioa, Piob, Pioc;
Pwm pwm;
@@ -215,11 +206,11 @@ void simuSetSwitch(uint8_t swtch, int8_t state)
#elif defined(PCBMEGA2560)
SWITCH_CASE(0, ping, 1<<INP_G_ThrCt)
SWITCH_CASE(1, ping, 1<<INP_G_RuddDR)
SWITCH_CASE(2, pinc, 1<<INP_C_ElevDR)
SWITCH_CASE(2, pinc, 1<<INP_L_ElevDR)
SWITCH_3_CASE(3, pinc, pinc, (1<<INP_C_ID1), (1<<INP_C_ID2))
SWITCH_CASE(4, pinc, 1<<INP_C_AileDR)
SWITCH_CASE(5, ping, 1<<INP_G_Gear)
SWITCH_CASE(6, pinb, 1<<INP_B_Trainer)
SWITCH_CASE(6, pinb, 1<<INP_L_Trainer)
#else // PCB9X
#if defined(JETI) || defined(FRSKY) || defined(NMEA) || defined(ARDUPILOT)
SWITCH_CASE(0, pinc, 1<<INP_C_ThrCt)
+25 -18
View File
@@ -99,26 +99,22 @@ typedef const int16_t pm_int16_t;
typedef const int8_t pm_int8_t;
#if defined(PCBTARANIS)
extern GPIO_TypeDef gpioa;
extern GPIO_TypeDef gpioa, gpiob, gpioc, gpiod, gpioe;
extern TIM_TypeDef tim1, tim3, tim4, tim8, tim10;
extern USART_TypeDef Usart0, Usart1, Usart2, Usart3, Usart4;
extern RCC_TypeDef rcc;
extern DMA_Stream_TypeDef dma2_stream2, dma2_stream6;
extern DMA_TypeDef dma2;
#undef GPIOA
#define GPIOA (&gpioa)
extern GPIO_TypeDef gpiob;
#undef GPIOB
#define GPIOB (&gpiob)
extern GPIO_TypeDef gpioc;
#undef GPIOC
#define GPIOC (&gpioc)
extern GPIO_TypeDef gpiod;
#undef GPIOD
#define GPIOD (&gpiod)
extern GPIO_TypeDef gpioe;
#undef GPIOE
#define GPIOA (&gpioa)
#define GPIOB (&gpiob)
#define GPIOC (&gpioc)
#define GPIOD (&gpiod)
#define GPIOE (&gpioe)
extern TIM_TypeDef tim1;
extern TIM_TypeDef tim3;
extern TIM_TypeDef tim4;
extern TIM_TypeDef tim8;
extern TIM_TypeDef tim10;
#undef TIM1
#undef TIM3
#undef TIM4
@@ -129,18 +125,22 @@ extern TIM_TypeDef tim10;
#define TIM4 (&tim4)
#define TIM8 (&tim8)
#define TIM10 (&tim10)
extern RCC_TypeDef rcc;
#undef USART0
#undef USART1
#undef USART2
#undef USART3
#define USART0 (&Usart0)
#define USART1 (&Usart1)
#define USART2 (&Usart2)
#define USART3 (&Usart3)
#undef RCC
#define RCC (&rcc)
#undef DMA2_Stream2
#undef DMA2_Stream6
#define DMA2_Stream2 (&dma2_stream2)
#define DMA2_Stream6 (&dma2_stream6)
extern DMA_Stream_TypeDef dma2_stream2;
extern DMA_Stream_TypeDef dma2_stream6;
#undef DMA2
#define DMA2 (&dma2)
extern DMA_TypeDef dma2;
#elif defined(PCBSKY9X)
extern Pio Pioa, Piob, Pioc;
extern Twi Twio;
@@ -151,6 +151,12 @@ extern Adc Adc0;
#define ADC (&Adc0)
#undef USART0
#define USART0 (&Usart0)
#undef USART1
#define USART1 (&Usart0)
#undef USART2
#define USART2 (&Usart0)
#undef USART3
#define USART3 (&Usart0)
#undef PIOA
#define PIOA (&Pioa)
#undef PIOB
@@ -400,6 +406,7 @@ inline void GPIO_Init(GPIO_TypeDef* GPIOx, GPIO_InitTypeDef* GPIO_InitStruct) {
#define GPIO_ResetBits(GPIOx, pin) GPIOx->BSRRL &= ~pin
#define GPIO_ReadInputDataBit(GPIOx, pin) (GPIOx->BSRRL & pin)
#define RCC_AHB1PeriphClockCmd(...)
#define RCC_APB2PeriphClockCmd(...)
#endif
#define configure_pins(...)
+1 -1
View File
@@ -257,7 +257,7 @@ extern "C" void TC3_IRQHandler() //capture ppm in at 2MHz
else {
if (ppmInState>0 && ppmInState<=16) {
if (val>800 && val<2200) { // if valid pulse-width range
ppmInValid = 100;
ppmInValid = PPM_IN_VALID_TIMEOUT;
g_ppmIns[ppmInState++ - 1] = (int16_t)(val - 1500)*(g_eeGeneral.PPM_Multiplier+10)/10; //+-500 != 512, but close enough.
}
else {
@@ -99,7 +99,9 @@ LoopFillZerobss:
cmp r2, r3
bcc FillZerobss
/* Call the clock system intitialization function.*/
bl SystemInit
bl SystemInit
/* Call C++ constructors for static objects */
bl __libc_init_array
/* Call the application's entry point.*/
bl main
bx lr
@@ -54,6 +54,19 @@ void watchdogInit(unsigned int duration)
IWDG->KR = 0xCCCC ; // start
}
// Start TIMER7 at 2000000Hz
void init2MhzTimer()
{
// Now for timer 7
RCC->APB1ENR |= RCC_APB1ENR_TIM7EN ; // Enable clock
TIM7->PSC = 0 ; // Max speed
TIM7->ARR = (PERI1_FREQUENCY * TIMER_MULT_APB1) / 2000000 - 1 ; // 0.5 uS, 2 MHz
TIM7->CR2 = 0 ;
TIM7->CR2 = 0x20 ;
TIM7->CR1 = TIM_CR1_CEN ;
}
// Starts TIMER at 200Hz, 5mS period
void init5msTimer()
{
@@ -108,6 +121,7 @@ void boardInit()
adcInit();
delaysInit();
audioInit();
init2MhzTimer();
init5msTimer();
__enable_irq();
eepromInit();
+11 -4
View File
@@ -108,7 +108,7 @@ void configure_pins( uint32_t pins, uint16_t config );
extern uint16_t sessionTimer;
#define SLAVE_MODE() (g_model.trainerMode == 1)
#define SLAVE_MODE() (g_model.trainerMode == TRAINER_MODE_SLAVE)
#define TRAINER_CONNECTED() (GPIO_ReadInputDataBit(GPIOTRNDET, PIN_TRNDET) == Bit_RESET)
void delaysInit(void);
@@ -156,6 +156,10 @@ void init_trainer_ppm(void);
void stop_trainer_ppm(void);
void init_trainer_capture(void);
void stop_trainer_capture(void);
void init_cppm_on_heartbeat_capture(void);
void stop_cppm_on_heartbeat_capture(void);
void init_sbus_on_heartbeat_capture(void);
void stop_sbus_on_heartbeat_capture(void);
// Keys driver
void keysInit(void);
@@ -197,8 +201,8 @@ void pwrOff(void);
#define UNEXPECTED_SHUTDOWN() (g_eeGeneral.unexpectedShutdown)
#define INTERNAL_RF_ON() GPIO_SetBits(GPIO_INT_RF_PWR, PIN_INT_RF_PWR)
#define INTERNAL_RF_OFF() GPIO_ResetBits(GPIO_INT_RF_PWR, PIN_INT_RF_PWR)
#define EXTERNAL_RF_ON() GPIO_SetBits(GPIO_EXT_RF_PWR, PIN_EXT_RF_PWR)
#define EXTERNAL_RF_OFF() GPIO_ResetBits(GPIO_EXT_RF_PWR, PIN_EXT_RF_PWR)
#define EXTERNAL_MODULE_ON() GPIO_SetBits(GPIO_EXT_RF_PWR, PIN_EXT_RF_PWR)
#define EXTERNAL_MODULE_OFF() GPIO_ResetBits(GPIO_EXT_RF_PWR, PIN_EXT_RF_PWR)
// Backlight driver
#if defined(REVPLUS)
@@ -259,7 +263,10 @@ void hapticOff(void);
void uart3Init(unsigned int mode, unsigned int protocol);
void uart3Putc(const char c);
#define telemetrySecondPortInit(protocol) uart3Init(UART_MODE_TELEMETRY, protocol)
void uart3SbusInit(void);
void uart3Stop(void);
#define USART_FLAG_ERRORS (USART_FLAG_ORE | USART_FLAG_NE | USART_FLAG_FE | USART_FLAG_PE)
extern uint8_t currentTrainerMode;
#endif
+1
View File
@@ -193,6 +193,7 @@
#define PIN_PER_3 0x0030
#define PIN_PER_5 0x0050
#define PIN_PER_6 0x0060
#define PIN_PER_8 0x0080
// #define PIN_OS2 0x0000
#define PIN_OS25 0x2000
#define PIN_OS50 0x4000
+16 -8
View File
@@ -172,10 +172,11 @@ static void disable_pa10_none()
static void init_pa7_none()
{
EXTERNAL_RF_OFF();
if (!IS_TRAINER_EXTERNAL_MODULE()) {
EXTERNAL_MODULE_OFF();
}
// Timer8
GPIO_InitTypeDef GPIO_InitStructure;
RCC_AHB1PeriphClockCmd(RCC_AHB1Periph_GPIO_EXTPPM, ENABLE);
@@ -374,7 +375,7 @@ extern "C" void TIM1_UP_TIM10_IRQHandler()
static void init_pa7_pxx()
{
EXTERNAL_RF_ON();
EXTERNAL_MODULE_ON();
// Timer8
setupPulsesPXX(EXTERNAL_MODULE);
@@ -442,13 +443,15 @@ static void disable_pa7_pxx()
NVIC_DisableIRQ(TIM8_CC_IRQn) ;
TIM8->DIER &= ~TIM_DIER_CC2IE ;
TIM8->CR1 &= ~TIM_CR1_CEN ;
EXTERNAL_RF_OFF();
if (!IS_TRAINER_EXTERNAL_MODULE()) {
EXTERNAL_MODULE_OFF();
}
}
#if defined(DSM2)
static void init_pa7_dsm2()
{
EXTERNAL_RF_ON();
EXTERNAL_MODULE_ON();
// Timer8
setupPulsesDSM2(EXTERNAL_MODULE);
@@ -516,7 +519,9 @@ static void disable_pa7_dsm2()
NVIC_DisableIRQ(TIM8_CC_IRQn) ;
TIM8->DIER &= ~TIM_DIER_CC2IE ;
TIM8->CR1 &= ~TIM_CR1_CEN ;
EXTERNAL_RF_OFF();
if (!IS_TRAINER_EXTERNAL_MODULE()) {
EXTERNAL_MODULE_OFF();
}
}
#endif
@@ -525,7 +530,8 @@ static void disable_pa7_dsm2()
// Pin is AF1 function for timer 1
static void init_pa7_ppm()
{
EXTERNAL_RF_ON();
EXTERNAL_MODULE_ON();
// Timer1
setupPulsesPPM(EXTERNAL_MODULE) ;
ppmStreamPtr[EXTERNAL_MODULE] = ppmStream[EXTERNAL_MODULE];
@@ -573,7 +579,9 @@ static void disable_pa7_ppm()
NVIC_DisableIRQ(TIM8_UP_TIM13_IRQn) ;
TIM8->DIER &= ~TIM_DIER_CC2IE & ~TIM_DIER_UIE ;
TIM8->CR1 &= ~TIM_CR1_CEN ;
EXTERNAL_RF_OFF();
if (!IS_TRAINER_EXTERNAL_MODULE()) {
EXTERNAL_MODULE_OFF();
}
}
extern "C" void TIM8_CC_IRQHandler()
+100 -8
View File
@@ -36,9 +36,9 @@
#include "../../opentx.h"
uint8_t currentTrainerMode;
uint16_t * TrainerPulsePtr;
extern uint16_t ppmStream[NUM_MODULES+1][20];
extern Fifo<32> sbusFifo;
#define setupTrainerPulses() setupPulsesPPM(TRAINER_MODULE)
@@ -79,8 +79,7 @@ void stop_trainer_ppm()
{
configure_pins( PIN_TR_PPM_OUT, PIN_INPUT | PIN_PORTC ) ; // Pin as input
TIM3->CR1 &= ~TIM_CR1_CEN ; // Stop counter
TIM3->DIER &= ~TIM_DIER_CC2IE ; // Stop Interrupt
TIM3->DIER &= ~TIM_DIER_UIE ; // Stop Interrupt
TIM3->DIER = 0 ; // Stop Interrupt
NVIC_DisableIRQ(TIM3_IRQn) ; // Stop Interrupt
}
@@ -99,28 +98,38 @@ void init_trainer_capture()
TIM3->SR &= ~TIM_SR_CC3IF & ~TIM_SR_CC2IF & ~TIM_SR_UIF ; // Clear flags
TIM3->DIER |= TIM_DIER_CC3IE ;
TIM3->CR1 = TIM_CR1_CEN ;
NVIC_EnableIRQ(TIM3_IRQn) ;
NVIC_SetPriority(TIM3_IRQn, 7);
NVIC_EnableIRQ(TIM3_IRQn) ;
}
void stop_trainer_capture()
{
TIM3->CR1 &= ~TIM_CR1_CEN ; // Stop counter
TIM3->DIER &= ~TIM_DIER_CC3IE ; // Stop Interrupt
TIM3->DIER = 0; // Stop Interrupt
NVIC_DisableIRQ(TIM3_IRQn) ; // Stop Interrupt
}
extern "C" void TIM3_IRQHandler()
{
uint16_t capture ;
uint16_t capture = 0;
static uint16_t lastCapt ;
uint16_t val ;
bool doCapture = false ;
// What mode? in or out?
if ( (TIM3->DIER & TIM_DIER_CC3IE ) && ( TIM3->SR & TIM_SR_CC3IF ) ) {
// capture mode
// capture mode on trainer jack
capture = TIM3->CCR3 ;
doCapture = true;
}
if ( (TIM3->DIER & TIM_DIER_CC2IE ) && ( TIM3->SR & TIM_SR_CC2IF ) ) {
// capture mode on heartbeat pin (external module)
capture = TIM3->CCR2 ;
doCapture = true ;
}
if (doCapture) {
val = (uint16_t)(capture - lastCapt) / 2 ;
lastCapt = capture;
@@ -132,7 +141,7 @@ extern "C" void TIM3_IRQHandler()
else {
if (ppmInState>0 && ppmInState<=16) {
if (val>800 && val<2200) {
ppmInValid = 100;
ppmInValid = PPM_IN_VALID_TIMEOUT;
g_ppmIns[ppmInState++ - 1] = (int16_t)(val - 1500)*(g_eeGeneral.PPM_Multiplier+10)/10; //+-500 != 512, but close enough.
}
else {
@@ -168,3 +177,86 @@ extern "C" void TIM3_IRQHandler()
}
}
void init_cppm_on_heartbeat_capture(void)
{
EXTERNAL_MODULE_ON();
RCC->AHB1ENR |= RCC_AHB1ENR_GPIOCEN ; // Enable portC clock
configure_pins( 0x0080, PIN_PERIPHERAL | PIN_PORTC | PIN_PER_2 ) ;
RCC->APB1ENR |= RCC_APB1ENR_TIM3EN ; // Enable clock
TIM3->ARR = 0xFFFF ;
TIM3->PSC = (PERI1_FREQUENCY * TIMER_MULT_APB1) / 2000000 - 1 ; // 0.5uS
TIM3->CR2 = 0 ;
TIM3->CCMR1 = TIM_CCMR1_IC2F_0 | TIM_CCMR1_IC2F_1 | TIM_CCMR1_CC2S_0 ;
TIM3->CCER = TIM_CCER_CC2E ;
TIM3->SR &= ~TIM_SR_CC2IF ; // Clear flag
TIM3->DIER |= TIM_DIER_CC2IE ;
TIM3->CR1 = TIM_CR1_CEN ;
NVIC_SetPriority(TIM3_IRQn, 7);
NVIC_EnableIRQ(TIM3_IRQn) ;
}
void stop_cppm_on_heartbeat_capture(void)
{
TIM3->DIER = 0 ;
TIM3->CR1 &= ~TIM_CR1_CEN ; // Stop counter
NVIC_DisableIRQ(TIM3_IRQn) ; // Stop Interrupt
if (!IS_PULSES_EXTERNAL_MODULE()) {
EXTERNAL_MODULE_OFF();
}
}
void init_sbus_on_heartbeat_capture()
{
EXTERNAL_MODULE_ON();
USART_InitTypeDef USART_InitStructure;
GPIO_InitTypeDef GPIO_InitStructure;
RCC_AHB1PeriphClockCmd(RCC_AHB1Periph_GPIOC, ENABLE);
GPIO_PinAFConfig(GPIOC, GPIO_PinSource7, GPIO_AF_USART6);
GPIO_InitStructure.GPIO_Pin = GPIO_Pin_7;
GPIO_InitStructure.GPIO_Mode = GPIO_Mode_AF;
GPIO_InitStructure.GPIO_OType = GPIO_OType_PP;
GPIO_InitStructure.GPIO_PuPd = GPIO_PuPd_UP;
GPIO_InitStructure.GPIO_Speed = GPIO_Speed_50MHz;
GPIO_Init(GPIOC, &GPIO_InitStructure);
RCC_APB2PeriphClockCmd(RCC_APB2Periph_USART6, ENABLE);
USART_InitStructure.USART_BaudRate = 100000;
USART_InitStructure.USART_WordLength = USART_WordLength_9b;
USART_InitStructure.USART_StopBits = USART_StopBits_1;
USART_InitStructure.USART_Parity = USART_Parity_Even;
USART_InitStructure.USART_HardwareFlowControl = USART_HardwareFlowControl_None;
USART_InitStructure.USART_Mode = USART_Mode_Rx;
USART_Init(USART6, &USART_InitStructure);
USART_Cmd(USART6, ENABLE);
USART_ITConfig(USART6, USART_IT_RXNE, ENABLE);
NVIC_SetPriority(USART6_IRQn, 7);
NVIC_EnableIRQ(USART6_IRQn);
}
void stop_sbus_on_heartbeat_capture(void)
{
configure_pins( 0x0080, PIN_INPUT | PIN_PORTC ) ;
NVIC_DisableIRQ(USART6_IRQn) ;
if (!IS_PULSES_EXTERNAL_MODULE()) {
EXTERNAL_MODULE_OFF();
}
}
extern "C" void USART6_IRQHandler()
{
uint8_t data = USART6->DR;
sbusFifo.push(data);
}
+13 -8
View File
@@ -39,7 +39,7 @@
uint8_t uart3Mode = UART_MODE_NONE;
Fifo<512> uart3TxFifo;
extern Fifo<512> telemetryFifo;
extern Fifo<28> sbusFifo;
extern Fifo<32> sbusFifo;
void uart3Setup(unsigned int baudrate)
{
@@ -70,11 +70,11 @@ void uart3Setup(unsigned int baudrate)
USART_Init(UART3, &USART_InitStructure);
USART_Cmd(UART3, ENABLE);
USART_ITConfig(UART3, USART_IT_RXNE, DISABLE);
USART_ITConfig(UART3, USART_IT_RXNE, ENABLE);
USART_ITConfig(UART3, USART_IT_TXE, DISABLE);
NVIC_EnableIRQ(USART3_IRQn);
NVIC_SetPriority(USART3_IRQn, 7);
NVIC_EnableIRQ(USART3_IRQn);
}
void uart3Init(unsigned int mode, unsigned int protocol)
@@ -97,10 +97,6 @@ void uart3Init(unsigned int mode, unsigned int protocol)
uart3Setup(FRSKY_D_BAUDRATE);
}
break;
case UART_MODE_SBUS_TRAINER:
uart3Setup(100000);
USART3->CR1 |= USART_CR1_M | USART_CR1_PCE ;
break;
}
uart3Mode = mode;
@@ -121,7 +117,16 @@ void debugPutc(const char c)
}
#endif
#define USART_FLAG_ERRORS (USART_FLAG_ORE | USART_FLAG_NE | USART_FLAG_FE | USART_FLAG_PE)
void uart3SbusInit()
{
uart3Setup(100000);
USART3->CR1 |= USART_CR1_M | USART_CR1_PCE ;
}
void uart3Stop()
{
USART_DeInit(USART3);
}
extern "C" void USART3_IRQHandler(void)
{
+164
View File
@@ -0,0 +1,164 @@
/*
* Authors (alphabetical order)
* - Andre Bernet <bernet.andre@gmail.com>
* - Andreas Weitl
* - Bertrand Songis <bsongis@gmail.com>
* - Bryan J. Rentoul (Gruvin) <gruvin@gmail.com>
* - Cameron Weeks <th9xer@gmail.com>
* - Erez Raviv
* - Gabriel Birkus
* - Jean-Pierre Parisy
* - Karl Szmutny
* - Michael Blandford
* - Michal Hlavinka
* - Pat Mackenzie
* - Philip Moss
* - Rob Thomson
* - Romolo Manfredini <romolo.manfredini@gmail.com>
* - Thomas Husterer
*
* opentx is based on code named
* gruvin9x by Bryan J. Rentoul: http://code.google.com/p/gruvin9x/,
* er9x by Erez Raviv: http://code.google.com/p/er9x/,
* and the original (and ongoing) project by
* Thomas Husterer, th9x: http://code.google.com/p/th9x/
*
* 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 "gtests.h"
#if !defined(PCBSKY9X)
TEST(EEPROM, 100_random_writes)
{
eepromFile = NULL; // in memory
RlcFile f;
uint8_t buf[1000];
uint8_t buf2[1000];
EeFsFormat();
for(int i=0; i<100; i++) {
int size = rand()%800;
for(int j=0; j<size; j++) {
buf[j] = rand() < (RAND_MAX/10000*i) ? 0 : (j&0xff);
}
f.writeRlc(5, 5, buf, size, 100);
// printf("size=%4d red=%4d\n\n\n", size, f.size());
f.openRd(5);
uint16_t n = f.readRlc(buf2,size+1);
EXPECT_EQ(n, size);
EXPECT_EQ(memcmp(buf, buf2, size), 0);
}
}
TEST(EEPROM, test2)
{
eepromFile = NULL; // in memory
RlcFile f;
uint8_t buf[1000];
EeFsFormat();
for(int i=0; i<1000; i++) buf[i]='6'+i%4;
f.writeRlc(6, 6, buf, 300, 100);
f.openRd(6);
uint16_t sz=0;
for(int i=0; i<500; i++){
uint8_t b;
uint16_t n=f.readRlc(&b,1);
if(n) EXPECT_EQ(b, ('6'+sz%4));
sz+=n;
}
EXPECT_EQ(sz, 300);
}
TEST(EEPROM, eeCheckImmediately)
{
eepromFile = NULL; // in memory
// RlcFile f;
uint8_t buf[1000];
EeFsFormat();
for(int i=0; i<1000; i++) buf[i]='6'+i%4;
theFile.writeRlc(6, 6, buf, 300, false);
eeCheck(true);
theFile.openRd(6);
uint16_t sz=0;
for(int i=0; i<500; i++){
uint8_t b;
uint16_t n=theFile.readRlc(&b,1);
if(n) EXPECT_EQ(b, ('6'+sz%4));
sz+=n;
}
EXPECT_EQ(sz, 300);
}
TEST(EEPROM, copy)
{
eepromFile = NULL; // in memory
uint8_t buf[1000];
EeFsFormat();
for(int i=0; i<1000; i++) buf[i]='6'+i%4;
theFile.writeRlc(5, 6, buf, 300, true);
theFile.copy(6, 5);
theFile.openRd(6);
uint16_t sz=0;
for(int i=0; i<500; i++){
uint8_t b;
uint16_t n=theFile.readRlc(&b,1);
if(n) EXPECT_EQ(b, ('6'+sz%4));
sz+=n;
}
EXPECT_EQ(sz, 300);
}
TEST(EEPROM, rm)
{
eepromFile = NULL; // in memory
uint8_t buf[1000];
EeFsFormat();
for(int i=0; i<1000; i++) buf[i]='6'+i%4;
theFile.writeRlc(5, 6, buf, 300, true);
EXPECT_EQ(EFile::exists(5), true);
EFile::rm(5);
EXPECT_EQ(EFile::exists(5), false);
theFile.openRd(5);
uint16_t sz=0;
for(int i=0; i<500; i++){
uint8_t b;
uint16_t n=theFile.readRlc(&b,1);
if(n) EXPECT_EQ(b, ('6'+sz%4));
sz+=n;
}
EXPECT_EQ(sz, 0);
}
#endif
+3 -12
View File
@@ -34,18 +34,7 @@
*
*/
#include <QtCore/QString>
#include <math.h>
#include <gtest/gtest.h>
#define SWAP_DEFINED
#include "opentx.h"
#define TELEMETRY_RESET() \
memclear(&frskyData, sizeof(frskyData)); \
frskyData.rssi[0].value = 100
extern bool checkScreenshot(QString test);
#include "gtests.h"
#if defined(FRSKY) && !defined(FRSKY_SPORT)
extern void frskyDProcessPacket(uint8_t *packet);
@@ -181,6 +170,7 @@ TEST(FrSkySPORT, frskySetCellVoltage)
{
uint8_t packet[FRSKY_SPORT_PACKET_SIZE];
MODEL_RESET();
TELEMETRY_RESET();
// test that simulates 3 cell battery
@@ -290,6 +280,7 @@ TEST(FrSkySPORT, frskySetCellVoltageTwoSensors)
{
uint8_t packet[FRSKY_SPORT_PACKET_SIZE];
MODEL_RESET();
TELEMETRY_RESET();
//sensor 1: 3 cell battery
+10 -130
View File
@@ -35,10 +35,17 @@
*/
#include <QtGui/QApplication>
#include <gtest/gtest.h>
#include "gtests.h"
#define SWAP_DEFINED
#include "opentx.h"
int32_t lastAct = 0;
uint16_t anaInValues[NUM_STICKS+NUM_POTS] = { 0 };
uint16_t anaIn(uint8_t chan)
{
if (chan < NUM_STICKS+NUM_POTS)
return anaInValues[chan];
else
return 0;
}
static char _zchar2stringResult[200];
const char * zchar2string(const char * zstring, int size)
@@ -50,133 +57,6 @@ const char * zchar2string(const char * zstring, int size)
return _zchar2stringResult;
}
#if !defined(PCBSKY9X)
TEST(EEPROM, 100_random_writes)
{
eepromFile = NULL; // in memory
RlcFile f;
uint8_t buf[1000];
uint8_t buf2[1000];
EeFsFormat();
for(int i=0; i<100; i++) {
int size = rand()%800;
for(int j=0; j<size; j++) {
buf[j] = rand() < (RAND_MAX/10000*i) ? 0 : (j&0xff);
}
f.writeRlc(5, 5, buf, size, 100);
// printf("size=%4d red=%4d\n\n\n", size, f.size());
f.openRd(5);
uint16_t n = f.readRlc(buf2,size+1);
EXPECT_EQ(n, size);
EXPECT_EQ(memcmp(buf, buf2, size), 0);
}
}
TEST(EEPROM, test2)
{
eepromFile = NULL; // in memory
RlcFile f;
uint8_t buf[1000];
EeFsFormat();
for(int i=0; i<1000; i++) buf[i]='6'+i%4;
f.writeRlc(6, 6, buf, 300, 100);
f.openRd(6);
uint16_t sz=0;
for(int i=0; i<500; i++){
uint8_t b;
uint16_t n=f.readRlc(&b,1);
if(n) EXPECT_EQ(b, ('6'+sz%4));
sz+=n;
}
EXPECT_EQ(sz, 300);
}
TEST(EEPROM, eeCheckImmediately)
{
eepromFile = NULL; // in memory
// RlcFile f;
uint8_t buf[1000];
EeFsFormat();
for(int i=0; i<1000; i++) buf[i]='6'+i%4;
theFile.writeRlc(6, 6, buf, 300, false);
eeCheck(true);
theFile.openRd(6);
uint16_t sz=0;
for(int i=0; i<500; i++){
uint8_t b;
uint16_t n=theFile.readRlc(&b,1);
if(n) EXPECT_EQ(b, ('6'+sz%4));
sz+=n;
}
EXPECT_EQ(sz, 300);
}
TEST(EEPROM, copy)
{
eepromFile = NULL; // in memory
uint8_t buf[1000];
EeFsFormat();
for(int i=0; i<1000; i++) buf[i]='6'+i%4;
theFile.writeRlc(5, 6, buf, 300, true);
theFile.copy(6, 5);
theFile.openRd(6);
uint16_t sz=0;
for(int i=0; i<500; i++){
uint8_t b;
uint16_t n=theFile.readRlc(&b,1);
if(n) EXPECT_EQ(b, ('6'+sz%4));
sz+=n;
}
EXPECT_EQ(sz, 300);
}
TEST(EEPROM, rm)
{
eepromFile = NULL; // in memory
uint8_t buf[1000];
EeFsFormat();
for(int i=0; i<1000; i++) buf[i]='6'+i%4;
theFile.writeRlc(5, 6, buf, 300, true);
EXPECT_EQ(EFile::exists(5), true);
EFile::rm(5);
EXPECT_EQ(EFile::exists(5), false);
theFile.openRd(5);
uint16_t sz=0;
for(int i=0; i<500; i++){
uint8_t b;
uint16_t n=theFile.readRlc(&b,1);
if(n) EXPECT_EQ(b, ('6'+sz%4));
sz+=n;
}
EXPECT_EQ(sz, 0);
}
#endif
int main(int argc, char **argv)
{
QCoreApplication app(argc, argv);
+53
View File
@@ -0,0 +1,53 @@
#ifndef __GTESTS_H
#define __GTESTS_H
#include <QtCore/QString>
#include <math.h>
#include <gtest/gtest.h>
#define SWAP_DEFINED
#include "opentx.h"
#define CHANNEL_MAX (1024*256)
extern int32_t lastAct;
extern uint16_t anaInValues[NUM_STICKS+NUM_POTS];
void doMixerCalculations();
inline void MODEL_RESET()
{
memset(&g_model, 0, sizeof(g_model));
memset(&anaInValues, 0, sizeof(anaInValues));
extern uint8_t s_mixer_first_run_done;
s_mixer_first_run_done = false;
lastFlightMode = 255;
}
inline void MIXER_RESET()
{
memset(channelOutputs, 0, sizeof(channelOutputs));
memset(chans, 0, sizeof(chans));
memset(ex_chans, 0, sizeof(ex_chans));
memset(act, 0, sizeof(act));
memset(swOn, 0, sizeof(swOn));
#if !defined(CPUARM)
s_last_switch_used = 0;
s_last_switch_value = 0;
#endif
mixerCurrentFlightMode = lastFlightMode = 0;
lastAct = 0;
logicalSwitchesReset();
}
inline void TELEMETRY_RESET()
{
memclear(&frskyData, sizeof(frskyData));
frskyData.rssi[0].value = 100;
}
void MIXER_RESET();
bool checkScreenshot(QString test);
#endif
+40 -63
View File
@@ -34,47 +34,31 @@
*
*/
#include <math.h>
#include <gtest/gtest.h>
#include "gtests.h"
#define SWAP_DEFINED
#include "opentx.h"
#define CHECK_NO_MOVEMENT(channel, value, duration) \
for (int i=1; i<=(duration); i++) { \
evalFlightModeMixes(e_perout_mode_normal, 1); \
EXPECT_EQ(chans[(channel)], (value)); \
}
#define CHANNEL_MAX (1024*256)
#define CHECK_SLOW_MOVEMENT(channel, sign, duration) \
do { \
for (int i=1; i<=(duration); i++) { \
evalFlightModeMixes(e_perout_mode_normal, 1); \
lastAct = lastAct + (sign) * (1<<19)/500; /* 100 on ARM */ \
EXPECT_EQ(chans[(channel)], 256 * (lastAct >> 8)); \
} \
} while (0)
void doMixerCalculations();
#define MODEL_RESET() \
memset(&g_model, 0, sizeof(g_model)); \
memset(&anaInValues, 0, sizeof(anaInValues)); \
extern uint8_t s_mixer_first_run_done; \
s_mixer_first_run_done = false; \
lastFlightMode = 255;
int32_t lastAct = 0;
void MIXER_RESET()
{
memset(channelOutputs, 0, sizeof(channelOutputs));
memset(ex_chans, 0, sizeof(ex_chans));
memset(act, 0, sizeof(act));
memset(swOn, 0, sizeof(swOn));
#if !defined(CPUARM)
s_last_switch_used = 0;
s_last_switch_value = 0;
#endif
mixerCurrentFlightMode = lastFlightMode = 0;
lastAct = 0;
logicalSwitchesReset();
}
uint16_t anaInValues[NUM_STICKS+NUM_POTS] = { 0 };
uint16_t anaIn(uint8_t chan)
{
if (chan < NUM_STICKS+NUM_POTS)
return anaInValues[chan];
else
return 0;
}
#define CHECK_DELAY(channel, duration) \
do { \
int32_t value = chans[(channel)]; \
for (int i=1; i<=(duration); i++) { \
evalFlightModeMixes(e_perout_mode_normal, 1); \
EXPECT_EQ(chans[(channel)], value); \
} \
} while (0)
TEST(Trims, throttleTrim)
{
@@ -643,30 +627,6 @@ TEST(Mixer, RecursiveAddChannelAfterInactivePhase)
EXPECT_EQ(chans[1], CHANNEL_MAX);
}
#define CHECK_NO_MOVEMENT(channel, value, duration) \
for (int i=1; i<=(duration); i++) { \
evalFlightModeMixes(e_perout_mode_normal, 1); \
EXPECT_EQ(chans[(channel)], (value)); \
}
#define CHECK_SLOW_MOVEMENT(channel, sign, duration) \
do { \
for (int i=1; i<=(duration); i++) { \
evalFlightModeMixes(e_perout_mode_normal, 1); \
lastAct = lastAct + (sign) * (1<<19)/500; /* 100 on ARM */ \
EXPECT_EQ(chans[(channel)], 256 * (lastAct >> 8)); \
} \
} while (0)
#define CHECK_DELAY(channel, duration) \
do { \
int32_t value = chans[(channel)]; \
for (int i=1; i<=(duration); i++) { \
evalFlightModeMixes(e_perout_mode_normal, 1); \
EXPECT_EQ(chans[(channel)], value); \
} \
} while (0)
#if !defined(CPUARM)
TEST(Mixer, SlowOnSwitch)
{
@@ -1009,7 +969,9 @@ TEST(Heli, Mode2Test)
EXPECT_EQ(chans[1], CHANNEL_MAX/2);
EXPECT_EQ(chans[2], CHANNEL_MAX/2);
}
#elif defined(HELI)
#endif
#if defined(HELI) && !defined(PCBTARANIS)
TEST(Heli, SimpleTest)
{
MODEL_RESET();
@@ -1021,3 +983,18 @@ TEST(Heli, SimpleTest)
EXPECT_EQ(chans[1], CHANNEL_MAX/2);
}
#endif
TEST(Trainer, UnpluggedTest)
{
MODEL_RESET();
MIXER_RESET();
g_model.mixData[0].destCh = 0;
g_model.mixData[0].mltpx = MLTPX_ADD;
g_model.mixData[0].srcRaw = MIXSRC_FIRST_TRAINER;
g_model.mixData[0].weight = 100;
g_model.mixData[0].delayUp = DELAY_STEP*5;
g_model.mixData[0].delayDown = DELAY_STEP*5;
ppmInValid = 0;
g_ppmIns[0] = 1024;
CHECK_DELAY(0, 5000);
}
+4 -4
View File
@@ -79,8 +79,8 @@
#define LEN_TRNCHN "\003"
#define TR_TRNCHN "CH1CH2CH3CH4"
#define LEN_UART3MODES "\017"
#define TR_UART3MODES "VYP\0 ""S-Port Mirror\0 ""Telemetrie\0 ""SBUS Trenér\0 ""Debug\0 "
#define LEN_UART3MODES "\015"
#define TR_UART3MODES "VYP\0 ""S-Port Mirror""Telemetrie\0 ""SBUS Trainer\0""Debug\0"
#define LEN_POTTYPES "\017"
#define TR_POTTYPES "Není\0 ""Pot s aretací\0 ""Vícepol. přep.\0""Potenciometr\0"
@@ -477,8 +477,8 @@
#define LEN_VTMRMODES "\004"
#define TR_VTMRMODES "VYP\0""ABS\0""Pln>""Pln%""Pln*"
#define LEN_VTRAINERMODES "\006"
#define TR_VTRAINERMODES "Učitel""Žák\0 "
#define LEN_VTRAINERMODES "\022"
#define TR_VTRAINERMODES "Učitel/Jack\0 ""Žák/Jack\0 ""Master/SBUS Module""Master/CPPM Module""Master/Battery\0"
#define LEN_VFAILSAFE "\011"
#define TR_VFAILSAFE "Držet\0 ""Vlastní\0 ""Bez pulzů""Přijímač"
+4 -4
View File
@@ -79,8 +79,8 @@
#define LEN_TRNCHN "\003"
#define TR_TRNCHN "CH1CH2CH3CH4"
#define LEN_UART3MODES "\017"
#define TR_UART3MODES "AUS\0 ""S-Port DataOut\0""Telemetrie\0 ""Trainer\0 ""Debug\0 "
#define LEN_UART3MODES "\015"
#define TR_UART3MODES "AUS\0 ""S-Port Mirror""Telemetrie\0 ""SBUS Trainer\0""Debug\0"
#define LEN_POTTYPES "\017"
#define TR_POTTYPES "Kein\0 ""Poti mit Raste ""Stufen-Schalter""Poti ohne Raste\0"
@@ -481,8 +481,8 @@
#define LEN_VTMRMODES "\003"
#define TR_VTMRMODES "AUS""ABS""GSs""GS%""GSt"
#define LEN_VTRAINERMODES "\007"
#define TR_VTRAINERMODES "Lehrer\0""Schüler\0" // "Master""Slave\0"
#define LEN_VTRAINERMODES "\022"
#define TR_VTRAINERMODES "Lehrer/Jack\0 ""Schüler/Jack\0 ""Master/SBUS Module""Master/CPPM Module""Master/Battery\0"
#define LEN_VFAILSAFE "\013"
#define TR_VFAILSAFE "Halte Pos.\0""Angepasst\0 ""Kein Signal""Empfänger\0"
+4 -4
View File
@@ -79,8 +79,8 @@
#define LEN_TRNCHN "\003"
#define TR_TRNCHN "CH1CH2CH3CH4"
#define LEN_UART3MODES "\017"
#define TR_UART3MODES "OFF\0 ""S-Port Mirror\0 ""Telemetry\0 ""SBUS Trainer\0 ""Debug\0 "
#define LEN_UART3MODES "\015"
#define TR_UART3MODES "OFF\0 ""S-Port Mirror""Telemetry\0 ""SBUS Trainer\0""Debug\0"
#define LEN_POTTYPES "\017"
#define TR_POTTYPES "None\0 ""Pot with detent""Multipos Switch""Pot\0"
@@ -481,8 +481,8 @@
#define LEN_VTMRMODES "\003"
#define TR_VTMRMODES "OFF""ON\0""THs""TH%""THt"
#define LEN_VTRAINERMODES "\006"
#define TR_VTRAINERMODES "Master""Slave\0"
#define LEN_VTRAINERMODES "\022"
#define TR_VTRAINERMODES "Master/Jack\0 ""Slave/Jack\0 ""Master/SBUS Module""Master/CPPM Module""Master/Battery\0"
#define LEN_VFAILSAFE "\011"
#define TR_VFAILSAFE "Hold\0 ""Custom\0 ""No pulses""Receiver\0"
+4 -4
View File
@@ -79,8 +79,8 @@
#define LEN_TRNCHN "\003"
#define TR_TRNCHN "CH1CH2CH3CH4"
#define LEN_UART3MODES "\017"
#define TR_UART3MODES "OFF\0 ""S-Port Mirror\0 ""Telemetry\0 ""Trainer\0 ""Debug\0 "
#define LEN_UART3MODES "\015"
#define TR_UART3MODES "OFF\0 ""S-Port Mirror""Telemetry\0 ""SBUS Trainer\0""Debug\0"
#define LEN_POTTYPES "\017"
#define TR_POTTYPES "None\0 ""Pot with detent""Multipos Switch""Pot\0"
@@ -474,8 +474,8 @@
#define LEN_VTMRMODES "\003"
#define TR_VTMRMODES "OFF""ABS""THs""TH%""THt"
#define LEN_VTRAINERMODES "\006"
#define TR_VTRAINERMODES "Master""Esclav"
#define LEN_VTRAINERMODES "\022"
#define TR_VTRAINERMODES "Master/Jack\0 ""Esclav/Jack\0 ""Master/SBUS Module""Master/CPPM Module""Master/Battery\0"
#define LEN_VFAILSAFE "\011"
#define TR_VFAILSAFE "Guardar\0 ""Adaptar\0 ""Sin pulso""Receiver\0"
+4 -4
View File
@@ -79,8 +79,8 @@
#define LEN_TRNCHN "\003"
#define TR_TRNCHN "CH1CH2CH3CH4"
#define LEN_UART3MODES "\017"
#define TR_UART3MODES "POIS\0 ""S-Port Pelik\0 ""Telemetry\0 ""Trainer\0 ""Debug\0 "
#define LEN_UART3MODES "\015"
#define TR_UART3MODES "POIS\0 ""S-Port Pelik\0""Telemetry\0 ""SBUS Trainer\0""Debug\0"
#define LEN_POTTYPES "\017"
#define TR_POTTYPES "None\0 ""Pot with detent""Monias. Kytkin\0""Potikka\0"
@@ -474,8 +474,8 @@
#define LEN_VTMRMODES "\003"
#define TR_VTMRMODES "OFF""ABS""THs""TH%""THt"
#define LEN_VTRAINERMODES "\006"
#define TR_VTRAINERMODES "Master""Slave\0"
#define LEN_VTRAINERMODES "\022"
#define TR_VTRAINERMODES "Master/Jack\0 ""Slave/Jack\0 ""Master/SBUS Module""Master/CPPM Module""Master/Battery\0"
#define LEN_VFAILSAFE "\011"
#define TR_VFAILSAFE "Hold\0 ""Custom\0 ""No pulses""Receiver\0"
+4 -4
View File
@@ -79,8 +79,8 @@
#define LEN_TRNCHN "\003"
#define TR_TRNCHN "CH1CH2CH3CH4"
#define LEN_UART3MODES "\017"
#define TR_UART3MODES "OFF\0 ""Recopie S-Port\0""Telemetrie\0 ""Ecolage SBUS\0 ""Debug\0 "
#define LEN_UART3MODES "\016"
#define TR_UART3MODES "OFF\0 ""Recopie S-Port""Telemetrie\0 ""Ecolage SBUS\0 ""Debug\0"
#define LEN_POTTYPES "\017"
#define TR_POTTYPES "Rien\0 ""Pot avec centre""Inter multi-pos""Potentiomètre\0"
@@ -474,8 +474,8 @@
#define LEN_VTMRMODES "\003"
#define TR_VTMRMODES "OFF""ABS""GZs""GZ%""GZt"
#define LEN_VTRAINERMODES "\006"
#define TR_VTRAINERMODES "Maître""Elève\0"
#define LEN_VTRAINERMODES "\022"
#define TR_VTRAINERMODES "Maître/Jack\0 ""Elève/Jack\0 ""Maître/SBUS Module""Maître/CPPM Module""Maître/Batterie\0"
#define LEN_VFAILSAFE "\011"
#define TR_VFAILSAFE "Maintien\0""Prédéfini""Pas d'imp""Récepteur"
+6 -6
View File
@@ -78,10 +78,10 @@
#define LEN_TRNCHN "\003"
#define TR_TRNCHN "ch1ch2ch3ch4"
#define LEN_UART3MODES "\017"
#define TR_UART3MODES "OFF\0 ""Replica Porta-S""Telemetria\0 ""Trainer\0 ""Debug\0 "
#define LEN_UART3MODES "\016"
#define TR_UART3MODES "OFF\0 ""Replica S-Port""Telemetria\0 ""SBUS Trainer\0 ""Debug\0"
#define LEN_POTTYPES "\017"
#define TR_POTTYPES "None\0 ""Pot. con centro""Inter. Multipos""Potenziometro\0 "
@@ -474,8 +474,8 @@
#define LEN_VTMRMODES "\003"
#define TR_VTMRMODES "OFF""ABS""MOs""MO%""MOt"
#define LEN_VTRAINERMODES "\007"
#define TR_VTRAINERMODES "Maestro""Allievo"
#define LEN_VTRAINERMODES "\022"
#define TR_VTRAINERMODES "Maestro/Jack\0 ""Allievo/Jack\0 ""Master/SBUS Module""Master/CPPM Module""Master/Battery\0"
#define LEN_VFAILSAFE "\013"
#define TR_VFAILSAFE "Mantieni\0 ""Personali\0 ""No impulsi\0""Ricevente\0 "
+3 -3
View File
@@ -80,7 +80,7 @@
#define TR_TRNCHN "KN1KN2KN3KN4"
#define LEN_UART3MODES "\017"
#define TR_UART3MODES "Wyłącz\0 ""S-Port Mirror\0 ""Telemetry\0 ""Trainer\0 ""Debug\0 "
#define TR_UART3MODES "Wyłącz\0 ""S-Port Mirror\0 ""Telemetry\0 ""SBUS Trainer\0 ""Debug\0"
#define LEN_POTTYPES "\017"
#define TR_POTTYPES "Brak\0 ""Poten z zapadką""Przeł.Wielopoz.""Potencjometr\0"
@@ -474,8 +474,8 @@
#define LEN_VTMRMODES "\003"
#define TR_VTMRMODES "WYŁ""ABS""THs""TH%""THt"
#define LEN_VTRAINERMODES "\006"
#define TR_VTRAINERMODES "Trener""Uczeń\0"
#define LEN_VTRAINERMODES "\022"
#define TR_VTRAINERMODES "Trener/Jack\0 ""Uczeń/Jack\0 ""Trener/SBUS Module""Trener/CPPM Module""Trener/Battery\0"
#define LEN_VFAILSAFE "\011"
#define TR_VFAILSAFE "Utrzymuj\0""Własne\0 ""0 sygnału""Odbiorn.\0"
+3 -3
View File
@@ -80,7 +80,7 @@
#define TR_TRNCHN "CH1CH2CH3CH4"
#define LEN_UART3MODES "\017"
#define TR_UART3MODES "OFF\0 ""S-Port Mirror\0 ""Telemetry\0 ""Trainer\0 ""Debug\0 "
#define TR_UART3MODES "OFF\0 ""S-Port Mirror\0 ""Telemetry\0 ""SBUS Trainer\0 ""Debug\0"
#define LEN_POTTYPES "\017"
#define TR_POTTYPES "None\0 ""Pot with detent""Multipos Switch""Pot\0"
@@ -474,8 +474,8 @@
#define LEN_VTMRMODES "\003"
#define TR_VTMRMODES "OFF""ABS""MTs""MT%""MTt"
#define LEN_VTRAINERMODES "\006"
#define TR_VTRAINERMODES "Master""Slave\0"
#define LEN_VTRAINERMODES "\022"
#define TR_VTRAINERMODES "Master/Jack\0 ""Slave/Jack\0 ""Master/SBUS Module""Master/CPPM Module""Master/Battery\0"
#define LEN_VFAILSAFE "\011"
#define TR_VFAILSAFE "Hold\0 ""Custom\0 ""No pulses""Receiver\0"
+3 -3
View File
@@ -80,7 +80,7 @@
#define TR_TRNCHN "KN1KN2KN3KN4"
#define LEN_UART3MODES "\022"
#define TR_UART3MODES "Av\0 ""Spegling av S-Port""Telemetri\0 ""Trainer\0 ""Debug\0 "
#define TR_UART3MODES "Av\0 ""Spegling av S-Port""Telemetri\0 ""SBUS Trainer\0 ""Debug\0"
#define LEN_POTTYPES "\020"
#define TR_POTTYPES "Ingen\0 ""Mittläges-pot\0 ""Flerlägesväljare""Potentiometer\0"
@@ -474,8 +474,8 @@
#define LEN_VTMRMODES "\003"
#define TR_VTMRMODES "Av\0""ABS""GAs""GA%""GAt"
#define LEN_VTRAINERMODES "\006"
#define TR_VTRAINERMODES "Lärare""Elev\0."
#define LEN_VTRAINERMODES "\022"
#define TR_VTRAINERMODES "Lärare/Jack\0 ""Elev./Jack\0 ""Lärare/SBUS Module""Lärare/CPPM Module""Lärare/Battery\0"
#define LEN_VFAILSAFE "\011"
#define TR_VFAILSAFE "Lås Servo""Anpassat\0""Pulsfritt""Mottagare"