diff options
author | Jean-François Milants <jf@codingfield.com> | 2021-07-13 20:31:26 +0200 |
---|---|---|
committer | Jean-François Milants <jf@codingfield.com> | 2021-07-13 20:31:26 +0200 |
commit | 3e705548442f1f208c2092ffc865ae824ee0955a (patch) | |
tree | 7385ab23e93eb7746cf459c64679ddcdaff4fc41 /doc | |
parent | e21f6a7f414d1f832e8fddfeaab3b9de05aa3459 (diff) | |
parent | 4f378e8726fdcff72598aa6ed12eeaa6b3e61355 (diff) |
Merge branch 'develop' into notify-battery-level
# Conflicts:
# src/displayapp/screens/BatteryInfo.cpp
Diffstat (limited to 'doc')
-rw-r--r-- | doc/buildAndProgram.md | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/doc/buildAndProgram.md b/doc/buildAndProgram.md index afd526e0..5fe593ae 100644 --- a/doc/buildAndProgram.md +++ b/doc/buildAndProgram.md @@ -27,7 +27,7 @@ CMake configures the project according to variables you specify the command line **NRFJPROG**|Path to the NRFJProg executable. Used only if `USE_JLINK` is 1.|`-DNRFJPROG=/opt/nrfjprog/nrfjprog` **GDB_CLIENT_BIN_PATH**|Path to arm-none-eabi-gdb executable. Used only if `USE_GDB_CLIENT` is 1.|`-DGDB_CLIENT_BIN_PATH=/home/jf/nrf52/gcc-arm-none-eabi-9-2019-q4-major/bin/arm-none-eabi-gdb` **GDB_CLIENT_TARGET_REMOTE**|Target remote connection string. Used only if `USE_GDB_CLIENT` is 1.|`-DGDB_CLIENT_TARGET_REMOTE=/dev/ttyACM0` -**BUILD_DFU (\*\*)**|Build DFU files while building (needs [adafruit-nrfutil](https://github.com/adafruit/Adafruit_nRF52_nrfutil)).|`-BUILD_DFU=1` +**BUILD_DFU (\*\*)**|Build DFU files while building (needs [adafruit-nrfutil](https://github.com/adafruit/Adafruit_nRF52_nrfutil)).|`-DBUILD_DFU=1` ####(**) Note about **CMAKE_BUILD_TYPE**: By default, this variable is set to *Release*. It compiles the code with size and speed optimizations. We use this value for all the binaries we publish when we [release](https://github.com/JF002/InfiniTime/releases) new versions of InfiniTime. |