Re-construct menu

john0312 · Aug 17, 2024 · 2524d93 · 2524d93
1 parent 91d10a4
commit 2524d93
Show file tree

Hide file tree

Showing 12 changed files with 37 additions and 37 deletions.
diff --git a/fw/Core/Hitcon/App/BadUsbApp.cc b/fw/Core/Hitcon/App/BadUsbApp.cc
@@ -17,13 +17,13 @@ void BadUsbApp::OnExit() { g_usb_logic.StopScript(); }
 void BadUsbApp::OnButton(button_t button) {
   switch (button & BUTTON_VALUE_MASK) {
     case BUTTON_BACK:
-      badge_controller.OnAppEnd(this);
+      badge_controller.BackToMenu(this);
       break;
   }
 }
 
 void BadUsbApp::OnScriptFinished(void *unsed) {
-  badge_controller.OnAppEnd(this);
+  badge_controller.BackToMenu(this);
 }
 }  // namespace usb
 }  // namespace hitcon
diff --git a/fw/Core/Hitcon/App/ConnectMenuApp.h b/fw/Core/Hitcon/App/ConnectMenuApp.h
@@ -25,10 +25,8 @@ class ConnectMenuApp : public MenuApp {
  public:
   ConnectMenuApp() : MenuApp(connect_menu_entries, connect_menu_entries_len) {}
   void OnButtonMode() override {}
-  void OnButtonBack() override { badge_controller.change_app(&show_name_app); }
-  void OnButtonLongBack() override {
-    badge_controller.change_app(&show_name_app);
-  }
+  void OnButtonBack() override {}
+  void OnButtonLongBack() override {}
 };
 
 extern ConnectMenuApp connect_menu;

diff --git a/fw/Core/Hitcon/App/DinoApp.cc b/fw/Core/Hitcon/App/DinoApp.cc
@@ -57,10 +57,8 @@ void DinoApp::OnButton(button_t button) {
 
   switch (button & BUTTON_VALUE_MASK) {
     case BUTTON_BACK:
-      badge_controller.change_app(&main_menu);
-      break;
     case BUTTON_LONG_BACK:
-      badge_controller.change_app(&show_name_app);
+      badge_controller.BackToMenu(this);
       break;
     default:
       break;

diff --git a/fw/Core/Hitcon/App/ShowNameApp.cc b/fw/Core/Hitcon/App/ShowNameApp.cc
@@ -1,5 +1,6 @@
 #include "ShowNameApp.h"
 
+#include <App/ConnectMenuApp.h>
 #include <App/MainMenuApp.h>
 #include <App/NameSettingApp.h>
 #include <Logic/BadgeController.h>
@@ -15,6 +16,8 @@
 
 using namespace hitcon::service::sched;
 using hitcon::game::gameLogic;
+using hitcon::service::xboard::g_xboard_logic;
+using hitcon::service::xboard::UsartConnectState;
 
 namespace hitcon {
 
@@ -59,11 +62,19 @@ void ShowNameApp::OnExit() {
 void ShowNameApp::OnButton(button_t button) {
   switch (button) {
     case BUTTON_LONG_MODE:
-      badge_controller.change_app(&name_setting_menu);
+      if (g_xboard_logic.GetConnectState() == UsartConnectState::Connect) {
+        badge_controller.change_app(&connect_menu);
+      } else {
+        badge_controller.change_app(&name_setting_menu);
+      }
       break;
 
     case BUTTON_MODE:
-      badge_controller.change_app(&main_menu);
+      if (g_xboard_logic.GetConnectState() == UsartConnectState::Connect) {
+        badge_controller.change_app(&connect_menu);
+      } else {
+        badge_controller.change_app(&main_menu);
+      }
       break;
   }
 }

diff --git a/fw/Core/Hitcon/App/ShowScoreApp.cc b/fw/Core/Hitcon/App/ShowScoreApp.cc
@@ -32,7 +32,7 @@ void ShowScoreApp::ShowScore() {
 }
 
 void ShowScoreApp::OnButton(button_t button) {
-  badge_controller.change_app(&main_menu);
+  badge_controller.BackToMenu(this);
 }
 
 }  // namespace hitcon
diff --git a/fw/Core/Hitcon/App/SnakeApp.cc b/fw/Core/Hitcon/App/SnakeApp.cc
@@ -92,22 +92,12 @@ void SnakeApp::OnButton(button_t button) {
       }
       break;
     case BUTTON_BACK:
-      // local leave
-      if (mode == MODE_MULTIPLAYER) {
-        uint8_t code = PACKET_GAME_LEAVE;
-        g_xboard_logic.QueueDataForTx(&code, 1, SNAKE_RECV_ID);
-      }
-      // leave action
-      badge_controller.change_app(&main_menu);
-      break;
     case BUTTON_LONG_BACK:
-      // local leave 2
       if (mode == MODE_MULTIPLAYER) {
         uint8_t code = PACKET_GAME_LEAVE;
         g_xboard_logic.QueueDataForTx(&code, 1, SNAKE_RECV_ID);
       }
-      // leave action 2
-      badge_controller.change_app(&show_name_app);
+      badge_controller.BackToMenu(this);
       break;
     default:
       break;

diff --git a/fw/Core/Hitcon/App/TetrisApp.cc b/fw/Core/Hitcon/App/TetrisApp.cc
@@ -93,7 +93,7 @@ void TetrisApp::OnXboardRecv(void *arg) {
       break;
 
     case PACKET_ABORT_GAME:
-      badge_controller.change_app(&main_menu);
+      badge_controller.BackToMenu(this);
       break;
   }
 }
@@ -141,19 +141,12 @@ void TetrisApp::OnButton(button_t button) {
           break;
 
         case BUTTON_BACK:
-          if (multiplayer) {
-            uint8_t code = PACKET_ABORT_GAME;
-            g_xboard_logic.QueueDataForTx(&code, 1, TETRIS_RECV_ID);
-          }
-          badge_controller.OnAppEnd(this);
-          break;
-
         case BUTTON_LONG_BACK:
           if (multiplayer) {
             uint8_t code = PACKET_ABORT_GAME;
             g_xboard_logic.QueueDataForTx(&code, 1, TETRIS_RECV_ID);
           }
-          badge_controller.OnAppEnd(this);
+          badge_controller.BackToMenu(this);
           break;
 
         default:

diff --git a/fw/Core/Hitcon/Logic/BadgeController.cc b/fw/Core/Hitcon/Logic/BadgeController.cc
@@ -3,6 +3,7 @@
 #include <App/ConnectMenuApp.h>
 #include <App/EditNameApp.h>
 #include <App/HardwareTestApp.h>
+#include <App/MainMenuApp.h>
 #include <App/ShowNameApp.h>
 #include <Logic/IrController.h>
 #include <Logic/XBoardLogic.h>
@@ -12,6 +13,8 @@
 
 using hitcon::ir::irController;
 using hitcon::service::sched::my_assert;
+using hitcon::service::xboard::g_xboard_logic;
+using hitcon::service::xboard::UsartConnectState;
 
 namespace hitcon {
 BadgeController badge_controller;
@@ -45,11 +48,14 @@ void BadgeController::change_app(App *new_app) {
   if (current_app) current_app->OnEntry();
 }
 
-void BadgeController::OnAppEnd(App *ending_app) {
+void BadgeController::BackToMenu(App *ending_app) {
   my_assert(current_app == ending_app);
 
-  // TODO: Change this.
-  change_app(&show_name_app);
+  if (g_xboard_logic.GetConnectState() == UsartConnectState::Connect) {
+    change_app(&connect_menu);
+  } else {
+    change_app(&main_menu);
+  }
 }
 
 void BadgeController::OnButton(void *arg1) {

diff --git a/fw/Core/Hitcon/Logic/BadgeController.h b/fw/Core/Hitcon/Logic/BadgeController.h
@@ -26,7 +26,7 @@ class BadgeController {
 
   // App should call this to denote that the app has ended and wishes to return
   // to the main menu (or similar).
-  void OnAppEnd(App *ending_app);
+  void BackToMenu(App *ending_app);
 
   // TODO: This is called whenever a separate board connects.
   void OnXBoardConnect(void *unused);

diff --git a/fw/Core/Hitcon/Logic/XBoardGameController.cc b/fw/Core/Hitcon/Logic/XBoardGameController.cc
@@ -154,7 +154,7 @@ void XBoardGameController::TryExitApp() {
     if (connected_) {
       badge_controller.change_app(&connect_menu);
     } else {
-      badge_controller.OnAppEnd(&g_send_data_app);
+      badge_controller.BackToMenu(&g_send_data_app);
     }
   }
 }

diff --git a/fw/Core/Hitcon/Logic/XBoardLogic.cc b/fw/Core/Hitcon/Logic/XBoardLogic.cc
@@ -258,6 +258,8 @@ void XBoardLogic::PingRoutine(void *) {
   CheckPong();
 }
 
+enum UsartConnectState XBoardLogic::GetConnectState() { return connect_state; }
+
 }  // namespace xboard
 }  // namespace service
 }  // namespace hitcon
diff --git a/fw/Core/Hitcon/Logic/XBoardLogic.h b/fw/Core/Hitcon/Logic/XBoardLogic.h
@@ -56,6 +56,8 @@ class XBoardLogic {
   // - `handler_id`: should be the same as `QueueDataForTx`
   void SetOnPacketArrive(callback_t callback, void *self, RecvFnId handler_id);
 
+  enum UsartConnectState GetConnectState();
+
  private:
   // buffer variables