put soldering profile mode into its own file, put common functions in…

… utils
Ralim · Apr 24, 2023 · 6c6a9d1 · 6c6a9d1
1 parent 8cc722e
commit 6c6a9d1
Show file tree

Hide file tree

Showing 11 changed files with 402 additions and 335 deletions.
diff --git a/source/Core/BSP/BSP.h b/source/Core/BSP/BSP.h
@@ -92,7 +92,9 @@ enum StatusLED {
   LED_COOLING_STILL_HOT, // The unit is off and cooling but still hot
   LED_UNKNOWN,           //
 };
-void setStatusLED(const enum StatusLED state, bool buzzer);
+void setStatusLED(const enum StatusLED state);
+
+void setBuzzer(bool on);
 
 // preStartChecks are run until they return 0
 // By the PID, after each ADC sample comes in

diff --git a/source/Core/BSP/MHP30/BSP.cpp b/source/Core/BSP/MHP30/BSP.cpp
@@ -436,7 +436,7 @@ void setBuzzer(bool on) {
     htim3.Instance->PSC  = 1; // revert back out of hearing range
   }
 }
-void setStatusLED(const enum StatusLED state, bool buzzer) {
+void setStatusLED(const enum StatusLED state) {
   static enum StatusLED lastState = LED_UNKNOWN;
   static TickType_t     buzzerEnd = 0;
 
@@ -460,18 +460,9 @@ void setStatusLED(const enum StatusLED state, bool buzzer) {
       ws2812.led_set_color(0, 0xFF, 0x8C, 0x00); // Orange
       break;
     }
-    if (buzzer) {
-      // Buzzer requested
-      buzzerEnd = xTaskGetTickCount() + TICKS_SECOND / 3;
-    }
     ws2812.led_update();
     lastState = state;
   }
-  if (xTaskGetTickCount() < buzzerEnd) {
-    setBuzzer(true);
-  } else {
-    setBuzzer(false);
-  }
 }
 uint64_t getDeviceID() {
   //

diff --git a/source/Core/BSP/Miniware/BSP.cpp b/source/Core/BSP/Miniware/BSP.cpp
@@ -245,7 +245,7 @@ bool isTipDisconnected() {
   return tipTemp > tipDisconnectedThres;
 }
 
-void     setStatusLED(const enum StatusLED state, bool buzzer) {}
+void     setStatusLED(const enum StatusLED state) {}
 uint8_t  preStartChecks() { return 1; }
 uint64_t getDeviceID() {
   //

diff --git a/source/Core/BSP/Pinecil/BSP.cpp b/source/Core/BSP/Pinecil/BSP.cpp
@@ -86,7 +86,7 @@ bool isTipDisconnected() {
   return tipTemp > tipDisconnectedThres;
 }
 
-void setStatusLED(const enum StatusLED state, bool buzzer) {}
+void setStatusLED(const enum StatusLED state) {}
 
 uint8_t  preStartChecks() { return 1; }
 uint64_t getDeviceID() { return dbg_id_get(); }

diff --git a/source/Core/BSP/Pinecilv2/BSP.cpp b/source/Core/BSP/Pinecilv2/BSP.cpp
@@ -145,7 +145,7 @@ bool isTipDisconnected() {
   return tipTemp > tipDisconnectedThres;
 }
 
-void setStatusLED(const enum StatusLED state, bool buzzer) {
+void setStatusLED(const enum StatusLED state) {
   // Dont have one
 }
 

diff --git a/source/Core/Threads/OperatingModes/HomeScreen.cpp b/source/Core/Threads/OperatingModes/HomeScreen.cpp
@@ -57,7 +57,7 @@ void drawHomeScreen(bool buttonLockout) {
     case BUTTON_F_LONG:
 #ifdef PROFILE_SUPPORT
       if (!isTipDisconnected()) {
-        gui_solderingMode(0); // enter soldering mode
+        gui_solderingProfileMode(); // enter soldering profile mode
         buttonLockout = true;
       }
 #else
@@ -97,13 +97,13 @@ void drawHomeScreen(bool buttonLockout) {
     if ((tipTemp < 50) && getSettingValue(SettingsOptions::Sensitivity)
         && (((xTaskGetTickCount() - lastMovementTime) > MOVEMENT_INACTIVITY_TIME) && ((xTaskGetTickCount() - lastButtonTime) > BUTTON_INACTIVITY_TIME))) {
       OLED::setDisplayState(OLED::DisplayState::OFF);
-      setStatusLED(LED_OFF, false);
+      setStatusLED(LED_OFF);
     } else {
       OLED::setDisplayState(OLED::DisplayState::ON);
       if (tipTemp > 55) {
-        setStatusLED(LED_COOLING_STILL_HOT, false);
+        setStatusLED(LED_COOLING_STILL_HOT);
       } else {
-        setStatusLED(LED_STANDBY, false);
+        setStatusLED(LED_STANDBY);
       }
     }
     // Clear the lcd buffer

diff --git a/source/Core/Threads/OperatingModes/OperatingModes.h b/source/Core/Threads/OperatingModes/OperatingModes.h
@@ -37,6 +37,7 @@ void performCJCC(void);                                            // Used to ca
 void gui_solderingTempAdjust(void);                                // For adjusting the setpoint temperature of the iron
 int  gui_SolderingSleepingMode(bool stayOff, bool autoStarted);    // Sleep mode
 void gui_solderingMode(uint8_t jumpToSleep);                       // Main mode for hot pointy tool
+void gui_solderingProfileMode();                                   // Profile mode for hot likely-not-so-pointy tool
 void showDebugMenu(void);                                          // Debugging values
 void showPDDebug(void);                                            // Debugging menu that hows PD adaptor info
 void showWarnings(void);                                           // Shows user warnings if required