Implement remote change for PreparedData partition

john0312 · Aug 21, 2024 · 3cb5268 · 3cb5268
1 parent 90186f2
commit 3cb5268
Show file tree

Hide file tree

Showing 5 changed files with 37 additions and 1 deletion.
diff --git a/fw/Core/Hitcon/Logic/IrController.cc b/fw/Core/Hitcon/Logic/IrController.cc
@@ -76,6 +76,8 @@ void IrController::OnPacketReceived(void* arg) {
     hardware_test_app.CheckIr(&data->show);
   } else if (data->type == packet_type::kShow) {
     scheduler.Queue(&showtext_task, &data->show);
+  } else if (data->type == packet_type::kPartition) {
+    g_prepared_data.SetPartitionAndShow(data->partition.partition);
   }
 }
 

diff --git a/fw/Core/Hitcon/Logic/IrController.h b/fw/Core/Hitcon/Logic/IrController.h
@@ -3,6 +3,7 @@
 
 #include <Logic/GameLogic.h>
 #include <Logic/IrLogic.h>
+#include <Secret/secret.h>
 #include <Service/IrService.h>
 #include <Service/Sched/PeriodicTask.h>
 #include <Service/Sched/Scheduler.h>
@@ -13,6 +14,7 @@ enum class packet_type : uint8_t {
   kGame = 0,
   kShow = 1,
   kTest = 2,
+  kPartition = hitcon::kPartitionPacketId,
 };
 
 namespace hitcon {
@@ -28,13 +30,18 @@ struct ShowPacket {
   char message[16];
 };
 
+struct PartitionPacket {
+  uint8_t partition;
+};
+
 /*Definition of IR content.*/
 struct IrData {
   uint8_t ttl;
   packet_type type;
   union {
     struct GamePacket game;
     struct ShowPacket show;
+    struct PartitionPacket partition;
   };
 };
 

diff --git a/fw/Core/Hitcon/Logic/PreparedData.cc b/fw/Core/Hitcon/Logic/PreparedData.cc
@@ -1,3 +1,5 @@
+#include <App/ShowNameApp.h>
+#include <Logic/BadgeController.h>
 #include <Logic/EntropyHub.h>
 #include <Logic/GameLogic.h>
 #include <Logic/PreparedData.h>
@@ -20,7 +22,7 @@ PreparedData g_prepared_data;
 
 PreparedData::PreparedData()
     : current_partition_(0), ir_idx_(-1), xboard_idx_(-1), elapsed_sec_(0),
-      init_finish_(false),
+      partition_change_(-1), init_finish_(false),
       routine_task(985, (task_callback_t)&PreparedData::Routine, this, 1000) {}
 
 void PreparedData::Init() {
@@ -63,6 +65,10 @@ void PreparedData::GetRandomDataForXBoardTransmission(uint8_t* out_data,
   }
 }
 
+void PreparedData::SetPartitionAndShow(int partition) {
+  partition = (partition + kPartitionOffset) & 0x0FF;
+}
+
 void PreparedData::Routine() {
   elapsed_sec_++;
 
@@ -84,6 +90,20 @@ void PreparedData::Routine() {
       xboard_idx_ = (xboard_idx_ + 1) % kXBoardPartitionSize;
     }
   }
+
+  if (partition_change_ != -1) {
+    SetPartition(partition_change_);
+    if (current_partition_ == partition_change_) {
+      char msg[5];
+      msg[0] = 'P';
+      msg[1] = '0' + current_partition_;
+      msg[2] = '\0';
+      show_name_app.SetSurpriseMsg(msg);
+      show_name_app.SetMode(Surprise);
+      badge_controller.change_app(&show_name_app);
+    }
+    partition_change_ = -1;
+  }
 }
 
 }  // namespace hitcon
diff --git a/fw/Core/Hitcon/Logic/PreparedData.h b/fw/Core/Hitcon/Logic/PreparedData.h
@@ -18,6 +18,8 @@ class PreparedData {
     }
   }
 
+  void SetPartitionAndShow(int partition);
+
   int GetPartition(int partition) { return current_partition_; }
 
   void GetRandomDataForIrTransmission(uint8_t* out_data, int* out_col);
@@ -29,6 +31,7 @@ class PreparedData {
   int xboard_idx_;
 
   int elapsed_sec_;
+  int partition_change_;
 
   bool init_finish_;
 

diff --git a/fw/Core/Hitcon/Secret/secret.h b/fw/Core/Hitcon/Secret/secret.h
@@ -252,6 +252,10 @@ constexpr uint8_t kStrayXBoardData[] = {
 #undef DATA
 #endif
 
+constexpr int kPartitionOffset = 0x0;
+
+constexpr uint8_t kPartitionPacketId = 0x4;
+
 constexpr size_t kPartitionCount = 4;
 
 constexpr size_t kIrPartitionSize =