Merge pull request #6 from tixlegeek/main

Added sensitivity to configuration following jamisonderek's work

Author: tixlegeek

401lightMessengerApp/401LightMsg_acc.c

@@ -187,6 +187,8 @@ static int32_t app_acc_worker(void* ctx) {
     // The shader updating function is the callback associated to the "color"
     color_animation_callback shader = appData->shader;
     lis2dh12_init(&app->data->lis2dh12);
+    lis2dh12_set_sensitivity(
+        &app->data->lis2dh12, lightmsg_sensitivity_value[light_msg_data->sensitivity]);
 
     while(running) {
         // Checks if the thread must be ended.

401lightMessengerApp/401LightMsg_config.c

@@ -30,6 +30,16 @@ const char* const lightmsg_brightness_text[] = {
     "Blinding",
 };
 
+const uint8_t lightmsg_sensitivity_value[] = {
+    60, // Low sensitivity
+    40, // High sensitivity
+};
+
+const char* const lightmsg_sensitivity_text[] = {
+    "Low",
+    "High",
+};
+
 const uint32_t lightmsg_colors_flat[] = {
     0xFF0000, // COLOR_RED
     0x7F0F00, // COLOR_ORANGE
@@ -248,6 +258,20 @@ void on_change_brightness(VariableItem* item) {
     variable_item_set_current_value_text(item, lightmsg_brightness_text[index]);
 }
 
+/**
+ * @brief Callback function to handle sensitivity menu
+ *
+ * @param item Selected item
+ */
+void on_change_sensitivity(VariableItem* item) {
+    AppContext* app = variable_item_get_context(item);
+    Configuration* light_msg_data = (Configuration*)app->data->config;
+    uint8_t index = variable_item_get_current_value_index(item);
+    light_msg_data->sensitivity = index;
+
+    variable_item_set_current_value_text(item, lightmsg_sensitivity_text[index]);
+}
+
 /**
  * @brief Callback function to handle color menu
  *
@@ -303,6 +327,16 @@ AppConfig* app_config_alloc(void* ctx) {
     variable_item_set_current_value_text(
         item, lightmsg_brightness_text[light_msg_data->brightness]);
 #endif
+    item = variable_item_list_add(
+        appConfig->list,
+        "Sensitivity",
+        COUNT_OF(lightmsg_sensitivity_text),
+        on_change_sensitivity,
+        app);
+    variable_item_set_current_value_index(item, light_msg_data->sensitivity); // 0,10,20,30,...
+    variable_item_set_current_value_text(
+        item, lightmsg_sensitivity_text[light_msg_data->sensitivity]);
+
     item = variable_item_list_add(
         appConfig->list, "Color", COUNT_OF(lightmsg_color_text), on_change_color, app);
     variable_item_set_current_value_index(item, light_msg_data->color); // 0,10,20,30,...

401lightMessengerApp/401LightMsg_config.h

@@ -50,6 +50,9 @@ typedef enum {
 extern const double lightmsg_brightness_value[];
 extern const char* const lightmsg_brightness_text[];
 
+extern const uint8_t lightmsg_sensitivity_value[];
+extern const char* const lightmsg_sensitivity_text[];
+
 #define COLOR_RED    0
 #define COLOR_ORANGE 1
 #define COLOR_YELLOW 2

401lightMessengerApp/401_config.c

@@ -40,6 +40,7 @@ void config_default_init(Configuration* config) {
     config->bitmapPath[LIGHTMSG_MAX_BITMAPPATH_LEN + 1] = '\0';
     config->color = LIGHTMSG_DEFAULT_COLOR; // Default color
     config->brightness = LIGHTMSG_DEFAULT_BRIGHTNESS; // Default brightness
+    config->sensitivity = LIGHTMSG_DEFAULT_SENSIBILITY; // Default sensitivity
     config->orientation = LIGHTMSG_DEFAULT_ORIENTATION; // Default orientation (e.g., false)
 }
 
@@ -79,6 +80,7 @@ l401_err config_to_json(Configuration* config, char** jsontxt) {
     // overrites brightness setting
     cJSON_AddNumberToObject(
         json, "brightness", LightMsg_BrightnessBlinding); // (double)config->brightness);
+    cJSON_AddNumberToObject(json, "sensitivity", (double)config->sensitivity);
     cJSON_AddBoolToObject(json, "orientation", config->orientation);
 
     // Convert cJSON object to string
@@ -133,11 +135,13 @@ l401_err json_to_config(char* jsontxt, Configuration* config) {
     cJSON* json_bitmapPath = cJSON_GetObjectItemCaseSensitive(json, "bitmapPath");
     cJSON* json_color = cJSON_GetObjectItemCaseSensitive(json, "color");
     cJSON* json_brightness = cJSON_GetObjectItemCaseSensitive(json, "brightness");
+    cJSON* json_sensitivity = cJSON_GetObjectItemCaseSensitive(json, "sensitivity");
     cJSON* json_orientation = cJSON_GetObjectItemCaseSensitive(json, "orientation");
 
     if(!cJSON_IsString(json_version) || !cJSON_IsString(json_text) ||
        !cJSON_IsString(json_bitmapPath) || !cJSON_IsNumber(json_color) ||
-       !cJSON_IsNumber(json_brightness) || !cJSON_IsBool(json_orientation)) {
+       !cJSON_IsNumber(json_brightness) || !cJSON_IsNumber(json_sensitivity) ||
+       !cJSON_IsBool(json_orientation)) {
         cJSON_Delete(json);
         FURI_LOG_E(TAG, "Error: Malformed configuration");
         return L401_ERR_MALFORMED;
@@ -153,6 +157,7 @@ l401_err json_to_config(char* jsontxt, Configuration* config) {
     // config->text = strdup(json_text->valuestring);
     config->color = (uint8_t)json_color->valuedouble;
     config->brightness = (uint8_t)json_brightness->valuedouble;
+    config->sensitivity = (uint8_t)json_sensitivity->valuedouble;
     config->orientation = cJSON_IsTrue(json_orientation) ? true : false;
     cJSON_Delete(json);
     return L401_OK;

401lightMessengerApp/401_config.h

@@ -14,6 +14,7 @@
 #define LIGHTMSG_VERSION             "1.0"
 #define LIGHTMSG_DEFAULT_ORIENTATION 0
 #define LIGHTMSG_DEFAULT_BRIGHTNESS  3
+#define LIGHTMSG_DEFAULT_SENSIBILITY 1
 #define LIGHTMSG_DEFAULT_COLOR       1
 #define LIGHTMSG_DEFAULT_TEXT        "Lab401"
 #define LIGHTMSG_DEFAULT_BITMAPPATH  LIGHTMSGCONF_SAVE_FOLDER
@@ -27,6 +28,7 @@ typedef struct {
     char bitmapPath[LIGHTMSG_MAX_BITMAPPATH_LEN + 1];
     uint8_t color;
     uint8_t brightness;
+    uint8_t sensitivity;
     bool orientation;
     color_animation_callback cb;
 } Configuration;

401lightMessengerApp/drivers/lis2xx12_wrapper.c

@@ -46,7 +46,8 @@ int32_t lis2dh12_init(void* stmdev) {
     lis2dh12_int1_gen_conf_set(stmdev, &int1_cfg);
 
     lis2dh12_int1_pin_notification_mode_set(stmdev, LIS2DH12_INT1_PULSED);
-    lis2dh12_int1_gen_threshold_set(stmdev, PARAM_INT1_THRESHOLD);
+    lis2dh12_int1_gen_threshold_set(
+        stmdev, PARAM_INT1_THRESHOLD); // default threshold, overwritten
     lis2dh12_int1_gen_duration_set(stmdev, PARAM_INT1_DURATION);
 
     // lis2dh12 INT2
@@ -57,12 +58,18 @@ int32_t lis2dh12_init(void* stmdev) {
     lis2dh12_int2_gen_conf_set(stmdev, &int2_cfg);
 
     lis2dh12_int2_pin_notification_mode_set(stmdev, LIS2DH12_INT2_PULSED);
-    lis2dh12_int2_gen_threshold_set(stmdev, PARAM_INT2_THRESHOLD);
+    lis2dh12_int2_gen_threshold_set(
+        stmdev, PARAM_INT2_THRESHOLD); // default threshold, overwritten
     lis2dh12_int2_gen_duration_set(stmdev, PARAM_INT2_DURATION);
 
     return 0;
 }
 
+void lis2dh12_set_sensitivity(void* stmdev, uint8_t sensitivity) {
+    lis2dh12_int1_gen_threshold_set(stmdev, sensitivity);
+    lis2dh12_int2_gen_threshold_set(stmdev, sensitivity);
+}
+
 int32_t platform_write(void* handle, uint8_t reg, const uint8_t* bufp, uint16_t len) {
     UNUSED(handle);
     furi_hal_i2c_acquire(I2C_BUS);

401lightMessengerApp/drivers/lis2xx12_wrapper.h

@@ -23,6 +23,7 @@
         ((byte) & 0x02 ? '1' : '0'), ((byte) & 0x01 ? '1' : '0')
 
 int32_t lis2dh12_init(void* stmdev);
+void lis2dh12_set_sensitivity(void* stmdev, uint8_t sensitivity);
 int32_t platform_write(void* handle, uint8_t reg, const uint8_t* bufp, uint16_t len);
 int32_t platform_read(void* handle, uint8_t reg, uint8_t* bufp, uint16_t len);