Merge pull request #2 from jamisonderek/jamisonderek/ir-nec

RogueMaster · Aug 23, 2024 · 5bff6b7 · 5bff6b7
2 parents afde2ee + 90609a3
commit 5bff6b7
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/infrared_controller.c b/infrared_controller.c
@@ -132,7 +132,7 @@ void infrared_controller_send(InfraredController* controller) {
 
     InfraredMessage message = {
         .protocol = InfraredProtocolNEC,
-        .address = 0x00,
+        .address = 0x42,
         .command = (controller->team == TeamRed) ? IR_COMMAND_RED_TEAM : IR_COMMAND_BLUE_TEAM};
 
     FURI_LOG_I(
@@ -161,7 +161,7 @@ bool infrared_controller_receive(InfraredController* controller) {
 
     infrared_worker_rx_start(controller->worker);
 
-    furi_delay_ms(50);
+    furi_delay_ms(250);
 
     infrared_worker_rx_stop(controller->worker);
 

diff --git a/laser_tag_icons.c b/laser_tag_icons.c
@@ -3,6 +3,7 @@
 #include <gui/icon_i.h>
 
 const uint8_t laser_gun_icon_data[] = {
+    0,
     0b00000000,
     0b00000000,
     0b00000001,
@@ -22,6 +23,7 @@ const uint8_t laser_gun_icon_data[] = {
 };
 
 const uint8_t health_icon_data[] = {
+    0,
     0b00001100,
     0b00110000,
     0b00011110,
@@ -41,6 +43,7 @@ const uint8_t health_icon_data[] = {
 };
 
 const uint8_t ammo_icon_data[] = {
+    0,
     0b00011000,
     0b00011000,
     0b00111100,
@@ -60,6 +63,7 @@ const uint8_t ammo_icon_data[] = {
 };
 
 const uint8_t team_red_icon_data[] = {
+    0,
     0b00011000,
     0b00011000,
     0b00111100,
@@ -79,6 +83,7 @@ const uint8_t team_red_icon_data[] = {
 };
 
 const uint8_t team_blue_icon_data[] = {
+    0,
     0b11100111,
     0b11100111,
     0b11000011,
@@ -98,6 +103,7 @@ const uint8_t team_blue_icon_data[] = {
 };
 
 const uint8_t game_over_icon_data[] = {
+    0,
     0b11111111,
     0b11111111,
     0b10000000,