Fix surprise message

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

Hide file tree

Showing 3 changed files with 14 additions and 0 deletions.
diff --git a/fw/Core/Hitcon/App/ShowNameApp.cc b/fw/Core/Hitcon/App/ShowNameApp.cc
@@ -168,6 +168,15 @@ void ShowNameApp::SetMode(const enum ShowNameMode mode) {
   update_display();
 }
 
+void ShowNameApp::SetSurpriseMsg(const char *msg) {
+  int len = strlen(msg);
+  if (len >= kDisplayScrollMaxTextLen) {
+    len = kDisplayScrollMaxTextLen;
+  }
+  memcpy(surprise_msg, msg, len);
+  surprise_msg[len] = 0;
+}
+
 enum ShowNameMode ShowNameApp::GetMode() { return mode; }
 
 }  // namespace hitcon
diff --git a/fw/Core/Hitcon/App/ShowNameApp.h b/fw/Core/Hitcon/App/ShowNameApp.h
@@ -36,6 +36,8 @@ class ShowNameApp : public App {
   void SetMode(const enum ShowNameMode mode);
   enum ShowNameMode GetMode();
 
+  void SetSurpriseMsg(const char *msg);
+
   void check_update();
 
  private:
@@ -44,6 +46,7 @@ class ShowNameApp : public App {
   hitcon::service::sched::PeriodicTask _routine_task;
   uint32_t score_cache = 0;
 
+  char surprise_msg[kDisplayScrollMaxTextLen + 1];
   bool starting_up;
   unsigned last_disp_update;
 };

diff --git a/fw/Core/Hitcon/Logic/IrController.cc b/fw/Core/Hitcon/Logic/IrController.cc
@@ -45,6 +45,8 @@ void IrController::Send2Game(void* arg) {
   send_lock = true;
 }
 void IrController::ShowText(void* arg) {
+  struct ShowPacket* pkt = reinterpret_cast<struct ShowPacket*>(arg);
+  show_name_app.SetSurpriseMsg(pkt->message);
   show_name_app.SetMode(Surprise);
   badge_controller.change_app(&show_name_app);
 }