pohui_pohui/firmware
1
0
Fork 0
mirror of https://github.com/meshtastic/firmware.git synced 2025-04-29 11:01:15 +00:00
Code Issues Actions 5 Packages Projects Releases Wiki Activity

Update ESP32 build to work with latest NRF52 changes

Browse Source
This commit is contained in:
geeksville 2020-04-24 14:55:51 -07:00
parent b8b503cb0a
commit ca03110932
6 changed files with 20 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
.vscode/launch.json vendored
View File

@ -12,9 +12,8 @@
"type": "platformio-debug", "type": "platformio-debug",
"request": "launch", "request": "launch",
"name": "PIO Debug", "name": "PIO Debug",
"executable": "/home/kevinh/development/meshtastic/meshtastic-esp32/.pio/build/bare/firmware.elf", "executable": "/home/kevinh/development/meshtastic/meshtastic-esp32/.pio/build/tbeam/firmware.elf",
"toolchainBinDir": "/home/kevinh/.platformio/packages/toolchain-gccarmnoneeabi/bin", "toolchainBinDir": "/home/kevinh/.platformio/packages/toolchain-xtensa32/bin",
"svdPath": "/home/kevinh/.platformio/platforms/nordicnrf52/misc/svd/nrf52840.svd",
"preLaunchTask": { "preLaunchTask": {
"type": "PlatformIO", "type": "PlatformIO",
"task": "Pre-Debug" "task": "Pre-Debug"
@ -25,9 +24,8 @@
"type": "platformio-debug", "type": "platformio-debug",
"request": "launch", "request": "launch",
"name": "PIO Debug (skip Pre-Debug)", "name": "PIO Debug (skip Pre-Debug)",
"executable": "/home/kevinh/development/meshtastic/meshtastic-esp32/.pio/build/bare/firmware.elf", "executable": "/home/kevinh/development/meshtastic/meshtastic-esp32/.pio/build/tbeam/firmware.elf",
"toolchainBinDir": "/home/kevinh/.platformio/packages/toolchain-gccarmnoneeabi/bin", "toolchainBinDir": "/home/kevinh/.platformio/packages/toolchain-xtensa32/bin",
"svdPath": "/home/kevinh/.platformio/platforms/nordicnrf52/misc/svd/nrf52840.svd",
"internalConsoleOptions": "openOnSessionStart" "internalConsoleOptions": "openOnSessionStart"
} }
] ]

3
platformio.ini
View File

@ -9,7 +9,7 @@
; https://docs.platformio.org/page/projectconf.html ; https://docs.platformio.org/page/projectconf.html
[platformio] [platformio]
default_envs = bare default_envs = tbeam
[common] [common]
; common is not currently used ; common is not currently used
@ -74,6 +74,7 @@ lib_deps =
https://github.com/meshtastic/arduino-fsm.git https://github.com/meshtastic/arduino-fsm.git
https://github.com/meshtastic/SparkFun_Ublox_Arduino_Library.git https://github.com/meshtastic/SparkFun_Ublox_Arduino_Library.git
https://github.com/meshtastic/SX126x-Arduino.git https://github.com/meshtastic/SX126x-Arduino.git
Ticker ; Needed for SX126x-Arduino on ESP32
; Common settings for ESP targes, mixin with extends = esp32_base ; Common settings for ESP targes, mixin with extends = esp32_base
[esp32_base] [esp32_base]

3
src/configuration.h
View File

@ -109,6 +109,8 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
// Leave undefined to disable our PMU IRQ handler // Leave undefined to disable our PMU IRQ handler
#define PMU_IRQ 35 #define PMU_IRQ 35
#define AXP192_SLAVE_ADDRESS 0x34
#elif defined(TBEAM_V07) #elif defined(TBEAM_V07)
// This string must exactly match the case used in release file names or the android updater won't work // This string must exactly match the case used in release file names or the android updater won't work
#define HW_VENDOR "tbeam0.7" #define HW_VENDOR "tbeam0.7"
@ -244,6 +246,5 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
// AXP192 (Rev1-specific options) // AXP192 (Rev1-specific options)
// ----------------------------------------------------------------------------- // -----------------------------------------------------------------------------
// #define AXP192_SLAVE_ADDRESS 0x34 // Now defined in axp20x.h
#define GPS_POWER_CTRL_CH 3 #define GPS_POWER_CTRL_CH 3
#define LORA_POWER_CTRL_CH 2 #define LORA_POWER_CTRL_CH 2

8
src/esp32/main-esp32.cpp
View File

@ -3,6 +3,7 @@
#include "PowerFSM.h" #include "PowerFSM.h"
#include "configuration.h" #include "configuration.h"
#include "main.h" #include "main.h"
#include "power.h"
#include "target_specific.h" #include "target_specific.h"
bool bluetoothOn; bool bluetoothOn;
@ -58,6 +59,13 @@ void getMacAddr(uint8_t *dmac)
} }
#ifdef TBEAM_V10 #ifdef TBEAM_V10
// FIXME. nasty hack cleanup how we load axp192
#undef AXP192_SLAVE_ADDRESS
#include "axp20x.h"
AXP20X_Class axp;
bool pmu_irq = false;
/// Reads power status to powerStatus singleton. /// Reads power status to powerStatus singleton.
// //
// TODO(girts): move this and other axp stuff to power.h/power.cpp. // TODO(girts): move this and other axp stuff to power.h/power.cpp.

10
src/main.cpp
View File

@ -42,17 +42,11 @@
#include "BluetoothUtil.h" #include "BluetoothUtil.h"
#endif #endif
#ifdef TBEAM_V10
#include "axp20x.h"
AXP20X_Class axp;
bool pmu_irq = false;
#endif
// We always create a screen object, but we only init it if we find the hardware // We always create a screen object, but we only init it if we find the hardware
meshtastic::Screen screen(SSD1306_ADDRESS); meshtastic::Screen screen(SSD1306_ADDRESS);
// Global power status singleton // Global power status singleton
static meshtastic::PowerStatus powerStatus; meshtastic::PowerStatus powerStatus;
bool ssd1306_found; bool ssd1306_found;
bool axp192_found; bool axp192_found;
@ -80,7 +74,7 @@ void scanI2Cdevice(void)
ssd1306_found = true; ssd1306_found = true;
DEBUG_MSG("ssd1306 display found\n"); DEBUG_MSG("ssd1306 display found\n");
} }
#ifdef TBEAM_V10 #ifdef AXP192_SLAVE_ADDRESS
if (addr == AXP192_SLAVE_ADDRESS) { if (addr == AXP192_SLAVE_ADDRESS) {
axp192_found = true; axp192_found = true;
DEBUG_MSG("axp192 PMU found\n"); DEBUG_MSG("axp192 PMU found\n");

2
src/power.h
View File

@ -16,3 +16,5 @@ struct PowerStatus {
}; };
} // namespace meshtastic } // namespace meshtastic
extern meshtastic::PowerStatus powerStatus;