Squashed 'gpio_reader_a/' changes from c350d505d..84da1bad6

84da1bad6 fixing some big bugs
d0678852d rename
REVERT: c350d505d Update README.md
REVERT: 5f4b9d4d7 Add files via upload
REVERT: 1e42588ed Initial commit

git-subtree-dir: gpio_reader_a
git-subtree-split: 84da1bad6ae58077c5eb3f0e79249532ea89166b

GPIO_reader.c

@@ -1,129 +1,152 @@
-#include <furi.h>
-#include <gui/gui.h>
-#include <input/input.h>
-#include <stdlib.h>
-#include "GPIO_reader_item.h"
-
-typedef enum {
-    EventTypeTick,
-    EventTypeKey,
-} EventType;
-
-typedef struct {
-    EventType type;
-    InputEvent input;
-} PluginEvent;
-
-typedef struct {
-    int pin;
-    int pullMode;
-} PluginState;
-
-
-static void render_callback(Canvas* const canvas, void* ctx) {
-    const PluginState* plugin_state = acquire_mutex((ValueMutex*)ctx, 25);
-    
-    canvas_set_font(canvas, FontPrimary);
-    canvas_draw_str_aligned(canvas, canvas_width(canvas) / 2, canvas_height(canvas) / 10, AlignCenter, AlignCenter, "GPIO reader");
-
-    canvas_set_font(canvas, FontSecondary);
-    canvas_draw_str_aligned(canvas, canvas_width(canvas) / 2, canvas_height(canvas) / 10 * 3, AlignCenter, AlignCenter,
-                                gpio_item_get_pin_name(plugin_state->pin));
-
-    canvas_draw_str_aligned(canvas, canvas_width(canvas) / 2, canvas_height(canvas) / 10 * 5, AlignCenter, AlignCenter,
-                                gpio_item_get_pull_mode(plugin_state->pullMode));
-
-    canvas_set_font(canvas, FontPrimary);
-    canvas_draw_str_aligned(canvas, canvas_width(canvas) / 2, canvas_height(canvas) / 10 * 8, AlignCenter, AlignCenter,
-                                gpio_item_get_pin_level(plugin_state->pin));
-
-    release_mutex((ValueMutex*)ctx, plugin_state);
-}
-
-static void input_callback(InputEvent* input_event, FuriMessageQueue* event_queue) {
-    furi_assert(event_queue); 
-
-    PluginEvent event = {.type = EventTypeKey, .input = *input_event};
-    furi_message_queue_put(event_queue, &event, FuriWaitForever);
-}
-
-static void GPIO_reader_state_init(PluginState* const plugin_state) {
-    plugin_state->pin = 0;
-    plugin_state->pullMode = 0;
-    gpio_item_configure_pin(plugin_state->pin, plugin_state->pullMode);
-} 
-
-int32_t GPIO_reader_app(void* p) {
-    UNUSED(p);
-    FuriMessageQueue* event_queue = furi_message_queue_alloc(8, sizeof(PluginEvent));
-    
-    PluginState* plugin_state = malloc(sizeof(PluginState));
-    GPIO_reader_state_init(plugin_state);
-    ValueMutex state_mutex; 
-    if (!init_mutex(&state_mutex, plugin_state, sizeof(PluginState))) {
-        FURI_LOG_E("GPIO_reader", "cannot create mutex\r\n");
-        free(plugin_state); 
-        return 255;
-    }
-
-    // Set system callbacks
-    ViewPort* view_port = view_port_alloc(); 
-    view_port_draw_callback_set(view_port, render_callback, &state_mutex);
-    view_port_input_callback_set(view_port, input_callback, event_queue);
- 
-    // Open GUI and register view_port
-    Gui* gui = furi_record_open("gui"); 
-    gui_add_view_port(gui, view_port, GuiLayerFullscreen); 
-
-   
-    PluginEvent event; 
-    for(bool processing = true; processing;) { 
-        FuriStatus event_status = furi_message_queue_get(event_queue, &event, 100);
-        PluginState* plugin_state = (PluginState*)acquire_mutex_block(&state_mutex);
-
-        if(event_status == FuriStatusOk) {
-            // press events
-            if(event.type == EventTypeKey) {
-                if(event.input.type == InputTypePress || event.input.type == InputTypeRepeat) {
-                    switch(event.input.key) {
-                    case InputKeyRight: 
-                            plugin_state->pin = (plugin_state->pin + 1) % GPIO_ITEM_COUNT;
-                            gpio_item_configure_pin(plugin_state->pin, plugin_state->pullMode);
-                        break; 
-                    case InputKeyLeft:  
-                            plugin_state->pin = (plugin_state->pin - 1 + GPIO_ITEM_COUNT) % GPIO_ITEM_COUNT;
-                            gpio_item_configure_pin(plugin_state->pin, plugin_state->pullMode);
-                        break; 
-                    case InputKeyUp:
-                            plugin_state->pullMode = (plugin_state->pullMode + 1) % GPIO_PULL_COUNT;
-                            gpio_item_configure_pin(plugin_state->pin, plugin_state->pullMode);
-                        break;
-                    case InputKeyDown:
-                            plugin_state->pullMode = (plugin_state->pullMode - 1 + GPIO_PULL_COUNT) % GPIO_PULL_COUNT;
-                            gpio_item_configure_pin(plugin_state->pin, plugin_state->pullMode);
-                        break;
-                    case InputKeyBack: 
-                        processing = false;
-                        break;
-                    default:
-                        break;
-                    }
-                }
-            } 
-        } else {
-            FURI_LOG_D("GPIO_reader", "FuriMessageQueue: event timeout");
-            // event timeout
-        }
-
-        view_port_update(view_port);
-        release_mutex(&state_mutex, plugin_state);
-    }
-
-    view_port_enabled_set(view_port, false);
-    gui_remove_view_port(gui, view_port);
-    furi_record_close("gui");
-    view_port_free(view_port);
-    furi_message_queue_free(event_queue);
-
-    return 0;
+#include <furi.h>
+#include <gui/gui.h>
+#include <input/input.h>
+#include <stdlib.h>
+#include "GPIO_reader_item.h"
+
+typedef enum {
+    EventTypeTick,
+    EventTypeKey,
+} EventType;
+
+typedef struct {
+    EventType type;
+    InputEvent input;
+} PluginEvent;
+
+typedef struct {
+    int pin;
+    int pullMode;
+    FuriMutex* mutex;
+} PluginState;
+
+static void render_callback(Canvas* const canvas, void* ctx) {
+    furi_assert(ctx);
+    const PluginState* plugin_state = ctx;
+    furi_mutex_acquire(plugin_state->mutex, FuriWaitForever);
+
+    canvas_set_font(canvas, FontPrimary);
+    canvas_draw_str_aligned(
+        canvas,
+        canvas_width(canvas) / 2,
+        canvas_height(canvas) / 10,
+        AlignCenter,
+        AlignCenter,
+        "GPIO reader");
+
+    canvas_set_font(canvas, FontSecondary);
+    canvas_draw_str_aligned(
+        canvas,
+        canvas_width(canvas) / 2,
+        canvas_height(canvas) / 10 * 3,
+        AlignCenter,
+        AlignCenter,
+        gpio_item_get_pin_name(plugin_state->pin));
+
+    canvas_draw_str_aligned(
+        canvas,
+        canvas_width(canvas) / 2,
+        canvas_height(canvas) / 10 * 5,
+        AlignCenter,
+        AlignCenter,
+        gpio_item_get_pull_mode(plugin_state->pullMode));
+
+    canvas_set_font(canvas, FontPrimary);
+    canvas_draw_str_aligned(
+        canvas,
+        canvas_width(canvas) / 2,
+        canvas_height(canvas) / 10 * 8,
+        AlignCenter,
+        AlignCenter,
+        gpio_item_get_pin_level(plugin_state->pin));
+
+    furi_mutex_release(plugin_state->mutex);
+}
+
+static void input_callback(InputEvent* input_event, FuriMessageQueue* event_queue) {
+    furi_assert(event_queue);
+
+    PluginEvent event = {.type = EventTypeKey, .input = *input_event};
+    furi_message_queue_put(event_queue, &event, FuriWaitForever);
+}
+
+static void GPIO_reader_state_init(PluginState* const plugin_state) {
+    plugin_state->pin = 0;
+    plugin_state->pullMode = 0;
+    gpio_item_configure_pin(plugin_state->pin, plugin_state->pullMode);
+}
+
+int32_t GPIO_reader_app(void* p) {
+    UNUSED(p);
+    FuriMessageQueue* event_queue = furi_message_queue_alloc(8, sizeof(PluginEvent));
+
+    PluginState* plugin_state = malloc(sizeof(PluginState));
+    GPIO_reader_state_init(plugin_state);
+    plugin_state->mutex = furi_mutex_alloc(FuriMutexTypeNormal);
+    if(!plugin_state->mutex) {
+        FURI_LOG_E("GPIO_reader", "cannot create mutex\r\n");
+        free(plugin_state);
+        return 255;
+    }
+
+    // Set system callbacks
+    ViewPort* view_port = view_port_alloc();
+    view_port_draw_callback_set(view_port, render_callback, plugin_state);
+    view_port_input_callback_set(view_port, input_callback, event_queue);
+
+    // Open GUI and register view_port
+    Gui* gui = furi_record_open("gui");
+    gui_add_view_port(gui, view_port, GuiLayerFullscreen);
+
+    PluginEvent event;
+    for(bool processing = true; processing;) {
+        FuriStatus event_status = furi_message_queue_get(event_queue, &event, 100);
+        furi_mutex_acquire(plugin_state->mutex, FuriWaitForever);
+
+        if(event_status == FuriStatusOk) {
+            // press events
+            if(event.type == EventTypeKey) {
+                if(event.input.type == InputTypePress || event.input.type == InputTypeRepeat) {
+                    switch(event.input.key) {
+                    case InputKeyRight:
+                        plugin_state->pin = (plugin_state->pin + 1) % GPIO_ITEM_COUNT;
+                        gpio_item_configure_pin(plugin_state->pin, plugin_state->pullMode);
+                        break;
+                    case InputKeyLeft:
+                        plugin_state->pin =
+                            (plugin_state->pin - 1 + GPIO_ITEM_COUNT) % GPIO_ITEM_COUNT;
+                        gpio_item_configure_pin(plugin_state->pin, plugin_state->pullMode);
+                        break;
+                    case InputKeyUp:
+                        plugin_state->pullMode = (plugin_state->pullMode + 1) % GPIO_PULL_COUNT;
+                        gpio_item_configure_pin(plugin_state->pin, plugin_state->pullMode);
+                        break;
+                    case InputKeyDown:
+                        plugin_state->pullMode =
+                            (plugin_state->pullMode - 1 + GPIO_PULL_COUNT) % GPIO_PULL_COUNT;
+                        gpio_item_configure_pin(plugin_state->pin, plugin_state->pullMode);
+                        break;
+                    case InputKeyBack:
+                        processing = false;
+                        break;
+                    default:
+                        break;
+                    }
+                }
+            }
+        }
+
+        furi_mutex_release(plugin_state->mutex);
+        view_port_update(view_port);
+    }
+
+    view_port_enabled_set(view_port, false);
+    gui_remove_view_port(gui, view_port);
+    furi_record_close("gui");
+    view_port_free(view_port);
+    furi_mutex_free(plugin_state->mutex);
+    furi_message_queue_free(event_queue);
+    free(plugin_state);
+
+    return 0;
 }

GPIO_reader_item.c

@@ -1,26 +1,27 @@
-#include "GPIO_reader_item.h"
-
-const char* gpio_item_get_pin_name(uint8_t index) {
-    furi_assert(index < GPIO_ITEM_COUNT);
-    return gpio_item[index].name;
-}
-
-const char* gpio_item_get_pull_mode(uint8_t pull_mode) {
-    furi_assert(pull_mode < GPIO_PULL_COUNT);
-    return gpio_pull_mode[pull_mode].name;
-}
-
-const char* gpio_item_get_pin_level(uint8_t index) {
-    furi_assert(index < GPIO_ITEM_COUNT);
-    //furi_hal_gpio_write(gpio_item[index].pin, level);
-    if (furi_hal_gpio_read(gpio_item[index].pin)){
-        return "High";
-    }else{
-        return "Low";
-    }
-}
-
-void gpio_item_configure_pin(uint8_t index, uint8_t pull_mode) {
-    furi_assert(index < GPIO_ITEM_COUNT);
-    furi_hal_gpio_init(gpio_item[index].pin, GpioModeInput, gpio_pull_mode[pull_mode].pull, GpioSpeedVeryHigh);
+#include "GPIO_reader_item.h"
+
+const char* gpio_item_get_pin_name(uint8_t index) {
+    furi_assert(index < GPIO_ITEM_COUNT);
+    return gpio_item[index].name;
+}
+
+const char* gpio_item_get_pull_mode(uint8_t pull_mode) {
+    furi_assert(pull_mode < GPIO_PULL_COUNT);
+    return gpio_pull_mode[pull_mode].name;
+}
+
+const char* gpio_item_get_pin_level(uint8_t index) {
+    furi_assert(index < GPIO_ITEM_COUNT);
+    //furi_hal_gpio_write(gpio_item[index].pin, level);
+    if(furi_hal_gpio_read(gpio_item[index].pin)) {
+        return "High";
+    } else {
+        return "Low";
+    }
+}
+
+void gpio_item_configure_pin(uint8_t index, uint8_t pull_mode) {
+    furi_assert(index < GPIO_ITEM_COUNT);
+    furi_hal_gpio_init(
+        gpio_item[index].pin, GpioModeInput, gpio_pull_mode[pull_mode].pull, GpioSpeedVeryHigh);
 }

GPIO_reader_item.h

@@ -1,42 +1,42 @@
-#ifndef GPIO_READER_ITEM
-#define GPIO_READER_ITEM
-
-#include <furi.h>
-#include <furi_hal_resources.h>
-
-#define GPIO_ITEM_COUNT 8
-#define GPIO_PULL_COUNT 3
-
-typedef struct {
-    const char* name;
-    const GpioPin* pin;
-} GpioItem;
-
-static const GpioItem gpio_item[GPIO_ITEM_COUNT] = {
-    {"2: PA7", &gpio_ext_pa7},
-    {"3: PA6", &gpio_ext_pa6},
-    {"4: PA4", &gpio_ext_pa4},
-    {"5: PB3", &gpio_ext_pb3},
-    {"6: PB2", &gpio_ext_pb2},
-    {"7: PC3", &gpio_ext_pc3},
-    {"15: PC1", &gpio_ext_pc1},
-    {"16: PC0", &gpio_ext_pc0},
-};
-
-typedef struct {
-    const char* name;
-    const GpioPull pull;
-} GpioPullMode;
-
-static const GpioPullMode gpio_pull_mode[3] = {
-    {"high impedence", GpioPullNo},
-    {"pull up", GpioPullUp},
-    {"pull down", GpioPullDown},
-};
-
-const char* gpio_item_get_pin_name(uint8_t index);
-const char* gpio_item_get_pin_level(uint8_t index);
-void gpio_item_configure_pin(uint8_t index, uint8_t pullMode);
-const char* gpio_item_get_pull_mode(uint8_t pull_mode);
-
+#ifndef GPIO_READER_ITEM
+#define GPIO_READER_ITEM
+
+#include <furi.h>
+#include <furi_hal_resources.h>
+
+#define GPIO_ITEM_COUNT 8
+#define GPIO_PULL_COUNT 3
+
+typedef struct {
+    const char* name;
+    const GpioPin* pin;
+} GpioItem;
+
+static const GpioItem gpio_item[GPIO_ITEM_COUNT] = {
+    {"2: PA7", &gpio_ext_pa7},
+    {"3: PA6", &gpio_ext_pa6},
+    {"4: PA4", &gpio_ext_pa4},
+    {"5: PB3", &gpio_ext_pb3},
+    {"6: PB2", &gpio_ext_pb2},
+    {"7: PC3", &gpio_ext_pc3},
+    {"15: PC1", &gpio_ext_pc1},
+    {"16: PC0", &gpio_ext_pc0},
+};
+
+typedef struct {
+    const char* name;
+    const GpioPull pull;
+} GpioPullMode;
+
+static const GpioPullMode gpio_pull_mode[3] = {
+    {"high impedence", GpioPullNo},
+    {"pull up", GpioPullUp},
+    {"pull down", GpioPullDown},
+};
+
+const char* gpio_item_get_pin_name(uint8_t index);
+const char* gpio_item_get_pin_level(uint8_t index);
+void gpio_item_configure_pin(uint8_t index, uint8_t pullMode);
+const char* gpio_item_get_pull_mode(uint8_t pull_mode);
+
 #endif

application.fam

@@ -1,11 +1,14 @@
 App(
-    appid="GPIO_reader",
-    name="GPIO reader",
+    appid="gpio_reader",
+    name="[GPIO] Reader",
     apptype=FlipperAppType.EXTERNAL,
     entry_point="GPIO_reader_app",
     requires=["gui"],
     stack_size=1 * 1024,
-    fap_category="Tools",
+    fap_category="GPIO",
     fap_icon="icon.png",
-    order=1,
-)
+    fap_author="@aureli1c",
+    fap_weburl="https://github.com/aureli1c/flipperzero_GPIO_read",
+    fap_version="1.1",
+    fap_description="Read GPIO pins states, and display them on the screen",
+)