[FL-1254] ViewDispatcher improvements, SubGhz cli and certification preparation (#482)

* Add more more frequencees and change ok key bahavior to toggle
* GUI: add queue support to ViewDispatcher
* SubGhz: basic cli
* SubGHz: pt send cli
* SubGhz: carrier cli commands.
* Fix irda test data merge artifacts

applications/gui/view_dispatcher.c

@@ -1,5 +1,4 @@
 #include "view_dispatcher_i.h"
-#include "gui_i.h"
 
 ViewDispatcher* view_dispatcher_alloc() {
     ViewDispatcher* view_dispatcher = furi_alloc(sizeof(ViewDispatcher));
@@ -36,6 +35,34 @@ void view_dispatcher_free(ViewDispatcher* view_dispatcher) {
     free(view_dispatcher);
 }
 
+void view_dispatcher_enable_queue(ViewDispatcher* view_dispatcher) {
+    furi_assert(view_dispatcher);
+    furi_assert(view_dispatcher->queue == NULL);
+    view_dispatcher->queue = osMessageQueueNew(8, sizeof(ViewDispatcherMessage), NULL);
+}
+
+void view_dispatcher_run(ViewDispatcher* view_dispatcher) {
+    furi_assert(view_dispatcher);
+    furi_assert(view_dispatcher->queue);
+
+    ViewDispatcherMessage message;
+    while(osMessageQueueGet(view_dispatcher->queue, &message, NULL, osWaitForever) == osOK) {
+        if(message.type == ViewDispatcherMessageTypeStop) {
+            break;
+        } else if(message.type == ViewDispatcherMessageTypeInput) {
+            view_dispatcher_handle_input(view_dispatcher, &message.input);
+        }
+    }
+}
+
+void view_dispatcher_stop(ViewDispatcher* view_dispatcher) {
+    furi_assert(view_dispatcher);
+    furi_assert(view_dispatcher->queue);
+    ViewDispatcherMessage message;
+    message.type = ViewDispatcherMessageTypeStop;
+    furi_check(osMessageQueuePut(view_dispatcher->queue, &message, 0, osWaitForever) == osOK);
+}
+
 void view_dispatcher_add_view(ViewDispatcher* view_dispatcher, uint32_t view_id, View* view) {
     furi_assert(view_dispatcher);
     furi_assert(view);
@@ -126,6 +153,17 @@ void view_dispatcher_draw_callback(Canvas* canvas, void* context) {
 
 void view_dispatcher_input_callback(InputEvent* event, void* context) {
     ViewDispatcher* view_dispatcher = context;
+    if(view_dispatcher->queue) {
+        ViewDispatcherMessage message;
+        message.type = ViewDispatcherMessageTypeInput;
+        message.input = *event;
+        furi_check(osMessageQueuePut(view_dispatcher->queue, &message, 0, osWaitForever) == osOK);
+    } else {
+        view_dispatcher_handle_input(view_dispatcher, event);
+    }
+}
+
+void view_dispatcher_handle_input(ViewDispatcher* view_dispatcher, InputEvent* event) {
     bool is_consumed = false;
     if(view_dispatcher->current_view) {
         is_consumed = view_input(view_dispatcher->current_view, event);
@@ -160,6 +198,9 @@ void view_dispatcher_set_current_view(ViewDispatcher* view_dispatcher, View* vie
         view_port_update(view_dispatcher->view_port);
     } else {
         view_port_enabled_set(view_dispatcher->view_port, false);
+        if(view_dispatcher->queue) {
+            view_dispatcher_stop(view_dispatcher);
+        }
     }
 }
 

applications/gui/view_dispatcher.h

@@ -7,8 +7,7 @@
 extern "C" {
 #endif
 
-/**
- * @brief ViewDispatcher view_port placement
+/** ViewDispatcher view_port placement
  */
 typedef enum {
     ViewDispatcherTypeNone, /**< Special layer for internal use only */
@@ -18,42 +17,54 @@ typedef enum {
 
 typedef struct ViewDispatcher ViewDispatcher;
 
-/**
- * @brief Allocate ViewDispatcher
+/** Allocate ViewDispatcher instance
  * @return pointer to ViewDispatcher instance
  */
 ViewDispatcher* view_dispatcher_alloc();
 
-/**
- * @brief Free ViewDispatcher
+/** Free ViewDispatcher instance
  * @param view_dispatcher pointer to ViewDispatcher
  */
 void view_dispatcher_free(ViewDispatcher* view_dispatcher);
 
-/**
- * @brief Add view to ViewDispatcher
+/** Enable queue support
+ * If queue enabled all input events will be dispatched throw internal queue
+ * @param view_dispatcher ViewDispatcher instance
+ */
+void view_dispatcher_enable_queue(ViewDispatcher* view_dispatcher);
+
+/** Run ViewDispatcher
+ * Use only after queue enabled
+ * @param view_dispatcher ViewDispatcher instance
+ */
+void view_dispatcher_run(ViewDispatcher* view_dispatcher);
+
+/** Stop ViewDispatcher
+ * Use only after queue enabled
+ * @param view_dispatcher ViewDispatcher instance
+ */
+void view_dispatcher_stop(ViewDispatcher* view_dispatcher);
+
+/** Add view to ViewDispatcher
  * @param view_dispatcher, ViewDispatcher instance
  * @param view_id View id to register
  * @param view View instance
  */
 void view_dispatcher_add_view(ViewDispatcher* view_dispatcher, uint32_t view_id, View* view);
 
-/**
- * @brief Remove view from ViewDispatcher
+/** Remove view from ViewDispatcher
  * @param view_dispatcher ViewDispatcher instance
  * @param view_id View id to remove
  */
 void view_dispatcher_remove_view(ViewDispatcher* view_dispatcher, uint32_t view_id);
 
-/**
- * @brief Switch to View
+/** Switch to View
  * @param view_dispatcher ViewDispatcher instance
  * @param view_id View id to register
  */
 void view_dispatcher_switch_to_view(ViewDispatcher* view_dispatcher, uint32_t view_id);
 
-/**
- * @brief Attach ViewDispatcher to GUI
+/** Attach ViewDispatcher to GUI
  * @param view_dispatcher ViewDispatcher instance
  * @param gui GUI instance to attach to
  */

applications/gui/view_dispatcher_i.h

@@ -1,25 +1,43 @@
 #pragma once
 
+#include <furi.h>
+#include <m-dict.h>
+
 #include "view_dispatcher.h"
 #include "view_i.h"
-#include <furi.h>
-#include <m-dict.h>
+#include "gui_i.h"
 
 DICT_DEF2(ViewDict, uint32_t, M_DEFAULT_OPLIST, View*, M_PTR_OPLIST)
 
 struct ViewDispatcher {
+    osMessageQueueId_t queue;
     Gui* gui;
     ViewPort* view_port;
     ViewDict_t views;
     View* current_view;
 };
 
+typedef enum {
+    ViewDispatcherMessageTypeInput,
+    ViewDispatcherMessageTypeStop,
+} ViewDispatcherMessageType;
+
+typedef struct {
+    ViewDispatcherMessageType type;
+    union {
+        InputEvent input;
+    };
+} ViewDispatcherMessage;
+
 /* ViewPort Draw Callback */
 void view_dispatcher_draw_callback(Canvas* canvas, void* context);
 
 /* ViewPort Input Callback */
 void view_dispatcher_input_callback(InputEvent* event, void* context);
 
+/* Input handler */
+void view_dispatcher_handle_input(ViewDispatcher* view_dispatcher, InputEvent* event);
+
 /* Set current view, dispatches view enter and exit */
 void view_dispatcher_set_current_view(ViewDispatcher* view_dispatcher, View* view);