feat: More flexible ADC inputs (#3870)

Co-authored-by: 3djc <lesitewebdejc@hotmail.com>
Co-authored-by: Peter Feerick <peter.feerick@gmail.com>
Co-authored-by: philmoz <phil.a.mitchell@gmail.com>
This commit is contained in:
Raphael Coeffic
2023-11-02 11:07:53 +10:00
committed by GitHub
co-authored by 3djc Peter Feerick philmoz
parent f5593c44e8
commit b48e07026d
78 changed files with 1291 additions and 773 deletions
+18
View File
@@ -43,6 +43,22 @@ KEYS_LUT = [
"KEY_BIND",
]
# def eprint(*args, **kwargs):
# from sys import stderr
# print(*args, file=stderr, **kwargs)
def is_ext_input(input):
if input.get('type') != 'FLEX':
return False
name = input.get('name')
if name and name.startswith('EXT'):
return True
return False
def generate_from_template(json_filename, template_filename, target):
with open(json_filename) as json_file:
@@ -70,6 +86,8 @@ def generate_from_template(json_filename, template_filename, target):
trim_blocks=True
)
env.tests['ext_input'] = is_ext_input
template_str = template_file.read()
template = env.from_string(template_str)
+8 -8
View File
@@ -12,7 +12,7 @@ def eprint(*args, **kwargs):
class ADCInput:
TYPE_STICK = 'STICK'
TYPE_POT = 'POT'
TYPE_FLEX = 'FLEX'
TYPE_SWITCH = 'SWITCH'
# TYPE_BATT = 'BATT'
@@ -60,25 +60,25 @@ class ADCInputParser:
},
{
'range': range(1, MAX_POTS + 1),
'type': ADCInput.TYPE_POT,
'type': ADCInput.TYPE_FLEX,
'suffix': 'POT{}',
'name': 'P{}',
},
{
'range': range(1, MAX_SLIDERS + 1),
'type': ADCInput.TYPE_POT,
'type': ADCInput.TYPE_FLEX,
'suffix': 'SLIDER{}',
'name': 'SL{}',
},
{
'range': range(1, MAX_EXTS + 1),
'type': ADCInput.TYPE_POT,
'type': ADCInput.TYPE_FLEX,
'suffix': 'EXT{}',
'name': 'EXT{}',
},
{
'range': range(1, 2 + 1),
'type': 'AXIS',
'type': ADCInput.TYPE_FLEX,
'suffix': 'MOUSE{}',
'name': MouseName(),
},
@@ -232,10 +232,10 @@ class ADCInputParser:
d = self.dirs[idx]
if d < 0:
adc_input.inverted = True
if adc_input.type == 'POT':
if adc_input.type == 'FLEX':
input_labels = self.labels[adc_input.name]
adc_input.label = input_labels['label']
adc_input.short_label = input_labels['short_label']
adc_input.label = input_labels.get('label')
adc_input.short_label = input_labels.get('short_label')
cfg = pot_cfg_by_target(self.target,adc_input.name)
if cfg:
adc_input.default = cfg.get('default')
+10 -20
View File
@@ -12,25 +12,16 @@ static const etx_hal_adc_input_t _main_inputs[] = {
{% endfor %}
};
{% set pot_offset = n_mains %}
{% set pot_inputs = adc_inputs.inputs | selectattr('type', '==', 'POT') | list %}
{% set n_pots = pot_inputs | count %}
static const etx_hal_adc_input_t _pot_inputs[] = {
{% for input in pot_inputs %}
{% set flex_offset = n_mains %}
{% set flex_inputs = adc_inputs.inputs | selectattr('type', '==', 'FLEX') | list %}
{% set n_flex = flex_inputs | count %}
static etx_hal_adc_input_t _flex_inputs[] = {
{% for input in flex_inputs %}
{ "{{ input.name }}", "{{ input.label }}", "{{ input.short_label }}" },
{% endfor %}
};
{% set axis_offset = pot_offset + n_pots %}
{% set axis_inputs = adc_inputs.inputs | selectattr('type', '==', 'AXIS') | list %}
{% set n_axis = axis_inputs | count %}
static const etx_hal_adc_input_t _axis_inputs[] = {
{% for input in axis_inputs %}
{ "{{ input.name }}", "{{ input.label }}", nullptr },
{% endfor %}
};
{% set vbat_offset = axis_offset + n_axis %}
{% set vbat_offset = flex_offset + n_flex %}
{% set vbat_inputs = adc_inputs.inputs | selectattr('type', '==', 'VBAT') | list %}
{% set n_vbat = vbat_inputs | count %}
static const etx_hal_adc_input_t _vbat_inputs[] = {
@@ -51,17 +42,16 @@ static const etx_hal_adc_input_t _rtc_bat_inputs[] = {
{% set n_inputs = rtc_bat_offset + n_rtc_bat %}
static const etx_hal_adc_inputs_t _hal_inputs[] = {
{ {{ n_mains }}, 0, _main_inputs },
{ {{ n_pots }}, {{ pot_offset }}, _pot_inputs },
{ {{ n_axis }}, {{ axis_offset }}, _axis_inputs },
{ {{ n_flex }}, {{ flex_offset }}, _flex_inputs },
{ {{ n_vbat }}, {{ vbat_offset }}, _vbat_inputs },
{ {{ n_rtc_bat }}, {{ rtc_bat_offset }}, _rtc_bat_inputs },
{ {{ n_inputs }}, 0, nullptr },
};
constexpr potconfig_t _pot_default_config = (0)
{% for pot in pot_inputs %}
{% if pot.default %}
| (POT_{{ pot.default }} << ({{ loop.index0 }} * POT_CFG_BITS))
{% for flex in flex_inputs %}
{% if flex.default %}
| ((potconfig_t)FLEX_{{ flex.default }} << ({{ loop.index0 }} * POT_CFG_BITS))
{% endif %}
{% endfor %}
;
+4
View File
@@ -148,11 +148,15 @@ LEGACY_NAMES = [
"JSx": {
"yaml": "MOUSE1",
"lua": "jsx",
"label": "JSx",
"short_label": "X",
"description": "Joystick X"
},
"JSy": {
"yaml": "MOUSE2",
"lua": "jsy",
"label": "JSy",
"short_label": "Y",
"description": "Joystick Y"
}
}
+88 -86
View File
@@ -2,144 +2,146 @@
POT_CONFIG = {
"boxer": {
"P1": {"default": "WITH_DETENT"},
"P2": {"default": "WITH_DETENT"},
"P3": {"default": "MULTIPOS_SWITCH"}
"P1": {"default": "POT_CENTER"},
"P2": {"default": "POT_CENTER"},
"P3": {"default": "MULTIPOS"}
},
"el18": {
"P1": { "default": "WITHOUT_DETENT"},
"P2": { "default": "WITHOUT_DETENT"}
"P1": {"default": "POT_CENTER"},
"P2": {"default": "POT_CENTER"}
},
"nv14": {
"P1": { "default": "WITHOUT_DETENT"},
"P2": { "default": "WITHOUT_DETENT"}
"P1": {"default": "POT_CENTER"},
"P2": {"default": "POT_CENTER"}
},
"tpro": {
"P1": {"default": "WITH_DETENT"},
"P2": {"default": "WITH_DETENT"}
"P1": {"default": "POT_CENTER"},
"P2": {"default": "POT_CENTER"}
},
"tprov2": {
"P1": {"default": "WITH_DETENT"},
"P2": {"default": "WITH_DETENT"}
"P1": {"default": "POT_CENTER"},
"P2": {"default": "POT_CENTER"}
},
"t20": {
"P1": {"default": "WITH_DETENT"},
"P2": {"default": "WITH_DETENT"},
"SL1": {"default": "SLIDER_WITH_DETENT"},
"SL2": {"default": "SLIDER_WITH_DETENT"},
"SL3": {"default": "SLIDER_WITH_DETENT"},
"SL4": {"default": "SLIDER_WITH_DETENT"},
"P1": {"default": "POT_CENTER"},
"P2": {"default": "POT_CENTER"},
"SL1": {"default": "SLIDER"},
"SL2": {"default": "SLIDER"},
"SL3": {"default": "SLIDER"},
"SL4": {"default": "SLIDER"},
},
"t12": {
"P1": {"default": "WITHOUT_DETENT"},
"P2": {"default": "WITHOUT_DETENT"}
"P1": {"default": "POT"},
"P2": {"default": "POT"}
},
"tx12": {
"P1": {"default": "WITH_DETENT"},
"P2": {"default": "WITH_DETENT"}
"P1": {"default": "POT_CENTER"},
"P2": {"default": "POT_CENTER"}
},
"tx12mk2": {
"P1": {"default": "WITH_DETENT"},
"P2": {"default": "WITH_DETENT"}
"P1": {"default": "POT_CENTER"},
"P2": {"default": "POT_CENTER"}
},
"t16": {
"P1": {"default": "WITH_DETENT"},
"P2": {"default": "MULTIPOS_SWITCH"},
"P3": {"default": "WITH_DETENT"},
"SL1": {"default": "SLIDER_WITH_DETENT"},
"SL2": {"default": "SLIDER_WITH_DETENT"}
"P1": {"default": "POT_CENTER"},
"P2": {"default": "MULTIPOS"},
"P3": {"default": "POT_CENTER"},
"SL1": {"default": "SLIDER"},
"SL2": {"default": "SLIDER"}
},
"t18": {
"P1": {"default": "WITH_DETENT"},
"P2": {"default": "MULTIPOS_SWITCH"},
"P3": {"default": "WITH_DETENT"},
"SL1": {"default": "SLIDER_WITH_DETENT"},
"SL2": {"default": "SLIDER_WITH_DETENT"}
"P1": {"default": "POT_CENTER"},
"P2": {"default": "MULTIPOS"},
"P3": {"default": "POT_CENTER"},
"SL1": {"default": "SLIDER"},
"SL2": {"default": "SLIDER"}
},
"tx16s": {
"P1": {"default": "WITH_DETENT"},
"P2": {"default": "MULTIPOS_SWITCH"},
"P3": {"default": "WITH_DETENT"},
"SL1": {"default": "SLIDER_WITH_DETENT"},
"SL2": {"default": "SLIDER_WITH_DETENT"}
"P1": {"default": "POT_CENTER"},
"P2": {"default": "MULTIPOS"},
"P3": {"default": "POT_CENTER"},
"SL1": {"default": "SLIDER"},
"SL2": {"default": "SLIDER"}
},
"x7": {
"P1": {"default": "WITHOUT_DETENT"},
"P2": {"default": "WITH_DETENT"}
"P1": {"default": "POT"},
"P2": {"default": "POT_CENTER"}
},
"x7access": {
"P1": {"default": "WITHOUT_DETENT"},
"P2": {"default": "WITH_DETENT"}
"P1": {"default": "POT"},
"P2": {"default": "POT_CENTER"}
},
"x9d": {
"P1": {"default": "WITH_DETENT"},
"P2": {"default": "WITH_DETENT"},
"SL1": {"default": "SLIDER_WITH_DETENT"},
"SL2": {"default": "SLIDER_WITH_DETENT"}
"P1": {"default": "POT_CENTER"},
"P2": {"default": "POT_CENTER"},
"SL1": {"default": "SLIDER"},
"SL2": {"default": "SLIDER"}
},
"x9dp": {
"P1": {"default": "WITH_DETENT"},
"P2": {"default": "WITH_DETENT"},
"SL1": {"default": "SLIDER_WITH_DETENT"},
"SL2": {"default": "SLIDER_WITH_DETENT"}
"P1": {"default": "POT_CENTER"},
"P2": {"default": "POT_CENTER"},
"SL1": {"default": "SLIDER"},
"SL2": {"default": "SLIDER"}
},
"x9dp2019": {
"P1": {"default": "WITH_DETENT"},
"P2": {"default": "WITH_DETENT"},
"SL1": {"default": "SLIDER_WITH_DETENT"},
"SL2": {"default": "SLIDER_WITH_DETENT"}
"P1": {"default": "POT_CENTER"},
"P2": {"default": "POT_CENTER"},
"SL1": {"default": "SLIDER"},
"SL2": {"default": "SLIDER"}
},
"x9e": {
"P1": {"default": "WITH_DETENT"},
"P2": {"default": "WITH_DETENT"},
"SL1": {"default": "SLIDER_WITH_DETENT"},
"SL2": {"default": "SLIDER_WITH_DETENT"},
"SL3": {"default": "SLIDER_WITH_DETENT"},
"SL4": {"default": "SLIDER_WITH_DETENT"}
"P1": {"default": "POT_CENTER"},
"P2": {"default": "POT_CENTER"},
"SL1": {"default": "SLIDER"},
"SL2": {"default": "SLIDER"},
"SL3": {"default": "SLIDER"},
"SL4": {"default": "SLIDER"}
},
"x10": {
"P1": {"default": "WITHOUT_DETENT"},
"P2": {"default": "MULTIPOS_SWITCH"},
"P3": {"default": "WITH_DETENT"},
"SL1": {"default": "SLIDER_WITH_DETENT"},
"SL2": {"default": "SLIDER_WITH_DETENT"}
"P1": {"default": "POT"},
"P2": {"default": "MULTIPOS"},
"P3": {"default": "POT_CENTER"},
"SL1": {"default": "SLIDER"},
"SL2": {"default": "SLIDER"}
},
"x10express": {
"P1": {"default": "WITHOUT_DETENT"},
"P2": {"default": "MULTIPOS_SWITCH"},
"P3": {"default": "WITH_DETENT"},
"SL1": {"default": "SLIDER_WITH_DETENT"},
"SL2": {"default": "SLIDER_WITH_DETENT"}
"P1": {"default": "POT"},
"P2": {"default": "MULTIPOS"},
"P3": {"default": "POT_CENTER"},
"SL1": {"default": "SLIDER"},
"SL2": {"default": "SLIDER"}
},
"x12s": {
"P1": {"default": "WITHOUT_DETENT"},
"P2": {"default": "MULTIPOS_SWITCH"},
"P3": {"default": "WITH_DETENT"},
"SL1": {"default": "SLIDER_WITH_DETENT"},
"SL2": {"default": "SLIDER_WITH_DETENT"},
"SL3": {"default": "SLIDER_WITH_DETENT"},
"SL4": {"default": "SLIDER_WITH_DETENT"}
"P1": {"default": "POT"},
"P2": {"default": "MULTIPOS"},
"P3": {"default": "POT_CENTER"},
"SL1": {"default": "SLIDER"},
"SL2": {"default": "SLIDER"},
"SL3": {"default": "SLIDER"},
"SL4": {"default": "SLIDER"},
"JSx": {"default": "AXIS_X"},
"JSy": {"default": "AXIS_Y"}
},
"xlite": {
"P1": {"default": "WITHOUT_DETENT"},
"P2": {"default": "WITHOUT_DETENT"}
"P1": {"default": "POT"},
"P2": {"default": "POT"}
},
"xlites": {
"P1": {"default": "WITHOUT_DETENT"},
"P2": {"default": "WITHOUT_DETENT"}
"P1": {"default": "POT"},
"P2": {"default": "POT"}
},
"x9lite": {
"P1": {"default": "WITH_DETENT"},
"P1": {"default": "POT_CENTER"},
},
"x9lites": {
"P1": {"default": "WITH_DETENT"},
"P1": {"default": "POT_CENTER"},
},
"zorro": {
"P1": {"default": "WITHOUT_DETENT"},
"P2": {"default": "WITHOUT_DETENT"}
"P1": {"default": "POT"},
"P2": {"default": "POT"}
},
"pocket": {
"P1": { "default": "WITHOUT_DETENT" }
"P1": {"default": "POT"}
},
}
+1 -1
View File
@@ -1,7 +1,7 @@
{% set regular_switches = switches | selectattr('type','!=','FSWITCH') | list %}
{% set function_switches = switches | selectattr('type','==','FSWITCH') | list %}
const hw_switch_def _hw_switch_defs[] = {
const hw_switch_def _switch_defs[] = {
{% for switch in regular_switches %}
{ "{{ switch.name }}", SWITCH_HW_{{ switch.type }} },
{% endfor %}
+7 -1
View File
@@ -41,6 +41,13 @@ static const stm32_switch_t _switch_defs[] = {
{% endfor %}
};
static const stm32_switch_t* const _switch_offsets[] = {
_switch_defs,
{% if function_switches %}
_switch_defs + {{ regular_switches | count }},
{% endif %}
};
static inline void _init_switches()
{
LL_GPIO_InitTypeDef pinInit;
@@ -56,7 +63,6 @@ static inline void _init_switches()
constexpr uint8_t n_switches = {{ regular_switches | count }};
constexpr uint8_t n_fct_switches = {{ function_switches | count }};
constexpr uint8_t n_total_switches = {{ switches | count }};
constexpr swconfig_t _switch_default_config = (swconfig_t)0
{% for sw in regular_switches %}
+2 -7
View File
@@ -4,8 +4,7 @@
//
{% set main_inputs = adc_inputs.inputs | selectattr('type', '==', 'STICK') | list %}
{% set pot_inputs = adc_inputs.inputs | selectattr('type', '==', 'POT') | list %}
{% set axis_inputs = adc_inputs.inputs | selectattr('type', '==', 'AXIS') | list %}
{% set flex_inputs = adc_inputs.inputs | selectattr('type', '==', 'FLEX') | list %}
struct legacy_input_t {
const char* legacy;
@@ -17,12 +16,8 @@ static const legacy_input_t _legacy_inputs[] = {
{% set li = legacy_inputs[input.name] %}
{ "{{ li.yaml }}", MIXSRC_FIRST_STICK + {{ loop.index0 }} },
{% endfor %}
{% for input in pot_inputs %}
{% for input in flex_inputs %}
{% set li = legacy_inputs[input.name] %}
{ "{{ li.yaml }}", MIXSRC_FIRST_POT + {{ loop.index0 }} },
{% endfor %}
{% for input in axis_inputs %}
{% set li = legacy_inputs[input.name] %}
{ "{{ li.yaml }}", MIXSRC_FIRST_AXIS + {{ loop.index0 }} },
{% endfor %}
};