pohui_pohui/firmware
1
0
Fork 0
mirror of https://github.com/meshtastic/firmware.git synced 2025-04-27 10:21:40 +00:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

Removed powerExit -- it wasn't working

Browse Source
This commit is contained in:
Jm Casler 2020-10-10 21:54:27 -07:00
parent c16acb904e
commit b17a8d7a6a
2 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/PowerFSM.cpp
View File

@ -127,13 +127,6 @@ static void powerEnter()
setCPUFast(true); // Set CPU to 240mhz when we're plugged in to wall power. 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() static void onEnter()
{ {
screen.setOn(true); screen.setOn(true);
@ -148,6 +141,7 @@ static void onEnter()
service.sendNetworkPing(displayedNodeNum, true); // Refresh the currently displayed node service.sendNetworkPing(displayedNodeNum, true); // Refresh the currently displayed node
lastPingMs = now; lastPingMs = now;
} }
} }
static void screenPress() static void screenPress()
@ -165,7 +159,6 @@ State stateSERIAL(serialEnter, NULL, NULL, "SERIAL");
State stateBOOT(bootEnter, NULL, NULL, "BOOT"); State stateBOOT(bootEnter, NULL, NULL, "BOOT");
State stateON(onEnter, NULL, NULL, "ON"); State stateON(onEnter, NULL, NULL, "ON");
State statePOWER(powerEnter, NULL, NULL, "POWER"); State statePOWER(powerEnter, NULL, NULL, "POWER");
State stateUNPLUG(powerExit, NULL, NULL, "UNPLUG");
Fsm powerFSM(&stateBOOT); Fsm powerFSM(&stateBOOT);
@ -232,7 +225,6 @@ void PowerFSM_setup()
powerFSM.add_transition(&stateNB, &statePOWER, EVENT_POWER_CONNECTED, NULL, "power connect"); 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(&stateDARK, &statePOWER, EVENT_POWER_CONNECTED, NULL, "power connect");
powerFSM.add_transition(&stateON, &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"); powerFSM.add_transition(&statePOWER, &stateON, EVENT_POWER_DISCONNECTED, NULL, "power disconnected");

4
src/graphics/Screen.cpp
View File

@ -1026,6 +1026,10 @@ void DebugInfo::drawFrameSettings(OLEDDisplay *display, OLEDDisplayUiState *stat
String(days) + "d " + (hours < 10 ? "0" : "") + String(hours) + ":" + (minutes < 10 ? "0" : "") + String(days) + "d " + (hours < 10 ? "0" : "") + String(hours) + ":" + (minutes < 10 ? "0" : "") +
String(minutes) + ":" + (seconds < 10 ? "0" : "") + String(seconds)); 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 // Line 3
drawGPSAltitude(display, x, y + FONT_HEIGHT * 2, gpsStatus); drawGPSAltitude(display, x, y + FONT_HEIGHT * 2, gpsStatus);