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

fix STM32 builds

Browse Source
This commit is contained in:
Thomas Göttgens 2024-10-25 15:41:22 +02:00
parent 379ad9b919
commit a6ea4c56ac
4 changed files with 22 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
arch/stm32/stm32.ini
View File

@ -22,7 +22,22 @@ build_flags =
-fdata-sections -fdata-sections
build_src_filter = build_src_filter =
${arduino_base.build_src_filter} -<platform/esp32/> -<nimble/> -<mesh/api/> -<mesh/wifi/> -<mesh/http/> -<modules/esp32> -<mesh/eth/> -<input> -<buzz> -<modules/RemoteHardwareModule.cpp> -<platform/nrf52> -<platform/portduino> -<platform/rp2xx0> -<mesh/raspihttp> ${arduino_base.build_src_filter}
-<platform/esp32/>
-<nimble/>
-<mesh/api/>
-<mesh/wifi/>
-<mesh/http/>
-<modules/esp32>
-<mesh/eth/>
-<input>
-<buzz>
-<modules/RemoteHardwareModule.cpp>
-<platform/nrf52>
-<platform/portduino>
-<platform/rp2xx0>
-<mesh/raspihttp>
-<.pio/*/*/I2CKeyPad/*>
board_upload.offset_address = 0x08000000 board_upload.offset_address = 0x08000000
upload_protocol = stlink upload_protocol = stlink
@ -33,5 +48,5 @@ lib_deps =
https://github.com/caveman99/Crypto.git#f61ae26a53f7a2d0ba5511625b8bf8eff3a35d5e https://github.com/caveman99/Crypto.git#f61ae26a53f7a2d0ba5511625b8bf8eff3a35d5e
lib_ignore = lib_ignore =
mathertel/OneButton@~2.6.1 Wire
Wire I2CKeyPad

2
platformio.ini
View File

@ -96,7 +96,7 @@ lib_deps =
https://github.com/meshtastic/ArduinoThread.git#1ae8778c85d0a2a729f989e0b1e7d7c4dc84eef0 https://github.com/meshtastic/ArduinoThread.git#1ae8778c85d0a2a729f989e0b1e7d7c4dc84eef0
nanopb/Nanopb@^0.4.9 nanopb/Nanopb@^0.4.9
erriez/ErriezCRC32@^1.0.1 erriez/ErriezCRC32@^1.0.1
robtillaart/I2CKeyPad@^0.4.0 ; port extender with keymatrix robtillaart/I2CKeyPad@^0.5.0 ; port extender with keymatrix
; Used for the code analysis in PIO Home / Inspect ; Used for the code analysis in PIO Home / Inspect
check_tool = cppcheck check_tool = cppcheck

2
src/detect/ScanI2CTwoWire.cpp
View File

@ -247,7 +247,7 @@ void ScanI2CTwoWire::scanPort(I2CPort port, uint8_t *address, uint8_t asize)
SCAN_SIMPLE_CASE(ST7567_ADDRESS, SCREEN_ST7567, "st7567 display found"); SCAN_SIMPLE_CASE(ST7567_ADDRESS, SCREEN_ST7567, "st7567 display found");
#ifndef HAS_TCA9535 #ifndef HAS_TCA9535
SCAN_SIMPLE_CASE(PCF8574A_ADDRESS, PCF8574A, "PCF8574A based keyboard found\n"); SCAN_SIMPLE_CASE(PCF8574A_ADDRESS, PCF8574A, "PCF8574A based keyboard found");
#endif #endif
#ifdef HAS_NCP5623 #ifdef HAS_NCP5623
SCAN_SIMPLE_CASE(NCP5623_ADDR, NCP5623, "NCP5623 RGB LED found"); SCAN_SIMPLE_CASE(NCP5623_ADDR, NCP5623, "NCP5623 RGB LED found");

4
src/input/peMatrixBase.cpp
View File

@ -6,7 +6,7 @@
extern ScanI2C::DeviceAddress cardkb_found; extern ScanI2C::DeviceAddress cardkb_found;
extern uint8_t kb_model; extern uint8_t kb_model;
I2CKeyPad keyPad(cardkb_found.address); I2CKeyPad keyPad(cardkb_found.address, cardkb_found.port == ScanI2C::WIRE1 ? &Wire1 : &Wire);
PeMatrixBase::PeMatrixBase(const char *name) : concurrency::OSThread(name) PeMatrixBase::PeMatrixBase(const char *name) : concurrency::OSThread(name)
{ {
@ -24,7 +24,7 @@ int32_t PeMatrixBase::runOnce()
// This is the first time the OSThread library has called this function, so do port setup // This is the first time the OSThread library has called this function, so do port setup
firstTime = 0; firstTime = 0;
if (!keyPad.begin()) { if (!keyPad.begin()) {
LOG_ERROR("Failed to initialize I2C keypad\n"); LOG_ERROR("Failed to initialize I2C keypad");
return disable(); return disable();
} }
keyPad.loadKeyMap(keymap); keyPad.loadKeyMap(keymap);