diff --git a/apps/action.c b/apps/action.c index 989313f41c..7f445c8b9f 100644 --- a/apps/action.c +++ b/apps/action.c @@ -301,6 +301,6 @@ int action_get_touchpad_press(short *x, short *y) return BUTTON_REPEAT; if (short_press) return BUTTON_REL; - return BUTTON_NONE; + return BUTTON_TOUCHPAD; } #endif diff --git a/apps/gui/list.c b/apps/gui/list.c index e7de12c4a0..6f61a61992 100644 --- a/apps/gui/list.c +++ b/apps/gui/list.c @@ -918,6 +918,8 @@ unsigned gui_synclist_do_touchpad(struct gui_synclist * lists) short x,y; unsigned button = action_get_touchpad_press(&x, &y); int line; + if (button == BUTTON_NONE) + return ACTION_NONE; if (xdisplay->char_height; + line = y / gui_list->display->char_height; + if (line != gui_list->selected_item - gui_list->start_item) + gui_synclist_select_item(lists, gui_list->start_item+line); + return ACTION_REDRAW; + } /* title or statusbar is cancel */ if (global_settings.statusbar) { diff --git a/apps/keymaps/keymap-mr500.c b/apps/keymaps/keymap-mr500.c index b2444c5fad..b0d75c15bf 100755 --- a/apps/keymaps/keymap-mr500.c +++ b/apps/keymaps/keymap-mr500.c @@ -86,6 +86,12 @@ static const struct button_mapping button_context_listtree_scroll_without_combo[ }; static const struct button_mapping button_context_settings[] = { + { ACTION_SETTINGS_INC, BUTTON_RC_VOL_UP, BUTTON_NONE }, + { ACTION_SETTINGS_INCREPEAT, BUTTON_RC_VOL_UP|BUTTON_REPEAT, BUTTON_NONE }, + { ACTION_SETTINGS_DEC, BUTTON_RC_VOL_DOWN, BUTTON_NONE }, + { ACTION_SETTINGS_DECREPEAT, BUTTON_RC_VOL_DOWN|BUTTON_REPEAT, BUTTON_NONE }, + { ACTION_STD_OK, BUTTON_RC_HEART, BUTTON_NONE }, + { ACTION_STD_CANCEL, BUTTON_RC_MODE, BUTTON_NONE }, LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD) }; /* button_context_settings */ diff --git a/firmware/target/arm/tms320dm320/mrobe-500/powermgmt-mr500.c b/firmware/target/arm/tms320dm320/mrobe-500/powermgmt-mr500.c index 0f85a5b007..566a57d285 100755 --- a/firmware/target/arm/tms320dm320/mrobe-500/powermgmt-mr500.c +++ b/firmware/target/arm/tms320dm320/mrobe-500/powermgmt-mr500.c @@ -26,24 +26,24 @@ unsigned short current_voltage = 3910; const unsigned short battery_level_dangerous[BATTERY_TYPES_COUNT] = { - 3450 + 0 }; const unsigned short battery_level_shutoff[BATTERY_TYPES_COUNT] = { - 3400 + 0 }; /* voltages (millivolt) of 0%, 10%, ... 100% when charging disabled */ const unsigned short percent_to_volt_discharge[BATTERY_TYPES_COUNT][11] = { - { 3480, 3550, 3590, 3610, 3630, 3650, 3700, 3760, 3800, 3910, 3990 }, + { 100, 300, 400, 500, 600, 700, 800, 900, 1000, 1200, 1320 }, }; /* voltages (millivolt) of 0%, 10%, ... 100% when charging enabled */ const unsigned short percent_to_volt_charge[11] = { - 3480, 3550, 3590, 3610, 3630, 3650, 3700, 3760, 3800, 3910, 3990 + 100, 300, 400, 500, 600, 700, 800, 900, 1000, 1200, 1320, }; void read_battery_inputs(void) {