Merge pull request #18 from ashleyhuxley/fen/refactor-post-rx

refactor: subghz post rx now happens on the queue

Author: ashleyhuxley

bomber_loop.c

@@ -207,6 +207,10 @@ void bomber_main_loop(BomberAppState* state) {
             case BomberEventType_Tick:
                 updated = bomber_game_tick(state);
                 break;
+            case BomberEventType_SubGhz:
+                bomber_game_post_rx(state, event.subGhzIncomingSize);
+                updated = true;
+                break;
             default:
                 FURI_LOG_E(TAG, "Unknown event received from queue.");
                 break;

subghz.c

@@ -63,7 +63,7 @@ void tx_death(BomberAppState* state) {
 // Handle the buffer once data receive has completed
 // state: Pointer to the application state
 // rx_size: Number of bytes of data received
-static void post_rx(BomberAppState* state, size_t rx_size) {
+void bomber_game_post_rx(BomberAppState* state, size_t rx_size) {
     furi_assert(state);
     furi_assert(rx_size);
 
@@ -112,8 +112,6 @@ static void post_rx(BomberAppState* state, size_t rx_size) {
         }
         break;
     }
-
-    view_port_update(state->view_port);
 }
 
 // Handle incoming subghz data
@@ -132,7 +130,12 @@ void subghz_check_incoming(BomberAppState* state) {
 
         size_t rx_size =
             subghz_tx_rx_worker_read(state->subghz_worker, state->rx_buffer, RX_TX_BUFFER_SIZE);
-        post_rx(state, rx_size);
+        
+        BomberEvent event = {.type = BomberEventType_SubGhz, .subGhzIncomingSize = rx_size };
+
+        if(furi_message_queue_put(state->queue, &event, FuriWaitForever) != FuriStatusOk) {
+            FURI_LOG_W(TAG, "Failed to put timer event in message queue");
+        }
     }
 }
 

subghz.h

@@ -10,5 +10,6 @@ void tx_bomb_placement(BomberAppState* state, uint8_t x, uint8_t y);
 void tx_death(BomberAppState* state);
 void subghz_check_incoming(BomberAppState* state);
 void have_read_cb(void* context);
+void bomber_game_post_rx(BomberAppState* state, size_t rx_size);
 
 #endif

types.h

@@ -97,12 +97,13 @@ typedef enum {
 typedef enum {
     BomberEventType_Input,
     BomberEventType_Tick,
+    BomberEventType_SubGhz
 } BomberEventType;
 
 typedef struct {
     BomberEventType type;
-    //InfraredMessage* ir_message;
     InputEvent input;
+    size_t subGhzIncomingSize;
 } BomberEvent;
 
 typedef enum { WhoDied_None, WhoDied_Fox, WhoDied_Wolf } WhoDied;