diff --git a/platformio.ini b/platformio.ini index 92c94204c..9ad9c8905 100644 --- a/platformio.ini +++ b/platformio.ini @@ -101,7 +101,8 @@ lib_deps = extends = arduino_base upload_protocol = picotool board_build.core = earlephilhower -platform = https://github.com/maxgerhardt/platform-raspberrypi.git ; framework-arduinopico @ 1.50600.0+sha.6a1d13e9 +platform = https://github.com/maxgerhardt/platform-raspberrypi.git +platform_packages = framework-arduinopico @ https://github.com/earlephilhower/arduino-pico.git#6a1d13e960e0854da2bf328b1a5fc05481d89aba build_flags = ${arduino_base.build_flags} -D RP2040_PLATFORM diff --git a/variants/rpi_picow/PicoWBoard.h b/variants/rpi_picow/PicoWBoard.h index e64590f27..1660fe911 100644 --- a/variants/rpi_picow/PicoWBoard.h +++ b/variants/rpi_picow/PicoWBoard.h @@ -42,7 +42,11 @@ public: } const char* getManufacturerName() const override { + #if defined(PICO_RP2350) + return "Pico 2 W"; + #else return "Pico W"; + #endif } void reboot() override { diff --git a/variants/rpi_picow/platformio.ini b/variants/rpi_picow/platformio.ini index 9814f3971..94fc40aa3 100644 --- a/variants/rpi_picow/platformio.ini +++ b/variants/rpi_picow/platformio.ini @@ -56,8 +56,8 @@ build_src_filter = ${rpi_picow.build_src_filter} [env:PicoW_companion_radio_usb] extends = rpi_picow build_flags = ${rpi_picow.build_flags} - -D MAX_CONTACTS=100 - -D MAX_GROUP_CHANNELS=8 + -D MAX_CONTACTS=350 + -D MAX_GROUP_CHANNELS=40 -D ENABLE_USB_INTERFACE ; NOTE: DO NOT ENABLE --> -D MESH_PACKET_LOGGING=1 ; NOTE: DO NOT ENABLE --> -D MESH_DEBUG=1 @@ -70,33 +70,14 @@ lib_ignore = BLE [env:PicoW_companion_radio_ble] extends = rpi_picow build_flags = ${rpi_picow.build_flags} - -D MAX_CONTACTS=100 - -D MAX_GROUP_CHANNELS=8 + -D MAX_CONTACTS=350 + -D MAX_GROUP_CHANNELS=40 -D PIO_FRAMEWORK_ARDUINO_ENABLE_BLUETOOTH + -D ENABLE_WIFI_INTERFACE -D BLE_PIN_CODE=123456 -D BLE_DEBUG_LOGGING=1 ; -D MESH_PACKET_LOGGING=1 ; -D MESH_DEBUG=1 -build_src_filter = ${rpi_picow.build_src_filter} - + - +<../examples/companion_radio/*.cpp> -lib_deps = ${rpi_picow.lib_deps} - densaugeo/base64 @ ~1.4.0 - -; USB + WiFi + BLE together; the interface manager fans frames out to all of them -[env:PicoW_companion_radio] -extends = rpi_picow -build_flags = ${rpi_picow.build_flags} - -D MAX_CONTACTS=100 - -D MAX_GROUP_CHANNELS=8 - -D ENABLE_USB_INTERFACE - -D ENABLE_WIFI_INTERFACE - -D PIO_FRAMEWORK_ARDUINO_ENABLE_BLUETOOTH - -D BLE_PIN_CODE=123456 -; NOTE: DO NOT ENABLE --> -D BLE_DEBUG_LOGGING=1 (shares Serial with the USB interface) -; NOTE: DO NOT ENABLE --> -D WIFI_DEBUG_LOGGING=1 -; -D MESH_PACKET_LOGGING=1 -; -D MESH_DEBUG=1 build_src_filter = ${rpi_picow.build_src_filter} + + @@ -104,29 +85,11 @@ build_src_filter = ${rpi_picow.build_src_filter} lib_deps = ${rpi_picow.lib_deps} densaugeo/base64 @ ~1.4.0 -[env:PicoW_companion_radio_wifi] -extends = rpi_picow -build_flags = ${rpi_picow.build_flags} - -D ENABLE_WIFI_INTERFACE - -D MAX_CONTACTS=100 - -D MAX_GROUP_CHANNELS=8 - -D WIFI_DEBUG_LOGGING=1 - -D WIFI_SSID='""' ; no default network, configure with 'set wifi.ssid' / 'set wifi.pwd' - -D WIFI_PWD='""' -; -D MESH_PACKET_LOGGING=1 -; -D MESH_DEBUG=1 -build_src_filter = ${rpi_picow.build_src_filter} - + - +<../examples/companion_radio/*.cpp> -lib_deps = ${rpi_picow.lib_deps} - densaugeo/base64 @ ~1.4.0 -lib_ignore = BLE - [env:PicoW_terminal_chat] extends = rpi_picow build_flags = ${rpi_picow.build_flags} - -D MAX_CONTACTS=100 - -D MAX_GROUP_CHANNELS=1 + -D MAX_CONTACTS=350 + -D MAX_GROUP_CHANNELS=40 ; -D MESH_PACKET_LOGGING=1 ; -D MESH_DEBUG=1 build_src_filter = ${rpi_picow.build_src_filter} @@ -138,3 +101,87 @@ lib_deps = ${rpi_picow.lib_deps} extends = rpi_picow build_src_filter = ${rpi_picow.build_src_filter} +<../examples/kiss_modem/> + +[rpi_pico2w] +extends = rp2040_base +board = rpipico2w +board_build.core = earlephilhower +board_build.filesystem_size = 0.5m +build_flags = ${rpi_picow.build_flags} +build_src_filter = ${rpi_picow.build_src_filter} +lib_deps = ${rpi_picow.lib_deps} + +[env:Pico2W_repeater] +extends = rpi_pico2w +build_flags = ${rpi_pico2w.build_flags} + -D ADVERT_NAME='"Pico2W Repeater"' + -D ADVERT_LAT=0.0 + -D ADVERT_LON=0.0 + -D ADMIN_PASSWORD='"password"' + -D MAX_NEIGHBOURS=50 +; -D MESH_PACKET_LOGGING=1 +; -D MESH_DEBUG=1 +build_src_filter = ${rpi_pico2w.build_src_filter} + +<../examples/simple_repeater> + +[env:Pico2W_room_server] +extends = rpi_pico2w +build_flags = ${rpi_pico2w.build_flags} + -D ADVERT_NAME='"Test Room"' + -D ADVERT_LAT=0.0 + -D ADVERT_LON=0.0 + -D ADMIN_PASSWORD='"password"' + -D ROOM_PASSWORD='"hello"' +; -D MESH_PACKET_LOGGING=1 +; -D MESH_DEBUG=1 +build_src_filter = ${rpi_pico2w.build_src_filter} + +<../examples/simple_room_server> + +[env:Pico2W_companion_radio_usb] +extends = rpi_pico2w +build_flags = ${rpi_pico2w.build_flags} + -D MAX_CONTACTS=350 + -D MAX_GROUP_CHANNELS=40 + -D ENABLE_USB_INTERFACE +; NOTE: DO NOT ENABLE --> -D MESH_PACKET_LOGGING=1 +; NOTE: DO NOT ENABLE --> -D MESH_DEBUG=1 +build_src_filter = ${rpi_pico2w.build_src_filter} + +<../examples/companion_radio/*.cpp> +lib_deps = ${rpi_pico2w.lib_deps} + densaugeo/base64 @ ~1.4.0 +lib_ignore = BLE + +[env:Pico2W_companion_radio_ble] +extends = rpi_pico2w +build_flags = ${rpi_pico2w.build_flags} + -D MAX_CONTACTS=350 + -D MAX_GROUP_CHANNELS=40 + -D PIO_FRAMEWORK_ARDUINO_ENABLE_BLUETOOTH + -D ENABLE_WIFI_INTERFACE + -D BLE_PIN_CODE=123456 + -D BLE_DEBUG_LOGGING=1 +; -D MESH_PACKET_LOGGING=1 +; -D MESH_DEBUG=1 +build_src_filter = ${rpi_pico2w.build_src_filter} + + + + + +<../examples/companion_radio/*.cpp> +lib_deps = ${rpi_pico2w.lib_deps} + densaugeo/base64 @ ~1.4.0 + +[env:Pico2W_terminal_chat] +extends = rpi_pico2w +build_flags = ${rpi_pico2w.build_flags} + -D MAX_CONTACTS=350 + -D MAX_GROUP_CHANNELS=40 +; -D MESH_PACKET_LOGGING=1 +; -D MESH_DEBUG=1 +build_src_filter = ${rpi_pico2w.build_src_filter} + +<../examples/simple_secure_chat/main.cpp> +lib_deps = ${rpi_pico2w.lib_deps} + densaugeo/base64 @ ~1.4.0 + +[env:Pico2W_kiss_modem] +extends = rpi_pico2w +build_src_filter = ${rpi_pico2w.build_src_filter} + +<../examples/kiss_modem/>