From b17a8d7a6acb118b605b381679ad514c109a1890 Mon Sep 17 00:00:00 2001 From: Jm Casler Date: Sat, 10 Oct 2020 21:54:27 -0700 Subject: [PATCH] Removed powerExit -- it wasn't working --- src/PowerFSM.cpp | 10 +--------- src/graphics/Screen.cpp | 4 ++++ 2 files changed, 5 insertions(+), 9 deletions(-) diff --git a/src/PowerFSM.cpp b/src/PowerFSM.cpp index ba16be4d0..63d05a5a2 100644 --- a/src/PowerFSM.cpp +++ b/src/PowerFSM.cpp @@ -127,13 +127,6 @@ static void powerEnter() setCPUFast(true); // Set CPU to 240mhz when we're plugged in to wall power. } -static void powerExit() -{ - screen.setOn(true); - setBluetoothEnable(true); - setCPUFast(false); // Set CPU to 80mhz when we're plugged in to wall power. -} - static void onEnter() { screen.setOn(true); @@ -148,6 +141,7 @@ static void onEnter() service.sendNetworkPing(displayedNodeNum, true); // Refresh the currently displayed node lastPingMs = now; } + } static void screenPress() @@ -165,7 +159,6 @@ State stateSERIAL(serialEnter, NULL, NULL, "SERIAL"); State stateBOOT(bootEnter, NULL, NULL, "BOOT"); State stateON(onEnter, NULL, NULL, "ON"); State statePOWER(powerEnter, NULL, NULL, "POWER"); -State stateUNPLUG(powerExit, NULL, NULL, "UNPLUG"); Fsm powerFSM(&stateBOOT); @@ -232,7 +225,6 @@ void PowerFSM_setup() powerFSM.add_transition(&stateNB, &statePOWER, EVENT_POWER_CONNECTED, NULL, "power connect"); powerFSM.add_transition(&stateDARK, &statePOWER, EVENT_POWER_CONNECTED, NULL, "power connect"); powerFSM.add_transition(&stateON, &statePOWER, EVENT_POWER_CONNECTED, NULL, "power connect"); - powerFSM.add_transition(&statePOWER, &stateUNPLUG, EVENT_POWER_DISCONNECTED, NULL, "power disconnected"); } powerFSM.add_transition(&statePOWER, &stateON, EVENT_POWER_DISCONNECTED, NULL, "power disconnected"); diff --git a/src/graphics/Screen.cpp b/src/graphics/Screen.cpp index 2ea03c637..284962015 100644 --- a/src/graphics/Screen.cpp +++ b/src/graphics/Screen.cpp @@ -1026,6 +1026,10 @@ void DebugInfo::drawFrameSettings(OLEDDisplay *display, OLEDDisplayUiState *stat String(days) + "d " + (hours < 10 ? "0" : "") + String(hours) + ":" + (minutes < 10 ? "0" : "") + String(minutes) + ":" + (seconds < 10 ? "0" : "") + String(seconds)); + // Show CPU Frequency. + display->drawString(x + SCREEN_WIDTH - display->getStringWidth("CPU " + String(getCpuFrequencyMhz()) + "MHz"), y + FONT_HEIGHT * 1, + "CPU " + String(getCpuFrequencyMhz()) + "MHz"); + // Line 3 drawGPSAltitude(display, x, y + FONT_HEIGHT * 2, gpsStatus);