mirror of
https://github.com/meshtastic/firmware.git
synced 2025-06-09 14:42:05 +00:00
Improve pio config.
Fix Nimble pin code issue. Address some PR comments.
This commit is contained in:
parent
5c2ee2bb9d
commit
7cad7d3864
@ -17,9 +17,7 @@ build_flags =
|
|||||||
-DMESHTASTIC_EXCLUDE_WEBSERVER
|
-DMESHTASTIC_EXCLUDE_WEBSERVER
|
||||||
;-DDEBUG_HEAP
|
;-DDEBUG_HEAP
|
||||||
; TEMP
|
; TEMP
|
||||||
-DHAS_BLUETOOTH=0
|
|
||||||
-DMESHTASTIC_EXCLUDE_PAXCOUNTER
|
-DMESHTASTIC_EXCLUDE_PAXCOUNTER
|
||||||
-DMESHTASTIC_EXCLUDE_BLUETOOTH
|
|
||||||
|
|
||||||
lib_deps =
|
lib_deps =
|
||||||
${arduino_base.lib_deps}
|
${arduino_base.lib_deps}
|
||||||
@ -32,6 +30,7 @@ lib_deps =
|
|||||||
https://github.com/meshtastic/ESP32_Codec2/archive/633326c78ac251c059ab3a8c430fcdf25b41672f.zip
|
https://github.com/meshtastic/ESP32_Codec2/archive/633326c78ac251c059ab3a8c430fcdf25b41672f.zip
|
||||||
# renovate: datasource=custom.pio depName=rweather/Crypto packageName=rweather/library/Crypto
|
# renovate: datasource=custom.pio depName=rweather/Crypto packageName=rweather/library/Crypto
|
||||||
rweather/Crypto@^0.4.0
|
rweather/Crypto@^0.4.0
|
||||||
|
https://github.com/h2zero/esp-nimble-cpp.git#2.2.1
|
||||||
|
|
||||||
build_src_filter =
|
build_src_filter =
|
||||||
${esp32_base.build_src_filter} -<mesh/http>
|
${esp32_base.build_src_filter} -<mesh/http>
|
||||||
|
@ -1,3 +1,6 @@
|
|||||||
|
# # This file configures the ESP-IDF framework for the ESP32 platform.
|
||||||
|
# It enables BLE functionality using NimBLE and optimizes for minimal power consumption and size.
|
||||||
|
# Refer to the ESP-IDF Kconfig documentation for more details: https://docs.espressif.com/projects/esp-idf/en/v5.1.6/esp32c6/api-reference/kconfig.html
|
||||||
# CONFIG_AUTOSTART_ARDUINO is not set
|
# CONFIG_AUTOSTART_ARDUINO is not set
|
||||||
# CONFIG_WS2812_LED_ENABLE is not set
|
# CONFIG_WS2812_LED_ENABLE is not set
|
||||||
CONFIG_FREERTOS_HZ=1000
|
CONFIG_FREERTOS_HZ=1000
|
||||||
|
@ -1415,7 +1415,7 @@ void loop()
|
|||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#if !defined(CONFIG_AUTOSTART_ARDUINO) && (ESP_IDF_VERSION_MAJOR * 100 + ESP_IDF_VERSION_MINOR * 10 + ESP_IDF_VERSION_PATCH) > 514
|
#if !defined(CONFIG_AUTOSTART_ARDUINO) && (ESP_IDF_VERSION_MAJOR * 100 + ESP_IDF_VERSION_MINOR * 10 + ESP_IDF_VERSION_PATCH) > 512
|
||||||
// Define app_main to bridge Arduino and ESP-IDF
|
// Define app_main to bridge Arduino and ESP-IDF
|
||||||
extern "C" void app_main(void)
|
extern "C" void app_main(void)
|
||||||
{
|
{
|
||||||
|
@ -122,7 +122,7 @@ class NimbleBluetoothServerCallback : public NimBLEServerCallbacks
|
|||||||
#endif
|
#endif
|
||||||
passkeyShowing = true;
|
passkeyShowing = true;
|
||||||
|
|
||||||
NimBLEDevice::injectPassKey(connInfo, passkey);
|
return passkey;
|
||||||
}
|
}
|
||||||
|
|
||||||
virtual void onAuthenticationComplete(NimBLEConnInfo &connInfo)
|
virtual void onAuthenticationComplete(NimBLEConnInfo &connInfo)
|
||||||
|
@ -1,19 +1,12 @@
|
|||||||
[env:seeed-xiao-esp32c6]
|
[env:seeed-xiao-esp32c6]
|
||||||
extends = esp32c6_base
|
extends = esp32c6_base
|
||||||
platform = https://github.com/pioarduino/platform-espressif32.git#d2f1607cb561cf3da3f2cc03ceb94d25255e6fe4
|
|
||||||
framework = arduino, espidf
|
framework = arduino, espidf
|
||||||
board = esp32-c6-devkitm-1
|
board = esp32-c6-devkitm-1
|
||||||
board_check = true
|
board_check = true
|
||||||
board_build.partitions = partition-table.csv
|
board_build.partitions = partition-table.csv
|
||||||
upload_protocol = esptool
|
upload_protocol = esptool
|
||||||
upload_speed = 921600
|
upload_speed = 921600
|
||||||
monitor_speed = 460800
|
|
||||||
monitor_filters = esp32_c3_exception_decoder
|
|
||||||
extra_scripts = pre:bin/platformio-custom.py
|
extra_scripts = pre:bin/platformio-custom.py
|
||||||
build_unflags =
|
|
||||||
-D HAS_BLUETOOTH
|
|
||||||
-D MESHTASTIC_EXCLUDE_BLUETOOTH
|
|
||||||
-D HAS_WIFI
|
|
||||||
build_flags =
|
build_flags =
|
||||||
${esp32c6_base.build_flags}
|
${esp32c6_base.build_flags}
|
||||||
-D PRIVATE_HW
|
-D PRIVATE_HW
|
||||||
@ -25,16 +18,3 @@ build_flags =
|
|||||||
-D MESHTASTIC_EXCLUDE_WEBSERVER
|
-D MESHTASTIC_EXCLUDE_WEBSERVER
|
||||||
-D MESHTASTIC_EXCLUDE_MQTT
|
-D MESHTASTIC_EXCLUDE_MQTT
|
||||||
-D CONFIG_NIMBLE_CPP_FREERTOS_TASK_BLOCK_BIT=1
|
-D CONFIG_NIMBLE_CPP_FREERTOS_TASK_BLOCK_BIT=1
|
||||||
|
|
||||||
board_build.embed_txtfiles =
|
|
||||||
managed_components/espressif__esp_insights/server_certs/https_server.crt
|
|
||||||
managed_components/espressif__esp_rainmaker/server_certs/rmaker_mqtt_server.crt
|
|
||||||
managed_components/espressif__esp_rainmaker/server_certs/rmaker_claim_service_server.crt
|
|
||||||
managed_components/espressif__esp_rainmaker/server_certs/rmaker_ota_server.crt
|
|
||||||
|
|
||||||
lib_deps =
|
|
||||||
${esp32c6_base.lib_deps}
|
|
||||||
https://github.com/h2zero/esp-nimble-cpp.git#2.2.1
|
|
||||||
|
|
||||||
lib_ignore =
|
|
||||||
${esp32c6_base.lib_ignore}
|
|
@ -40,4 +40,5 @@
|
|||||||
#undef GPS_RX_PIN
|
#undef GPS_RX_PIN
|
||||||
#undef GPS_TX_PIN
|
#undef GPS_TX_PIN
|
||||||
|
|
||||||
|
// For BLE/WiFi connectivity
|
||||||
#define USE_XIAO_ESP32C6_EXTERNAL_ANTENNA
|
#define USE_XIAO_ESP32C6_EXTERNAL_ANTENNA
|
@ -1,41 +1,20 @@
|
|||||||
[env:tlora-c6]
|
[env:tlora-c6]
|
||||||
extends = esp32c6_base
|
extends = esp32c6_base
|
||||||
platform = https://github.com/pioarduino/platform-espressif32.git#f5d602fa7b4b778604306a149fe474723e79be2d
|
|
||||||
framework = arduino, espidf
|
framework = arduino, espidf
|
||||||
board = esp32-c6-devkitm-1
|
board = esp32-c6-devkitm-1
|
||||||
|
board_check = true
|
||||||
board_build.partitions = partition-table.csv
|
board_build.partitions = partition-table.csv
|
||||||
upload_protocol = esptool
|
upload_protocol = esptool
|
||||||
upload_speed = 921600
|
upload_speed = 921600
|
||||||
monitor_speed = 460800
|
|
||||||
monitor_filters = esp32_c3_exception_decoder
|
|
||||||
extra_scripts = pre:bin/platformio-custom.py
|
extra_scripts = pre:bin/platformio-custom.py
|
||||||
|
|
||||||
build_unflags =
|
|
||||||
-D HAS_BLUETOOTH
|
|
||||||
-D MESHTASTIC_EXCLUDE_BLUETOOTH
|
|
||||||
-D HAS_WIFI
|
|
||||||
|
|
||||||
build_flags =
|
build_flags =
|
||||||
${esp32c6_base.build_flags}
|
${esp32c6_base.build_flags}
|
||||||
-D TLORA_C6
|
-D TLORA_C6
|
||||||
-I variants/tlora_c6
|
-I variants/tlora_c6
|
||||||
-DARDUINO_USB_CDC_ON_BOOT=1
|
-D ARDUINO_USB_CDC_ON_BOOT=1
|
||||||
-DARDUINO_USB_MODE=1
|
-D ARDUINO_USB_MODE=1
|
||||||
-L "${platformio.libdeps_dir}/${this.__env__}/bsec2/src/esp32c3"
|
-L "${platformio.libdeps_dir}/${this.__env__}/bsec2/src/esp32c3"
|
||||||
-D HAS_BLUETOOTH=1
|
-D HAS_BLUETOOTH=1
|
||||||
-D MESHTASTIC_EXCLUDE_WEBSERVER
|
-D MESHTASTIC_EXCLUDE_WEBSERVER
|
||||||
-D MESHTASTIC_EXCLUDE_MQTT
|
-D MESHTASTIC_EXCLUDE_MQTT
|
||||||
-D CONFIG_NIMBLE_CPP_FREERTOS_TASK_BLOCK_BIT=1
|
-D CONFIG_NIMBLE_CPP_FREERTOS_TASK_BLOCK_BIT=1
|
||||||
|
|
||||||
board_build.embed_txtfiles =
|
|
||||||
managed_components/espressif__esp_insights/server_certs/https_server.crt
|
|
||||||
managed_components/espressif__esp_rainmaker/server_certs/rmaker_mqtt_server.crt
|
|
||||||
managed_components/espressif__esp_rainmaker/server_certs/rmaker_claim_service_server.crt
|
|
||||||
managed_components/espressif__esp_rainmaker/server_certs/rmaker_ota_server.crt
|
|
||||||
|
|
||||||
lib_deps =
|
|
||||||
${esp32c6_base.lib_deps}
|
|
||||||
https://github.com/h2zero/esp-nimble-cpp.git#2.0.2
|
|
||||||
|
|
||||||
lib_ignore =
|
|
||||||
${esp32c6_base.lib_ignore}
|
|
||||||
|
Loading…
Reference in New Issue
Block a user