pohui_pohui/firmware
1
0
Fork 0
mirror of https://github.com/meshtastic/firmware.git synced 2025-05-02 12:03:56 +00:00
Code Issues Actions 5 Packages Projects Releases Wiki Activity

fix heltec build (and fix formatting)

Browse Source
This commit is contained in:
geeksville 2020-07-01 10:08:38 -07:00
parent a7456a1126
commit a4f53270e8
1 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/main.cpp
View File

@ -37,8 +37,8 @@
#include "main.h" #include "main.h"
#include "screen.h" #include "screen.h"
#include "sleep.h" #include "sleep.h"
#include <Wire.h>
#include <OneButton.h> #include <OneButton.h>
#include <Wire.h>
// #include <driver/rtc_io.h> // #include <driver/rtc_io.h>
#ifndef NO_ESP32 #ifndef NO_ESP32
@ -134,15 +134,17 @@ Periodic ledPeriodic(ledBlinker);
// Prepare for button presses // Prepare for button presses
#ifdef BUTTON_PIN #ifdef BUTTON_PIN
OneButton userButton; OneButton userButton;
#endif #endif
#ifdef BUTTON_PIN_ALT #ifdef BUTTON_PIN_ALT
OneButton userButtonAlt; OneButton userButtonAlt;
#endif #endif
void userButtonPressed() { void userButtonPressed()
{
powerFSM.trigger(EVENT_PRESS); powerFSM.trigger(EVENT_PRESS);
} }
void userButtonPressedLong(){ void userButtonPressedLong()
{
screen.adjustBrightness(); screen.adjustBrightness();
} }
@ -229,6 +231,10 @@ void setup()
ssd1306_found = false; // forget we even have the hardware ssd1306_found = false; // forget we even have the hardware
esp32Setup(); esp32Setup();
#endif
#ifdef TBEAM_V10
// Currently only the tbeam has a PMU
power = new Power(); power = new Power();
power->setup(); power->setup();
power->setStatusHandler(powerStatus); power->setStatusHandler(powerStatus);
@ -306,7 +312,6 @@ void setup()
// This must be _after_ service.init because we need our preferences loaded from flash to have proper timeout values // This must be _after_ service.init because we need our preferences loaded from flash to have proper timeout values
PowerFSM_setup(); // we will transition to ON in a couple of seconds, FIXME, only do this for cold boots, not waking from SDS PowerFSM_setup(); // we will transition to ON in a couple of seconds, FIXME, only do this for cold boots, not waking from SDS
// setBluetoothEnable(false); we now don't start bluetooth until we enter the proper state // setBluetoothEnable(false); we now don't start bluetooth until we enter the proper state
setCPUFast(false); // 80MHz is fine for our slow peripherals setCPUFast(false); // 80MHz is fine for our slow peripherals
} }
@ -352,6 +357,8 @@ void loop()
#ifndef NO_ESP32 #ifndef NO_ESP32
esp32Loop(); esp32Loop();
#endif
#ifdef TBEAM_V10
power->loop(); power->loop();
#endif #endif
@ -379,7 +386,7 @@ void loop()
// Update the screen last, after we've figured out what to show. // Update the screen last, after we've figured out what to show.
screen.debug()->setChannelNameStatus(channelSettings.name); screen.debug()->setChannelNameStatus(channelSettings.name);
//screen.debug()->setPowerStatus(powerStatus); // screen.debug()->setPowerStatus(powerStatus);
// No GPS lock yet, let the OS put the main CPU in low power mode for 100ms (or until another interrupt comes in) // No GPS lock yet, let the OS put the main CPU in low power mode for 100ms (or until another interrupt comes in)
// i.e. don't just keep spinning in loop as fast as we can. // i.e. don't just keep spinning in loop as fast as we can.