diff options
| -rw-r--r-- | .github/workflows/main.yml | 6 | ||||
| -rw-r--r-- | README.md | 6 | ||||
| -rw-r--r-- | bootloader/ota-dfu-python/nrf_ble_dfu_controller.py | 2 | ||||
| -rw-r--r-- | src/CMakeLists.txt | 2 |
4 files changed, 8 insertions, 8 deletions
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 6768146..81926a9 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -30,7 +30,7 @@ jobs: # Download and Cache Dependencies - name: Install cmake - uses: lukka/get-cmake@v3.18.0 + uses: lukka/get-cmake@v3.18.3 - name: Check cache for Embedded Arm Toolchain arm-none-eabi-gcc id: cache-toolchain @@ -142,7 +142,7 @@ jobs: - name: Upload DFU package uses: actions/upload-artifact@v2 with: - name: pinetime-mcuboot-app-dfu.zip + name: pinetime-mcuboot-app-dfu path: build/src/pinetime-mcuboot-app-dfu/* ######################################################################################### @@ -168,4 +168,4 @@ jobs: find . -name "pinetime-mcuboot-app.*" -ls # Embedded Arm Toolchain and nRF5 SDK will only be cached if the build succeeds. -# So make sure that the first build always succeeds, e.g. comment out the "Make" step.
\ No newline at end of file +# So make sure that the first build always succeeds, e.g. comment out the "Make" step. @@ -69,9 +69,9 @@ As of now, here is the list of achievements of this project: - [Memory analysis](./doc/MemoryAnalysis.md) ### Using the firmware - - [Integration with Gadgetbridge](doc/CompanionApps/Gadgetbridge.md) - - [Integration with AmazFish](doc/CompanionApps/Amazfish.md) - - [Firmware update, OTA](doc/CompanionApps/NrfconnectOTA.md) + - [Integration with Gadgetbridge](doc/companionapps/Gadgetbridge.md) + - [Integration with AmazFish](doc/companionapps/Amazfish.md) + - [Firmware update, OTA](doc/companionapps/NrfconnectOTA.md) ## TODO - contribute diff --git a/bootloader/ota-dfu-python/nrf_ble_dfu_controller.py b/bootloader/ota-dfu-python/nrf_ble_dfu_controller.py index 85de15a..ef61fa3 100644 --- a/bootloader/ota-dfu-python/nrf_ble_dfu_controller.py +++ b/bootloader/ota-dfu-python/nrf_ble_dfu_controller.py @@ -162,7 +162,7 @@ class NrfBleDfuController(object, metaclass=ABCMeta): self.ble_conn.sendline('characteristics') try: - self.ble_conn.expect([uuid], timeout=2) + self.ble_conn.expect([uuid], timeout=10) handles = re.findall(b'.*handle: (0x....),.*char value handle: (0x....)', self.ble_conn.before) (handle, value_handle) = handles[-1] except pexpect.TIMEOUT as e: diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 6c9ce24..254fabc 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -713,7 +713,7 @@ if (USE_JLINK) ) add_custom_target("FLASH_${EXECUTABLE_NAME}" DEPENDS ${EXECUTABLE_NAME} - COMMAND ${NRFJPROG} --program ${EXECUTABLE_NAME}.hex -f ${NRF_TARGET} --sectorerase + COMMAND ${NRFJPROG} --program ${EXECUTABLE_FILE_NAME}.hex -f ${NRF_TARGET} --sectorerase COMMAND sleep 0.5s COMMAND ${NRFJPROG} --reset -f ${NRF_TARGET} COMMENT "flashing ${EXECUTABLE_NAME}.hex" |