From 4371b7fecced6b222dfa02cb71ecbb4ff54b6785 Mon Sep 17 00:00:00 2001 From: Avamander Date: Sat, 30 Jan 2021 19:11:07 +0200 Subject: Update CMakeLists.txt --- src/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src') diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 5955d393..4580609a 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -610,7 +610,7 @@ include_directories( "${NRF5_SDK_PATH}/modules/nrfx/drivers/include" "${NRF5_SDK_PATH}/modules/nrfx/hal" "${NRF5_SDK_PATH}/modules/nrfx/mdk" - ${NRF5_SDK_PATH}/external/freertos/source/include + "${NRF5_SDK_PATH}/external/freertos/source/include" "${NRF5_SDK_PATH}/components/toolchain/cmsis/include" "${NRF5_SDK_PATH}/components/libraries/atomic" "${NRF5_SDK_PATH}/components/libraries/atomic_fifo" -- cgit v1.2.3-70-g09d2 From 51ff9d5e7bce66bc864bf6e807b0c4dbc6f2231b Mon Sep 17 00:00:00 2001 From: Jean-François Milants Date: Sun, 31 Jan 2021 20:50:04 +0100 Subject: Normalize all the line endings --- bootloader/ota-dfu-python/unpacker.py | 2 +- .../mynewt-nimble/nimble/host/pts/tpg/94654-20170317-085122560.tpg | 4 ++-- .../mynewt-nimble/nimble/host/pts/tpg/94654-20170317-085441153.pts | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) (limited to 'src') diff --git a/bootloader/ota-dfu-python/unpacker.py b/bootloader/ota-dfu-python/unpacker.py index 960ef9de..ab2ecbc5 100644 --- a/bootloader/ota-dfu-python/unpacker.py +++ b/bootloader/ota-dfu-python/unpacker.py @@ -13,7 +13,7 @@ class Unpacker(object): # #-------------------------------------------------------------------------- def entropy(self, length): - return ''.join(random.choice('abcdefghijklmnopqrstuvwxyz') for i in range (length)) + return ''.join(random.choice('abcdefghijklmnopqrstuvwxyz') for i in range (length)) #-------------------------------------------------------------------------- # diff --git a/src/libs/mynewt-nimble/nimble/host/pts/tpg/94654-20170317-085122560.tpg b/src/libs/mynewt-nimble/nimble/host/pts/tpg/94654-20170317-085122560.tpg index f5bb0ce9..3cc985fa 100644 --- a/src/libs/mynewt-nimble/nimble/host/pts/tpg/94654-20170317-085122560.tpg +++ b/src/libs/mynewt-nimble/nimble/host/pts/tpg/94654-20170317-085122560.tpg @@ -1,4 +1,4 @@ - + M'&/JP\$+#X83?)"[ M2E=\N*7*U 5)JSKT(5#=>@^/#]IP*[GTZ0%0]$F(/$ MEK[V7>349??;!JZJNFZ CK=QGD^FOYV^FU>"DK<@0U*##HV\H9&_%["5IK@1 MA9F,FJO2P^3:4_]04%-0T%9=^XCMWKF"L$[)%)G>_I 0Q?@:H)&1HX)7VY&. @@ -1023,4 +1023,4 @@ M<74&Z:0BS4[#$;M2_1""EZVO@$B^"0'V'W:7^@-]G?*\B>0M(- M6MF1FM+ ?,?3[N*1EI"$AXF#@6P-FU/4\QF?O!&%CE5*6J2'@QDYV?_04-O) M7Z 6N;C7E_4 + diff --git a/src/libs/mynewt-nimble/nimble/host/pts/tpg/94654-20170317-085441153.pts b/src/libs/mynewt-nimble/nimble/host/pts/tpg/94654-20170317-085441153.pts index 92507b13..6760d5ec 100644 --- a/src/libs/mynewt-nimble/nimble/host/pts/tpg/94654-20170317-085441153.pts +++ b/src/libs/mynewt-nimble/nimble/host/pts/tpg/94654-20170317-085441153.pts @@ -286,4 +286,4 @@ 7
3
- + -- cgit v1.2.3-70-g09d2