Просмотр исходного кода

Merge commit 'e9ffc3ea93d7912460c38cbaafb726f5455ad8cf' into new-companion-ui

Merging ikoka stick repeater/room server commit to simplify pull request later.
kelsey hudson 1 год назад
Родитель
Сommit
0359df6cb5
1 измененных файлов с 3 добавлено и 14 удалено
  1. 3 14
      variants/ikoka_stick_nrf/platformio.ini

+ 3 - 14
variants/ikoka_stick_nrf/platformio.ini

@@ -93,12 +93,6 @@ lib_deps =
   ${ikoka_stick_nrf.lib_deps}
   densaugeo/base64 @ ~1.4.0
 
-[env:ikoka_stick_nrf_alt_pinout_companion_radio_ble]
-extends = env:ikoka_stick_nrf_companion_radio_ble
-build_flags =
-  ${env:ikoka_stick_nrf_companion_radio_ble.build_flags}
-  -D SX1262_XIAO_S3_VARIANT
-
 [env:ikoka_stick_nrf_repeater]
 extends = ikoka_stick_nrf
 build_flags =
@@ -111,13 +105,8 @@ build_flags =
 ;  -D MESH_PACKET_LOGGING=1
 ;  -D MESH_DEBUG=1
 build_src_filter = ${ikoka_stick_nrf.build_src_filter}
-  +<../examples/simple_repeater/main.cpp>
-
-[env:ikoka_stick_nrf_alt_pinout_repeater]
-extends = env:ikoka_stick_nrf_repeater
-build_flags =
-  ${env:ikoka_stick_nrf_repeater.build_flags}
-  -D SX1262_XIAO_S3_VARIANT
+  +<helpers/ui/SSD1306Display.cpp>
+  +<../examples/simple_repeater>
 
 [env:ikoka_stick_nrf_room_server]
 extends = ikoka_stick_nrf
@@ -130,4 +119,4 @@ build_flags =
 ;  -D MESH_PACKET_LOGGING=1
 ;  -D MESH_DEBUG=1
 build_src_filter = ${ikoka_stick_nrf.build_src_filter}
-  +<../examples/simple_room_server/main.cpp>
+  +<../examples/simple_room_server>