[GC] Fix rumble trigger on wrong bit and task stack overflow

darthcloud · Sep 8, 2020 · 8c65217 · 8c65217
1 parent f80eed6
commit 8c65217
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/main/bluetooth/host.c b/main/bluetooth/host.c
@@ -426,7 +426,7 @@ int32_t bt_host_init(void) {
     bt_host_load_keys_from_file(&bt_host_link_keys);
 
     xTaskCreatePinnedToCore(&bt_host_task, "bt_host_task", 4096, NULL, 5, NULL, 0);
-    xTaskCreatePinnedToCore(&bt_fb_task, "bt_fb_task", 1024, NULL, 10, NULL, 0);
+    xTaskCreatePinnedToCore(&bt_fb_task, "bt_fb_task", 2048, NULL, 10, NULL, 0);
     xTaskCreatePinnedToCore(&bt_tx_task, "bt_tx_task", 2048, NULL, 11, NULL, 0);
 
     bt_hci_init();

diff --git a/main/wired/nsi.c b/main/wired/nsi.c
@@ -318,10 +318,12 @@ static void IRAM_ATTR gc_isr(void *arg) {
                         RMT.conf_ch[channel].conf1.tx_start = 1;
 
                         if (config.out_cfg[port].acc_mode == ACC_RUMBLE) {
-                            if (last_rumble[port] != buf[1]) {
-                                last_rumble[port] = buf[1];
-                                buf[0] = port;
-                                adapter_q_fb(buf, 2);
+                            uint8_t rumble_data[2];
+                            rumble_data[1] = buf[1] & 0x01;
+                            if (last_rumble[port] != rumble_data[1]) {
+                                last_rumble[port] = rumble_data[1];
+                                rumble_data[0] = port;
+                                adapter_q_fb(rumble_data, 2);
                             }
                         }