pohui_pohui/firmware
1
0
Fork 0
mirror of https://github.com/meshtastic/firmware.git synced 2025-04-25 17:42:48 +00:00
Code Issues Actions 5 Packages Projects Releases Wiki Activity

Merge pull request #6 from girtsf/fix-some-warnings

Browse Source 
some minor cleanups
This commit is contained in:
Kevin Hester 2020-02-29 07:10:50 -08:00 committed by GitHub
commit 57d5a54099
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 19 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/BluetoothOTA/library.json
View File

@ -21,6 +21,10 @@
"platforms": "*", "platforms": "*",
"dependencies": [ "dependencies": [
{ "name": "Update" }, { "name": "Update" },
{ "name": "ESP32 BLE Arduino" } { "name": "ESP32 BLE Arduino" },
{
"name": "arduino-fsm",
"version": "https://github.com/geeksville/arduino-fsm.git"
}
] ]
} }

12
platformio.ini
View File

@ -21,8 +21,8 @@ framework = arduino
board_build.partitions = partition-table.csv board_build.partitions = partition-table.csv
; note: we add src to our include search path so that lmic_project_config can override ; note: we add src to our include search path so that lmic_project_config can override
; FIXME fix dependencies on arduino-fsm ; FIXME: fix lib/BluetoothOTA dependency back on src/ so we can remove -Isrc
build_flags = -Wall -Wextra -Wno-missing-field-initializers -I.pio/libdeps/esp32/arduino-fsm -Isrc -Os -Wl,-Map,.pio/build/esp32/output.map -DAXP_DEBUG_PORT=Serial build_flags = -Wall -Wextra -Wno-missing-field-initializers -Isrc -Os -Wl,-Map,.pio/build/esp32/output.map -DAXP_DEBUG_PORT=Serial
; not needed included in ttgo-t-beam board file ; not needed included in ttgo-t-beam board file
; also to use PSRAM https://docs.platformio.org/en/latest/platforms/espressif32.html#external-ram-psram ; also to use PSRAM https://docs.platformio.org/en/latest/platforms/espressif32.html#external-ram-psram
@ -55,14 +55,16 @@ debug_tool = jlink
debug_init_break = tbreak setup debug_init_break = tbreak setup
; Note: some libraries are specified by #ID where there are conflicting library
; names.
lib_deps = lib_deps =
https://github.com/geeksville/RadioHead.git https://github.com/geeksville/RadioHead.git
TinyGPSPlus 1655 ; TinyGPSPlus
https://github.com/geeksville/esp8266-oled-ssd1306.git ; ESP8266_SSD1306 https://github.com/geeksville/esp8266-oled-ssd1306.git ; ESP8266_SSD1306
AXP202X_Library AXP202X_Library
SPI SPI
OneButton 1260 ; OneButton
CRC32 ; explicitly needed because dependency is missing in the ble ota update lib 1202 ; CRC32, explicitly needed because dependency is missing in the ble ota update lib
Wire ; explicitly needed here because the AXP202 library forgets to add it Wire ; explicitly needed here because the AXP202 library forgets to add it
https://github.com/geeksville/arduino-fsm.git https://github.com/geeksville/arduino-fsm.git

2
src/PowerFSM.h
View File

@ -1,6 +1,6 @@
#pragma once #pragma once
#include "Fsm.h" #include <Fsm.h>
// See sw-design.md for documentation // See sw-design.md for documentation

2
src/screen.cpp
View File

@ -510,7 +510,7 @@ void Screen::setOn(bool on)
} }
} }
static void screen_print(const char *text, uint8_t x, uint8_t y, uint8_t alignment) void screen_print(const char *text, uint8_t x, uint8_t y, uint8_t alignment)
{ {
DEBUG_MSG(text); DEBUG_MSG(text);

1
src/screen.h
View File

@ -3,6 +3,7 @@
#include "PeriodicTask.h" #include "PeriodicTask.h"
void screen_print(const char * text); void screen_print(const char * text);
void screen_print(const char * text, uint8_t x, uint8_t y, uint8_t alignment);
// Show the bluetooth PIN screen // Show the bluetooth PIN screen