Merge remote-tracking branch 'ul/dev' into mntm-dev

applications/settings/input_settings_app/application.fam

@@ -0,0 +1,9 @@
+App(
+    appid="input_settings",
+    name="Input",
+    apptype=FlipperAppType.SETTINGS,
+    entry_point="input_settings_app",
+    requires=["input"],
+    stack_size=1 * 1024,
+    order=100,
+)

applications/settings/input_settings_app/input_settings_app.c

@@ -0,0 +1,107 @@
+#include <stdint.h>
+#include "input_settings_app.h"
+
+#define TAG "InputSettingsApp"
+
+#define VIBRO_TOUCH_LEVEL_COUNT 10
+// vibro touch human readable levels
+const char* const vibro_touch_level_text[VIBRO_TOUCH_LEVEL_COUNT] = {
+    "OFF",
+    "1",
+    "2",
+    "3",
+    "4",
+    "5",
+    "6",
+    "7",
+    "8",
+    "9",
+};
+// vibro touch levels tick valies delay
+const uint32_t vibro_touch_level_value[VIBRO_TOUCH_LEVEL_COUNT] =
+    {0, 13, 16, 19, 21, 24, 27, 30, 33, 36};
+
+static void input_settings_vibro_touch_level_changed(VariableItem* item) {
+    uint8_t index = variable_item_get_current_value_index(item);
+    variable_item_set_current_value_text(item, vibro_touch_level_text[index]);
+
+    //change settings to selected
+    InputSettingsApp* app = variable_item_get_context(item);
+    app->settings->vibro_touch_level = vibro_touch_level_value[index];
+
+    // use RECORD for acces to input service instance and set settings
+    InputSettings* service_settings = furi_record_open(RECORD_INPUT_SETTINGS);
+    service_settings->vibro_touch_level = vibro_touch_level_value[index];
+    furi_record_close(RECORD_INPUT_SETTINGS);
+}
+
+static uint32_t input_settings_app_exit(void* context) {
+    UNUSED(context);
+    return VIEW_NONE;
+}
+
+InputSettingsApp* input_settings_app_alloc(void) {
+    InputSettingsApp* app = malloc(sizeof(InputSettingsApp));
+    app->gui = furi_record_open(RECORD_GUI);
+
+    app->settings = malloc(sizeof(InputSettings));
+    input_settings_load(app->settings);
+
+    app->variable_item_list = variable_item_list_alloc();
+    View* view = variable_item_list_get_view(app->variable_item_list);
+    view_set_previous_callback(view, input_settings_app_exit);
+
+    VariableItem* item;
+    uint8_t value_index;
+
+    item = variable_item_list_add(
+        app->variable_item_list,
+        "Buttons Vibro",
+        VIBRO_TOUCH_LEVEL_COUNT,
+        input_settings_vibro_touch_level_changed,
+        app);
+
+    value_index = value_index_uint32(
+        app->settings->vibro_touch_level, vibro_touch_level_value, VIBRO_TOUCH_LEVEL_COUNT);
+    variable_item_set_current_value_index(item, value_index);
+    variable_item_set_current_value_text(item, vibro_touch_level_text[value_index]);
+
+    // create and setup view and view dispatcher
+    app->view_dispatcher = view_dispatcher_alloc();
+    view_dispatcher_set_event_callback_context(app->view_dispatcher, app);
+    view_dispatcher_attach_to_gui(app->view_dispatcher, app->gui, ViewDispatcherTypeFullscreen);
+    view_dispatcher_add_view(app->view_dispatcher, InputSettingsViewVariableItemList, view);
+    view_dispatcher_switch_to_view(app->view_dispatcher, InputSettingsViewVariableItemList);
+
+    return app;
+}
+
+void input_settings_app_free(InputSettingsApp* app) {
+    furi_assert(app);
+
+    // Variable item list
+    view_dispatcher_remove_view(app->view_dispatcher, InputSettingsViewVariableItemList);
+    variable_item_list_free(app->variable_item_list);
+
+    // View dispatcher
+    view_dispatcher_free(app->view_dispatcher);
+
+    // Records
+    furi_record_close(RECORD_GUI);
+    free(app->settings);
+    free(app);
+}
+
+// Enter point
+int32_t input_settings_app(void* p) {
+    UNUSED(p);
+    InputSettingsApp* app = input_settings_app_alloc();
+
+    view_dispatcher_run(app->view_dispatcher);
+
+    //save current settings;
+    input_settings_save(app->settings);
+
+    input_settings_app_free(app);
+    return 0;
+}

applications/settings/input_settings_app/input_settings_app.h

@@ -0,0 +1,25 @@
+#pragma once
+
+#include <furi.h>
+#include <furi_hal.h>
+#include <gui/gui.h>
+#include <gui/view.h>
+#include <gui/view_dispatcher.h>
+#include <gui/modules/variable_item_list.h>
+#include <input/input_settings.h>
+#include <lib/toolbox/value_index.h>
+#include <furi_hal_vibro.h>
+#include <storage/storage.h>
+
+// input_settings_app stucture
+typedef struct {
+    Gui* gui;
+    ViewDispatcher* view_dispatcher;
+    VariableItemList* variable_item_list;
+    InputSettings* settings;
+} InputSettingsApp;
+
+// list of menu views for view dispatcher
+typedef enum {
+    InputSettingsViewVariableItemList,
+} InputSettingsView;

applications/settings/input_settings_app/mock_imports/mock_input_settings.c

@@ -0,0 +1,7 @@
+// Since settings app is external, it cannot access firmware functions
+// For simple utils like this, easier to include C code in app rather than exposing to API
+// Instead of copying the file, can (ab)use the preprocessor to insert the source code here
+// Then, we still use the Header from original code as if nothing happened
+
+// input_settings_load(), input_settings_save()
+#include <applications/services/input/input_settings.c>