mirror
/
MeshCore
mirror of https://github.com/meshcore-dev/MeshCore
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

resolve conflict

pull/87/head
Florent de Lamotte 1 year ago
parent
4cfdb0ef7c
commit
dc4a139f88
1 changed files with 0 additions and 1 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 1
      platformio.ini

1
platformio.ini
View File

@ -781,7 +781,6 @@ build_flags = ${nrf52840_t1000e.build_flags}
-D RADIO_CLASS=CustomLR1110 -D RADIO_CLASS=CustomLR1110
-D WRAPPER_CLASS=CustomLR1110Wrapper -D WRAPPER_CLASS=CustomLR1110Wrapper
-D MAX_LORA_TX_POWER=22 -D MAX_LORA_TX_POWER=22
-D LORA_TX_POWER=22
build_src_filter = ${nrf52840_t1000e.build_src_filter} build_src_filter = ${nrf52840_t1000e.build_src_filter}
+<helpers/*.cpp> +<helpers/*.cpp>
+<helpers/nrf52/T1000eBoard.cpp> +<helpers/nrf52/T1000eBoard.cpp>

Write Preview
Loading…
Cancel
Save