pohui_pohui/firmware
1
0
Fork 0
mirror of https://github.com/meshtastic/firmware.git synced 2025-06-18 11:02:16 +00:00
Code Issues Actions 5 Packages Projects Releases Wiki Activity

Merge branch 'master' into tft-gui-work

Browse Source
This commit is contained in:
Jonathan Bennett 2024-05-02 13:56:24 -05:00 committed by GitHub
commit cc13540db8
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 22 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
arch/portduino/portduino.ini
View File

@ -1,6 +1,6 @@
; The Portduino based sim environment on top of any host OS, all hardware will be simulated ; The Portduino based sim environment on top of any host OS, all hardware will be simulated
[portduino_base] [portduino_base]
platform = https://github.com/meshtastic/platform-native.git#784007630ca43b4811c6637606440588bb5acf39 platform = https://github.com/meshtastic/platform-native.git#9881bf3721d610cccacf5ae8e3a07839cce75d63
framework = arduino framework = arduino
build_src_filter = build_src_filter =
@ -34,4 +34,4 @@ build_flags =
-DPORTDUINO_LINUX_HARDWARE -DPORTDUINO_LINUX_HARDWARE
-lbluetooth -lbluetooth
-lgpiod -lgpiod
-lyaml-cpp -lyaml-cpp

1
boards/tbeam-s3-core.json
View File

@ -7,6 +7,7 @@
"extra_flags": [ "extra_flags": [
"-DBOARD_HAS_PSRAM", "-DBOARD_HAS_PSRAM",
"-DLILYGO_TBEAM_S3_CORE", "-DLILYGO_TBEAM_S3_CORE",
"-DARDUINO_USB_CDC_ON_BOOT=1",
"-DARDUINO_USB_MODE=1", "-DARDUINO_USB_MODE=1",
"-DARDUINO_RUNNING_CORE=1", "-DARDUINO_RUNNING_CORE=1",
"-DARDUINO_EVENT_RUNNING_CORE=1" "-DARDUINO_EVENT_RUNNING_CORE=1"

34
src/platform/portduino/PortduinoGlue.cpp
View File

@ -75,20 +75,20 @@ void portduinoSetup()
{ {
printf("Setting up Meshtastic on Portduino...\n"); printf("Setting up Meshtastic on Portduino...\n");
int max_GPIO = 0; int max_GPIO = 0;
int GPIO_lines[] = {cs, configNames GPIO_lines[] = {cs,
irq, irq,
busy, busy,
reset, reset,
txen, txen,
rxen, rxen,
displayDC, displayDC,
displayCS, displayCS,
displayBacklight, displayBacklight,
displayBacklightPWMChannel, displayBacklightPWMChannel,
displayReset, displayReset,
touchscreenCS, touchscreenCS,
touchscreenIRQ, touchscreenIRQ,
user}; user};
std::string gpioChipName = "gpiochip"; std::string gpioChipName = "gpiochip";
settingsStrings[i2cdev] = ""; settingsStrings[i2cdev] = "";
@ -281,9 +281,9 @@ void portduinoSetup()
exit(EXIT_FAILURE); exit(EXIT_FAILURE);
} }
for (int i : GPIO_lines) { for (configNames i : GPIO_lines) {
if (i > max_GPIO) if (settingsMap[i] > max_GPIO)
max_GPIO = i; max_GPIO = settingsMap[i];
} }
gpioInit(max_GPIO + 1); // Done here so we can inform Portduino how many GPIOs we need. gpioInit(max_GPIO + 1); // Done here so we can inform Portduino how many GPIOs we need.

2
variants/tbeam-s3-core/platformio.ini
View File

@ -3,6 +3,8 @@
extends = esp32s3_base extends = esp32s3_base
board = tbeam-s3-core board = tbeam-s3-core
platform_packages = framework-arduinoespressif32 @ https://github.com/espressif/arduino-esp32.git#2.0.15
lib_deps = lib_deps =
${esp32s3_base.lib_deps} ${esp32s3_base.lib_deps}
lewisxhe/PCF8563_Library@1.0.1 lewisxhe/PCF8563_Library@1.0.1