scott/InfiniTime
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases 1 Wiki Activity

Merge branch 'develop' of https://github.com/JF002/Pinetime into MultiFaceClock

Browse source
This commit is contained in:
Joaquim 2021-02-25 09:28:25 +00:00
parent 8c53d0b70b 8a48850afd
commit ee6ce64571
1 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/CMakeLists.txt
View file

@ -889,7 +889,7 @@ if (USE_JLINK)
COMMAND ${NRFJPROG} --program ${EXECUTABLE_FILE_NAME}.hex -f ${NRF_TARGET} --sectorerase COMMAND ${NRFJPROG} --program ${EXECUTABLE_FILE_NAME}.hex -f ${NRF_TARGET} --sectorerase
COMMAND sleep 0.5s COMMAND sleep 0.5s
COMMAND ${NRFJPROG} --reset -f ${NRF_TARGET} COMMAND ${NRFJPROG} --reset -f ${NRF_TARGET}
COMMENT "flashing ${EXECUTABLE_NAME}.hex" COMMENT "flashing ${EXECUTABLE_FILE_NAME}.hex"
) )
elseif (USE_GDB_CLIENT) elseif (USE_GDB_CLIENT)
@ -899,8 +899,8 @@ elseif (USE_GDB_CLIENT)
) )
add_custom_target("FLASH_${EXECUTABLE_NAME}" add_custom_target("FLASH_${EXECUTABLE_NAME}"
DEPENDS ${EXECUTABLE_NAME} DEPENDS ${EXECUTABLE_NAME}
COMMAND ${GDB_CLIENT_BIN_PATH} -nx --batch -ex 'target extended-remote ${GDB_CLIENT_TARGET_REMOTE}' -ex 'monitor swdp_scan' -ex 'attach 1' -ex 'load' -ex 'kill' ${EXECUTABLE_NAME}.hex COMMAND ${GDB_CLIENT_BIN_PATH} -nx --batch -ex 'target extended-remote ${GDB_CLIENT_TARGET_REMOTE}' -ex 'monitor swdp_scan' -ex 'attach 1' -ex 'load' -ex 'kill' ${EXECUTABLE_FILE_NAME}.hex
COMMENT "flashing ${EXECUTABLE_NAME}.hex" COMMENT "flashing ${EXECUTABLE_FILE_NAME}.hex"
) )
elseif (USE_OPENOCD) elseif (USE_OPENOCD)
if (USE_CMSIS_DAP) if (USE_CMSIS_DAP)
@ -925,10 +925,10 @@ elseif (USE_OPENOCD)
-c 'transport select swd' -c 'transport select swd'
-c 'source [find target/nrf52.cfg]' -c 'source [find target/nrf52.cfg]'
-c 'halt' -c 'halt'
-c "program \"${EXECUTABLE_NAME}.hex\"" -c "program \"${EXECUTABLE_FILE_NAME}.hex\""
-c 'reset' -c 'reset'
-c 'shutdown' -c 'shutdown'
COMMENT "flashing ${EXECUTABLE_NAME}.hex" COMMENT "flashing ${EXECUTABLE_BIN_NAME}.hex"
) )
else () else ()
add_custom_target(FLASH_ERASE add_custom_target(FLASH_ERASE
@ -937,8 +937,8 @@ elseif (USE_OPENOCD)
) )
add_custom_target("FLASH_${EXECUTABLE_NAME}" add_custom_target("FLASH_${EXECUTABLE_NAME}"
DEPENDS ${EXECUTABLE_NAME} DEPENDS ${EXECUTABLE_NAME}
COMMAND ${OPENOCD_BIN_PATH} -c "tcl_port disabled" -c "gdb_port 3333" -c "telnet_port 4444" -f interface/stlink.cfg -c 'transport select hla_swd' -f target/nrf52.cfg -c "program \"${EXECUTABLE_NAME}.hex\"" -c reset -c shutdown COMMAND ${OPENOCD_BIN_PATH} -c "tcl_port disabled" -c "gdb_port 3333" -c "telnet_port 4444" -f interface/stlink.cfg -c 'transport select hla_swd' -f target/nrf52.cfg -c "program \"${EXECUTABLE_FILE_NAME}.hex\"" -c reset -c shutdown
COMMENT "flashing ${EXECUTABLE_NAME}.hex" COMMENT "flashing ${EXECUTABLE_FILE_NAME}.hex"
) )
endif () endif ()
endif () endif ()