Skip to content

GitLab

Commit 9ca6b4eb authored by Pavel Semerad's avatar Pavel Semerad
Browse files

do not set initial values for trims mapped to config-values 

comments
parent 467e2ad4
Hide whitespace changes
Inline Side-by-side
ChangeLog
View file @ 9ca6b4eb
*0.4.0 ()
*0.4.0 (18 Jul 2011)
use steering trim when dual-ESC steering
added channel_speed for all channels, throttle channel can be applied only
for forward side
repaired setting to default values for functions of config-values mapped
to trims, this should be done only for non-config values (channel,
mix)
*0.3.2 (27 Jun 2011)
......
menu.c
View file @ 9ca6b4eb
......@@ -738,12 +738,12 @@ static void menu_loop(void) {
main_screen(item);
btnra();
menu_stop();
// don't wanted in submenus, will be set back in main_screen()
menu_wants_adc = 0;
}
else menu_check_keys = 0;
// don't wanted in submenus, will be set back in main_screen()
menu_wants_adc = 0;
// Enter long key - global/calibrate/key-test
if (btnl(BTN_ENTER)) {
if (adc_steering_ovs > (CALIB_ST_MID_HIGH << ADC_OVS_SHIFT))
......@@ -794,7 +794,7 @@ void menu_init(void) {
menu_calibrate();
apply_global_config();
// read model config from eeprom, but now awake CALC yet
// read model config from eeprom, but not awake CALC yet
menu_load_model();
// and main loop
......
menu_key.c
View file @ 9ca6b4eb
......@@ -92,6 +92,7 @@ static u8 km_trim(u8 trim_id, u8 val_id, u8 action) {
btn = etm->buttons;
btn = (u8)menu_change_val(btn, 0, TRIM_BUTTONS_SIZE - idx,
1, 1);
// skip MOMentary for list functions
if (btn == ETB_MOMENTARY &&
menu_et_function_is_list(etm->function)) {
if (etm->buttons < ETB_MOMENTARY) btn++;
......
menu_popup.c
View file @ 9ca6b4eb
......@@ -102,6 +102,7 @@ typedef struct {
#define EF_LEFT 0b00000010
#define EF_PERCENT 0b00000100
#define EF_LIST 0b00001000
#define EF_NOCONFIG 0b00100000
#define EF_NOCHANNEL 0b01000000
#define EF_BLINK 0b10000000
......@@ -156,7 +157,7 @@ static const et_functions_s et_functions[] = {
-EXPO_MAX, EXPO_MAX, 0, EXPO_FAST, NULL, NULL, NULL },
{ 12, "EXB", LM_EXP, EF_PERCENT | EF_RIGHT, 2, &cm.expo_back,
-EXPO_MAX, EXPO_MAX, 0, EXPO_FAST, NULL, NULL, NULL },
{ 13, "CH3", 0, EF_NONE, 3, &menu_channel3, -100, 100, 0, CHANNEL_FAST,
{ 13, "CH3", 0, EF_NOCONFIG, 3, &menu_channel3, -100, 100, 0, CHANNEL_FAST,
NULL, NULL, NULL },
{ 19, "ST1", LM_TRIM, EF_BLINK, 1, &cm.subtrim[0], -SUBTRIM_MAX,
SUBTRIM_MAX, 0, SUBTRIM_FAST, NULL, NULL, NULL },
......@@ -173,35 +174,35 @@ static const et_functions_s et_functions[] = {
{ 30, "CS3", LM_DR, EF_BLINK | EF_RIGHT | EF_PERCENT, 1, &cm.speed[2],
1, 100, 100, SPEED_FAST, NULL, NULL, NULL },
#if MAX_CHANNELS >= 4
{ 14, "CH4", 0, EF_NONE, 4, &menu_channel4, -100, 100, 0, CHANNEL_FAST,
{ 14, "CH4", 0, EF_NOCONFIG, 4, &menu_channel4, -100, 100, 0, CHANNEL_FAST,
NULL, NULL, NULL },
{ 22, "ST4", LM_TRIM, EF_BLINK, 4, &cm.subtrim[3], -SUBTRIM_MAX,
SUBTRIM_MAX, 0, SUBTRIM_FAST, NULL, NULL, NULL },
{ 31, "CS4", LM_DR, EF_BLINK | EF_RIGHT | EF_PERCENT, 1, &cm.speed[3],
1, 100, 100, SPEED_FAST, NULL, NULL, NULL },
#if MAX_CHANNELS >= 5
{ 15, "CH5", 0, EF_NONE, 5, &menu_channel5, -100, 100, 0, CHANNEL_FAST,
{ 15, "CH5", 0, EF_NOCONFIG, 5, &menu_channel5, -100, 100, 0, CHANNEL_FAST,
NULL, NULL, NULL },
{ 23, "ST5", LM_TRIM, EF_BLINK, 5, &cm.subtrim[4], -SUBTRIM_MAX,
SUBTRIM_MAX, 0, SUBTRIM_FAST, NULL, NULL, NULL },
{ 32, "CS5", LM_DR, EF_BLINK | EF_RIGHT | EF_PERCENT, 1, &cm.speed[4],
1, 100, 100, SPEED_FAST, NULL, NULL, NULL },
#if MAX_CHANNELS >= 6
{ 16, "CH6", 0, EF_NONE, 6, &menu_channel6, -100, 100, 0, CHANNEL_FAST,
{ 16, "CH6", 0, EF_NOCONFIG, 6, &menu_channel6, -100, 100, 0, CHANNEL_FAST,
NULL, NULL, NULL },
{ 24, "ST6", LM_TRIM, EF_BLINK, 6, &cm.subtrim[5], -SUBTRIM_MAX,
SUBTRIM_MAX, 0, SUBTRIM_FAST, NULL, NULL, NULL },
{ 33, "CS6", LM_DR, EF_BLINK | EF_RIGHT | EF_PERCENT, 1, &cm.speed[5],
1, 100, 100, SPEED_FAST, NULL, NULL, NULL },
#if MAX_CHANNELS >= 7
{ 17, "CH7", 0, EF_NONE, 7, &menu_channel7, -100, 100, 0, CHANNEL_FAST,
{ 17, "CH7", 0, EF_NOCONFIG, 7, &menu_channel7, -100, 100, 0, CHANNEL_FAST,
NULL, NULL, NULL },
{ 25, "ST7", LM_TRIM, EF_BLINK, 7, &cm.subtrim[6], -SUBTRIM_MAX,
SUBTRIM_MAX, 0, SUBTRIM_FAST, NULL, NULL, NULL },
{ 34, "CS7", LM_DR, EF_BLINK | EF_RIGHT | EF_PERCENT, 1, &cm.speed[6],
1, 100, 100, SPEED_FAST, NULL, NULL, NULL },
#if MAX_CHANNELS >= 8
{ 18, "CH8", 0, EF_NONE, 8, &menu_channel8, -100, 100, 0, CHANNEL_FAST,
{ 18, "CH8", 0, EF_NOCONFIG, 8, &menu_channel8, -100, 100, 0, CHANNEL_FAST,
NULL, NULL, NULL },
{ 26, "ST8", LM_TRIM, EF_BLINK, 8, &cm.subtrim[7], -SUBTRIM_MAX,
SUBTRIM_MAX, 0, SUBTRIM_FAST, NULL, NULL, NULL },
......@@ -212,11 +213,11 @@ static const et_functions_s et_functions[] = {
#endif
#endif
#endif
{ 36, "4WS", LM_EPO, EF_BLINK | EF_PERCENT | EF_NOCHANNEL, 4,
&menu_4WS_mix, -100, 100, 0, MIX_FAST, NULL, NULL, NULL },
{ 37, "DIG", LM_EPO, EF_BLINK | EF_PERCENT | EF_NOCHANNEL, L7_D,
&menu_DIG_mix, -100, 100, 0, MIX_FAST, NULL, NULL, NULL },
{ 38, "MPO", 0, EF_LIST, 0, &menu_MP_index,
{ 36, "4WS", LM_EPO, EF_BLINK | EF_PERCENT | EF_NOCHANNEL | EF_NOCONFIG,
4, &menu_4WS_mix, -100, 100, 0, MIX_FAST, NULL, NULL, NULL },
{ 37, "DIG", LM_EPO, EF_BLINK | EF_PERCENT | EF_NOCHANNEL | EF_NOCONFIG,
L7_D, &menu_DIG_mix, -100, 100, 0, MIX_FAST, NULL, NULL, NULL },
{ 38, "MPO", 0, EF_LIST | EF_NOCONFIG, 0, &menu_MP_index,
0, NUM_MULTI_POSITION - 1, 0, 1, set_MP, show_MP, NULL },
};
#define ET_FUNCTIONS_SIZE (sizeof(et_functions) / sizeof(et_functions_s))
......@@ -235,12 +236,12 @@ s8 menu_et_function_idx(u8 n) {
return et_functions[n].idx;
}
// return if given function has special long-press handling
// return 1 if given function has special long-press handling
u8 menu_et_function_long_special(u8 n) {
return (u8)(et_functions[n].long_func ? 1 : 0);
}
// return if given function has special long-press handling
// return 1 if given function switches list of items
u8 menu_et_function_is_list(u8 n) {
return (u8)(et_functions[n].flags & EF_LIST);
}
......@@ -387,8 +388,11 @@ static u8 menu_popup_et(u8 trim_id) {
// if button is not initialized, do it
if (*mbs == MBS_INITIALIZE) {
val = etf->reset;
AVAL(val);
// set value to default only for non-config values (mixes, channels...)
if (etf->flags & EF_NOCONFIG) {
val = etf->reset;
AVAL(val);
}
*mbs = MBS_RELEASED;
}
......@@ -563,7 +567,7 @@ static const u16 key_buttons[] = {
// functions assignable to trims
// functions assignable to keys
typedef struct {
u8 idx; // will be showed sorted by this
u8 *name; // showed identification
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment