Fix addr and cmd in UI

CapibaraZero · Sep 9, 2024 · 3a15259 · 3a15259
1 parent 1a8e3f8
commit 3a15259
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 11 deletions.
diff --git a/lib/UI/pages/IR/IRRecordSignalPage.cpp b/lib/UI/pages/IR/IRRecordSignalPage.cpp
@@ -39,13 +39,17 @@ void IRRecordSignalPage::display() {
   grid->display();
 }
 
-void IRRecordSignalPage::set_signal(String _protocol, int _addr, int _cmd, uint32_t _len) {
+void IRRecordSignalPage::set_signal(String _protocol, uint16_t _addr, uint16_t _cmd, uint32_t _len) {
   grid->set_selected(1, false);
   screen->reset();
   grid->remove(1);  // Remove stop
-  if(_addr != -1 && _cmd != -1) {
-    addr = new Text(screen, ST77XX_WHITE, "Address: " + _addr);
-    cmd = new Text(screen, ST77XX_WHITE, "CMD:" + _cmd);
+  String addr_str = String(_addr, HEX);
+  String cmd_str = String(_cmd, HEX);
+  addr_str.toUpperCase();
+  cmd_str.toUpperCase();
+  if(_addr != 0 && _cmd != 0) {
+    addr = new Text(screen, ST77XX_WHITE, "Address: 0x" + addr_str);
+    cmd = new Text(screen, ST77XX_WHITE, "CMD: 0x" + cmd_str);
     grid->add(addr);
     grid->add(cmd);
   }
@@ -57,8 +61,8 @@ void IRRecordSignalPage::set_signal(String _protocol, int _addr, int _cmd, uint3
   grid->add(save);
   grid->add(retry);
   grid->add(stop);
-  size_t selected_widget = _addr == -1 ? 2 : 4;
-  size_t limit = _addr == -1 ? 4 : 6;
+  size_t selected_widget = _addr == 0 ? 2 : 4;
+  size_t limit = _addr == 0 ? 4 : 6;
   grid->set_selected(selected_widget, true);
   current_position = selected_widget;
   protocol->set_text("Protocol: " + _protocol);

diff --git a/lib/UI/pages/IR/IRRecordSignalPage.hpp b/lib/UI/pages/IR/IRRecordSignalPage.hpp
@@ -43,7 +43,7 @@ class IRRecordSignalPage : public Page {
     grid->set_selected(pos, status);
   };
   void click(int pos, void callback()) { grid->click(pos, callback); };
-  void set_signal(String _protocol, int _addr, int _cmd, uint32_t len);
+  void set_signal(String _protocol, uint16_t _addr, uint16_t _cmd, uint32_t len);
 };
 
 #endif
diff --git a/lib/ir_attacks/ir_attacks_task.cpp b/lib/ir_attacks/ir_attacks_task.cpp
@@ -10,9 +10,6 @@ void ir_record_signal_task(void *pv) {
     RecordedSignal data = ir_framework->get_decoded_signal();
     Serial.println("Signal decoded successfully");
     Serial.println(data.protocol);
-    if(data.protocol == 0)  // Unknown
-        params->page->set_signal(ir_framework->enum_to_str(data.protocol), -1, -1, data.raw_len);
-    else
-        params->page->set_signal(ir_framework->enum_to_str(data.protocol), -1, -1, data.raw_len);
+    params->page->set_signal(ir_framework->enum_to_str(data.protocol), data.address, data.command, data.raw_len);
     vTaskDelete(NULL);
 }