josh
/
Prusa-Firmware
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Cleanup: Pull out PrusaErrorCodeIndex 

Saves 8 bytes of flash
This commit is contained in:
Guðni Már Gilbert 2022-06-04 18:17:33 +00:00 committed by D.R.racer
parent d49e858cf7
commit 268c96334b
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Firmware/mmu2_reporting.cpp
View File

@ -53,7 +53,7 @@ static void ReportErrorHookDynamicRender(void)
* @brief Renders any characters that are static on the MMU error screen i.e. they don't change. * @brief Renders any characters that are static on the MMU error screen i.e. they don't change.
* @param[in] ec Error code * @param[in] ec Error code
*/ */
static void ReportErrorHookStaticRender(uint16_t ec) { static void ReportErrorHookStaticRender(uint8_t ei) {
//! Show an error screen //! Show an error screen
//! When an MMU error occurs, the LCD content will look like this: //! When an MMU error occurs, the LCD content will look like this:
//! |01234567890123456789| //! |01234567890123456789|
@ -61,7 +61,6 @@ static void ReportErrorHookStaticRender(uint16_t ec) {
//! |prusa3d.com/ERR04504| <- URL 20 characters //! |prusa3d.com/ERR04504| <- URL 20 characters
//! |FI:1 FS:1 5>3 t201°| <- status line, t is thermometer symbol //! |FI:1 FS:1 5>3 t201°| <- status line, t is thermometer symbol
//! |>Retry >Done >MoreW| <- buttons //! |>Retry >Done >MoreW| <- buttons
const uint8_t ei = PrusaErrorCodeIndex(ec);
bool two_choices = false; bool two_choices = false;
// Read and determine what operations should be shown on the menu // Read and determine what operations should be shown on the menu
@ -101,9 +100,8 @@ static void ReportErrorHookStaticRender(uint16_t ec) {
* to exit the error screen. The MMU will raise the menu * to exit the error screen. The MMU will raise the menu
* again if the error is not solved. * again if the error is not solved.
*/ */
static uint8_t ReportErrorHookMonitor(uint16_t ec) { static uint8_t ReportErrorHookMonitor(uint8_t ei) {
uint8_t ret = 0; uint8_t ret = 0;
const uint8_t ei = PrusaErrorCodeIndex(ec);
bool two_choices = false; bool two_choices = false;
static int8_t enc_dif = 0; static int8_t enc_dif = 0;
@ -211,16 +209,18 @@ void ReportErrorHook(uint16_t ec) {
ReportErrorHookState = ReportErrorHookStates::DISMISS_ERROR_SCREEN; ReportErrorHookState = ReportErrorHookStates::DISMISS_ERROR_SCREEN;
} }
const uint8_t ei = PrusaErrorCodeIndex(ec);
switch ((uint8_t)ReportErrorHookState) switch ((uint8_t)ReportErrorHookState)
{ {
case (uint8_t)ReportErrorHookStates::RENDER_ERROR_SCREEN: case (uint8_t)ReportErrorHookStates::RENDER_ERROR_SCREEN:
ReportErrorHookStaticRender(ec); ReportErrorHookStaticRender(ei);
ReportErrorHookState = ReportErrorHookStates::MONITOR_SELECTION; ReportErrorHookState = ReportErrorHookStates::MONITOR_SELECTION;
// Fall through // Fall through
case (uint8_t)ReportErrorHookStates::MONITOR_SELECTION: case (uint8_t)ReportErrorHookStates::MONITOR_SELECTION:
mmu2.is_mmu_error_monitor_active = true; mmu2.is_mmu_error_monitor_active = true;
ReportErrorHookDynamicRender(); // Render dynamic characters ReportErrorHookDynamicRender(); // Render dynamic characters
switch (ReportErrorHookMonitor(ec)) switch (ReportErrorHookMonitor(ei))
{ {
case 0: case 0:
// No choice selected, return to loop() // No choice selected, return to loop()