mirror of
https://github.com/meshcore-dev/MeshCore.git
synced 2026-04-20 22:13:47 +00:00
resolve conflict
This commit is contained in:
parent
4cfdb0ef7c
commit
dc4a139f88
1 changed files with 0 additions and 1 deletions
|
|
@ -781,7 +781,6 @@ build_flags = ${nrf52840_t1000e.build_flags}
|
|||
-D RADIO_CLASS=CustomLR1110
|
||||
-D WRAPPER_CLASS=CustomLR1110Wrapper
|
||||
-D MAX_LORA_TX_POWER=22
|
||||
-D LORA_TX_POWER=22
|
||||
build_src_filter = ${nrf52840_t1000e.build_src_filter}
|
||||
+<helpers/*.cpp>
|
||||
+<helpers/nrf52/T1000eBoard.cpp>
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue