refact: ADC, switches and keys
Add "hardware_defs" target to dump hardware defines from hal.h per target Fixed hal.h definitions for switches & ADC inputs Tools to generate hardware definitions from current hal.h generator: add support for EXTx and analog switches WiP Add generated header to hardware_defs target Add support for ADC input direction and index per GPIO port Incredible: it compiles Removed StdPeriph ADC driver Works on QX7 Works on TX16S (VBat missing) Switch driver using generated switches for stm32 targets Switch driver with generated switches for simu Use switch names from switch driver Fixed single conversion handling Fixed horus VBat reading Added switch name Fix warnings about bitfield offsets and GCC 4.4 This is caused by bitfields that cross type boundaries. In this particular case, it happens as the bitfield is not defined the same in `rtc_backup.cpp`. Switches has already been moved to generic driver Jitter measurement for each sample, not just for oversampled values Moved periph clock init to the ADC driver ADC & GPIOs. Add switchInit() to init pins Fix NV14 CMake Fix taranis target Fix NV14 (again) Model audio files: use new interface for switch index Fix X9-lite Fix simu headers Fix getSwitchName() Add support for ADC switches Fix switch warning YAML Test only switches which are defined Conversions tests for QX7 only on QX7 Fix X12S Fix function switch names Enable ADC periph clock before initialising channels NV14: offset inputs for the sticks & fix switches WiP: get rid of VSRCRAW and some more Simu shall use normal ADC driver fix x7 fix nv14 Fix 9x nav fix 212x64 fix xlite fix x9e fix simu lib fix unit tests fix x7 tests PWM stick values should be written directly into adcValues ... just like FlySky sticks. fix x12s fix nv14 Add some support for SPI ADC (only unit tests) Remove `jq` usage fix generate_yaml.py for newer libclang fix pot config fix stick names Some YAML generator improvements Max 16 Pots on COLORLCD Fix some source names Use 10 bits for switches to prevent overflow Removed horus constants for switches & ADC inputs Fix unit tests Fix curve edit Fix libsimulator Fix function switches (tpro) Refine ADC & analog API Moved hardware definitions scripts and templates into own dir cleanup API refine Fix unit tests Mixer: apply calibration only on required inputs Place ADC switches after all other ADC inputs Fix X12S Remove useless TR_POTS_VSRCRAW, TR_SW_VSRCRAW, and TR_VSRCRAW Cleanup redundant generated YAML parsers Fixes Boxer rebase Add boxer to generate-hw-defs.sh Obsolete LUA exports Add boxer ADC_DIRECTION Split generate_hw_defs.py into multiple files Some cleanup (+ LUA switches) Fix AXIS definitions Fixed translation strings declarations Some rebase fixes Remove some useless StdPeriph drivers fix: set pin mode to reset state on usart deinit fix: use canonical names for calibration data fix: ADC driver does not care about unconfigured inputs fix X12S ADC Add support for ADC conversion chaining Better X12S ADC implem Moved X12S ADC driver to HAL/LL Improve ADC driver separation Fixed taranis & nv14 Moved PWM gimbals to HAL/LL Removed useless TR_EXTRA_VSRCRAW Fixed include guards Small fixes Renamed control inputs Moved internal and external module pulse driver def to boards Move more things to the generic_stm32 board Remove STR_VMIXTRIMS Added analog labels Generate main control names Misuse labels / short labels for main controls Backward compatibility: sliders and legacy names New keys driver Let's get rid of StdPeriph headers in simu Add jinja2 to CI workflows Use `grep` instead of `sed` chore: add python jinja2 oto msys setup script Removed more static definitions and use dynamic ones instead Fixes X9E Fix x7 nav too 212 switch display Fix default sliders Removed NUM_STICKS 212 switch display working nicely Surface radio 'stick' replacements fix: switch, trim & rotary pin init Remove old key drivers Removed VKEYS Removed ETX_FOURCC Fixed SURFACE_NAME Removed TR_VSWITCHES & TR_TRIMS_SWITCHES Fix xpot switches Store calibrated analogs in physical order Use getSourceString in drawSource Implement missing YAML read/write Fix isSourceAvailableInInputs() Fix isSourceAvailable() Some surface fixes Fix CLI debug Ported colour UI of analog diagnostics to new ADC API Small fixes Better input mapping Minor tpro fixes Fix trims available Remove TX mode choice on surface radio Rename surface controls Channel order alignement Fix throttle warning Fix checkTrims() Fix pot config casting issue Fix IS_SWITCH_FS() Fixed input mapping Fix fswitch auto-switch Fixed storing / reading function switches in YAML Fix enableVBatBridge() / disableVBatBridge() Fix interesting mode conversion Fix sources issues Fix special funnction list Proper function switch handling 128 GUI improvements Fix compilation Boxer cosmetics 128 hardware screen cosmetic Fix TX12 switches More switches fixes Simplify CPU type handling Fix flash size Fixed page-up / page-down in libopenui
This commit is contained in:
Raphael Coeffic
committed by
Malte Langermann
Malte Langermann
parent
b6dd3a0ef8
commit
2b100e0eb5
@@ -30,6 +30,7 @@
|
||||
#include "globals.h"
|
||||
#include "serial.h"
|
||||
#include "usb_joystick.h"
|
||||
#include "input_mapping.h"
|
||||
|
||||
#if defined(PCBTARANIS)
|
||||
#define N_TARANIS_FIELD(x)
|
||||
@@ -78,8 +79,8 @@ PACK(struct MixData {
|
||||
uint16_t mixWarn:2; // mixer warning
|
||||
uint16_t mltpx:2 ENUM(MixerMultiplex);
|
||||
uint16_t spare:1 SKIP;
|
||||
int32_t offset:14 CUST(in_read_weight,in_write_weight);
|
||||
int32_t swtch:9 CUST(r_swtchSrc,w_swtchSrc);
|
||||
int32_t offset:13 CUST(in_read_weight,in_write_weight);
|
||||
int32_t swtch:10 CUST(r_swtchSrc,w_swtchSrc);
|
||||
uint32_t flightModes:9 CUST(r_flightModes, w_flightModes);
|
||||
CurveRef curve;
|
||||
uint8_t delayUp;
|
||||
@@ -100,10 +101,9 @@ PACK(struct ExpoData {
|
||||
int16_t trimSource:6;
|
||||
uint16_t srcRaw:10 ENUM(MixSources) CUST(r_mixSrcRaw,w_mixSrcRaw);
|
||||
uint32_t chn:5;
|
||||
int32_t swtch:9 CUST(r_swtchSrc,w_swtchSrc);
|
||||
int32_t swtch:10 CUST(r_swtchSrc,w_swtchSrc);
|
||||
uint32_t flightModes:9 CUST(r_flightModes, w_flightModes);
|
||||
int32_t weight:8 CUST(in_read_weight,in_write_weight);
|
||||
int32_t spare:1 SKIP;
|
||||
NOBACKUP(char name[LEN_EXPOMIX_NAME]);
|
||||
int8_t offset CUST(in_read_weight,in_write_weight);
|
||||
CurveRef curve;
|
||||
@@ -134,9 +134,9 @@ PACK(struct LogicalSwitchData {
|
||||
CUST_ATTR(def,r_logicSw,w_logicSw);
|
||||
int32_t v1:10 SKIP;
|
||||
int32_t v3:10 SKIP;
|
||||
int32_t andsw:9 CUST(r_swtchSrc,w_swtchSrc); // TODO rename to xswtch
|
||||
int32_t andsw:10 CUST(r_swtchSrc,w_swtchSrc); // TODO rename to xswtch
|
||||
uint32_t andswtype:1 SKIP; // TODO rename to xswtchType (AND / OR)
|
||||
uint32_t spare:2 SKIP; // anything else needed?
|
||||
uint32_t spare:1 SKIP; // anything else needed?
|
||||
int16_t v2 SKIP;
|
||||
uint8_t delay;
|
||||
uint8_t duration;
|
||||
@@ -154,8 +154,8 @@ PACK(struct LogicalSwitchData {
|
||||
#endif
|
||||
|
||||
PACK(struct CustomFunctionData {
|
||||
int16_t swtch:9 CUST(r_swtchSrc,w_swtchSrc);
|
||||
uint16_t func:7 ENUM(Functions);
|
||||
int16_t swtch:10 CUST(r_swtchSrc,w_swtchSrc);
|
||||
uint16_t func:6 ENUM(Functions); // TODO: 6 bits for Functions?
|
||||
CUST_ATTR(def,r_customFn,w_customFn);
|
||||
PACK(union {
|
||||
NOBACKUP(PACK(struct {
|
||||
@@ -192,10 +192,11 @@ PACK(struct trim_t {
|
||||
});
|
||||
|
||||
PACK(struct FlightModeData {
|
||||
trim_t trim[NUM_TRIMS];
|
||||
trim_t trim[MAX_TRIMS];
|
||||
NOBACKUP(char name[LEN_FLIGHT_MODE_NAME]);
|
||||
int16_t swtch:9 ENUM(SwitchSources) CUST(r_swtchSrc,w_swtchSrc); // swtch of phase[0] is not used
|
||||
int16_t spare:7 SKIP;
|
||||
// swtch of phase[0] is not used
|
||||
int16_t swtch:10 ENUM(SwitchSources) CUST(r_swtchSrc,w_swtchSrc);
|
||||
int16_t spare:6 SKIP;
|
||||
uint8_t fadeIn;
|
||||
uint8_t fadeOut;
|
||||
gvar_t gvars[MAX_GVARS] FUNC(gvar_is_active);
|
||||
@@ -555,19 +556,20 @@ PACK(struct ModelHeader {
|
||||
#endif
|
||||
});
|
||||
|
||||
#if defined(COLORLCD)
|
||||
typedef uint32_t swconfig_t;
|
||||
typedef uint32_t swarnstate_t;
|
||||
#elif defined(PCBX9E)
|
||||
typedef uint64_t swconfig_t;
|
||||
typedef uint64_t swarnstate_t;
|
||||
#elif defined(PCBX9D) || defined(PCBX9DP)
|
||||
typedef uint32_t swconfig_t;
|
||||
typedef uint32_t swarnstate_t;
|
||||
#else
|
||||
typedef uint16_t swconfig_t;
|
||||
typedef uint32_t swarnstate_t;
|
||||
#endif
|
||||
// 2 bits per switch, max 32 switches
|
||||
static_assert(sizeof(swconfig_t) >= (MAX_SWITCHES * 2 + 7) / 8,
|
||||
"MAX_SWITCHES must fit swconfig_t");
|
||||
|
||||
static_assert(sizeof(swarnstate_t) >= (MAX_SWITCHES * 2 + 7) / 8,
|
||||
"MAX_SWITCHES must fit swarnstate_t");
|
||||
|
||||
// pot config: 4 bits per pot
|
||||
static_assert(sizeof(potconfig_t) * 8 >= ((MAX_POTS - 1) / 4) + 1,
|
||||
"MAX_POTS must fit potconfig_t");
|
||||
|
||||
// pot warning enabled: 1 bit per pot
|
||||
static_assert(sizeof(potwarnen_t) * 8 >= MAX_POTS,
|
||||
"MAX_POTS must fit potwarnen_t");
|
||||
|
||||
#if defined(COLORLCD) && defined(BACKUP)
|
||||
#define CUSTOM_SCREENS_DATA
|
||||
@@ -606,7 +608,7 @@ PACK(struct CustomScreenData {
|
||||
#define SCRIPT_DATA
|
||||
#endif
|
||||
|
||||
#if defined(FUNCTION_SWITCHES) && NUM_FUNCTIONS_SWITCHES < 8
|
||||
#if defined(FUNCTION_SWITCHES)
|
||||
#define FUNCTION_SWITCHS_FIELDS \
|
||||
uint16_t functionSwitchConfig; \
|
||||
uint16_t functionSwitchGroup; \
|
||||
@@ -719,8 +721,8 @@ PACK(struct ModelData {
|
||||
SCRIPT_DATA
|
||||
|
||||
NOBACKUP(char inputNames[MAX_INPUTS][LEN_INPUT_NAME]);
|
||||
NOBACKUP(uint16_t potsWarnEnabled);
|
||||
NOBACKUP(int8_t potsWarnPosition[STORAGE_NUM_POTS+STORAGE_NUM_SLIDERS]);
|
||||
NOBACKUP(potwarnen_t potsWarnEnabled);
|
||||
NOBACKUP(int8_t potsWarnPosition[MAX_POTS]);
|
||||
|
||||
NOBACKUP(TelemetrySensor telemetrySensors[MAX_TELEMETRY_SENSORS];)
|
||||
|
||||
@@ -734,30 +736,26 @@ PACK(struct ModelData {
|
||||
|
||||
uint8_t getThrottleStickTrimSource() const
|
||||
{
|
||||
// The order here is TERA, so that 0 (default) means Throttle
|
||||
switch (thrTrimSw) {
|
||||
case 0:
|
||||
return MIXSRC_TrimThr;
|
||||
case 2:
|
||||
return MIXSRC_TrimRud;
|
||||
default:
|
||||
return thrTrimSw + MIXSRC_FIRST_TRIM;
|
||||
// Makes Throttle the default (=0)
|
||||
auto thr = inputMappingGetThrottle();
|
||||
if (thrTrimSw == 0) {
|
||||
return MIXSRC_FIRST_TRIM + thr;
|
||||
} else if (thrTrimSw == thr) {
|
||||
return MIXSRC_FIRST_TRIM;
|
||||
} else {
|
||||
return MIXSRC_FIRST_TRIM + thrTrimSw;
|
||||
}
|
||||
}
|
||||
|
||||
void setThrottleStickTrimSource(int16_t src)
|
||||
{
|
||||
// The order here is TERA, so that 0 (default) means Throttle
|
||||
switch (src) {
|
||||
case MIXSRC_TrimThr:
|
||||
thrTrimSw = 0;
|
||||
break;
|
||||
case MIXSRC_TrimRud:
|
||||
thrTrimSw = 2;
|
||||
break;
|
||||
default:
|
||||
thrTrimSw = src - MIXSRC_FIRST_TRIM;
|
||||
break;
|
||||
auto thr = inputMappingGetThrottle();
|
||||
if (src == MIXSRC_FIRST_TRIM + thr) {
|
||||
thrTrimSw = 0;
|
||||
} else if (src == MIXSRC_FIRST_TRIM) {
|
||||
thrTrimSw = thr;
|
||||
} else {
|
||||
thrTrimSw = src - MIXSRC_FIRST_TRIM;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -820,12 +818,6 @@ PACK(struct TrainerData {
|
||||
|
||||
#if defined(COLORLCD)
|
||||
#define EXTRA_GENERAL_FIELDS \
|
||||
CUST_ARRAY(sticksConfig, struct_sticksConfig, stick_name_valid); \
|
||||
swconfig_t switchConfig ARRAY(2,struct_switchConfig,nullptr); \
|
||||
uint16_t potsConfig ARRAY(2,struct_potConfig,nullptr); /* two bits per pot */ \
|
||||
uint8_t slidersConfig ARRAY(1,struct_sliderConfig,nullptr); /* 1 bit per slider */ \
|
||||
NOBACKUP(char switchNames[STORAGE_NUM_SWITCHES][LEN_SWITCH_NAME] SKIP); \
|
||||
NOBACKUP(char anaNames[NUM_STICKS + STORAGE_NUM_POTS + STORAGE_NUM_SLIDERS][LEN_ANA_NAME] SKIP); \
|
||||
NOBACKUP(char currModelFilename[LEN_MODEL_FILENAME+1]); \
|
||||
NOBACKUP(uint8_t modelQuickSelect:1); \
|
||||
NOBACKUP(uint8_t blOffBright:7); \
|
||||
@@ -839,14 +831,7 @@ PACK(struct TrainerData {
|
||||
#define BLUETOOTH_FIELDS
|
||||
#endif
|
||||
#define EXTRA_GENERAL_FIELDS \
|
||||
uint8_t slidersConfig:4 ARRAY(1,struct_sliderConfig,nullptr); \
|
||||
uint8_t spare5:4 SKIP; \
|
||||
uint8_t potsConfig ARRAY(2,struct_potConfig,nullptr); /* two bits per pot */\
|
||||
uint8_t backlightColor; \
|
||||
CUST_ARRAY(sticksConfig, struct_sticksConfig, stick_name_valid); \
|
||||
swconfig_t switchConfig ARRAY(2,struct_switchConfig,nullptr); \
|
||||
char switchNames[STORAGE_NUM_SWITCHES - NUM_FUNCTIONS_SWITCHES][LEN_SWITCH_NAME] SKIP; \
|
||||
char anaNames[NUM_STICKS+STORAGE_NUM_POTS+STORAGE_NUM_SLIDERS][LEN_ANA_NAME] SKIP; \
|
||||
BLUETOOTH_FIELDS
|
||||
#endif
|
||||
|
||||
@@ -873,7 +858,7 @@ PACK(struct RadioData {
|
||||
NOBACKUP(int8_t spare0:7 SKIP);
|
||||
CUST_ATTR(semver,nullptr,w_semver);
|
||||
CUST_ATTR(board,nullptr,w_board);
|
||||
CalibData calib[NUM_STICKS + STORAGE_NUM_POTS + STORAGE_NUM_SLIDERS + STORAGE_NUM_MOUSE_ANALOGS] NO_IDX;
|
||||
CalibData calib[MAX_CALIB_ANALOG_INPUTS] NO_IDX;
|
||||
NOBACKUP(uint16_t chkSum SKIP);
|
||||
N_HORUS_FIELD(int8_t currModel);
|
||||
N_HORUS_FIELD(uint8_t contrast);
|
||||
@@ -883,7 +868,7 @@ PACK(struct RadioData {
|
||||
int8_t antennaMode:2 ENUM(AntennaModes);
|
||||
uint8_t disableRtcWarning:1;
|
||||
uint8_t keysBacklight:1;
|
||||
NOBACKUP(uint8_t spare1:1 SKIP);
|
||||
uint8_t spare1:1 SKIP;
|
||||
uint8_t internalModule ENUM(ModuleType);
|
||||
NOBACKUP(TrainerData trainer);
|
||||
NOBACKUP(uint8_t view); // index of view in main screen
|
||||
@@ -946,6 +931,11 @@ PACK(struct RadioData {
|
||||
CUST_ATTR(aux2SerialMode, r_serialMode, nullptr);
|
||||
NOBACKUP(uint32_t serialPort ARRAY(SERIAL_CONF_BITS_PER_PORT,struct_serialConfig,nullptr));
|
||||
|
||||
CUST_ARRAY(sticksConfig, struct_stickConfig, MAX_STICKS, stick_name_valid);
|
||||
CUST_ARRAY(slidersConfig, struct_sliderConfig, MAX_POTS, nullptr);
|
||||
potconfig_t potsConfig ARRAY(4,struct_potConfig,nullptr);
|
||||
swconfig_t switchConfig ARRAY(2,struct_switchConfig,nullptr);
|
||||
|
||||
EXTRA_GENERAL_FIELDS
|
||||
|
||||
THEME_DATA
|
||||
|
||||
Reference in New Issue
Block a user