From 4ca8846c2f1241ef683c78e7c15d79417df0461f Mon Sep 17 00:00:00 2001 From: linagee Date: Sat, 1 Jan 2022 12:05:19 -0700 Subject: [PATCH 1/4] Don't commit vim swap files to repo --- .gitignore | 3 +++ bin/.promote-release.sh.swp | Bin 12288 -> 0 bytes 2 files changed, 3 insertions(+) delete mode 100644 bin/.promote-release.sh.swp diff --git a/.gitignore b/.gitignore index 40bba6f69..3d181a39a 100644 --- a/.gitignore +++ b/.gitignore @@ -23,3 +23,6 @@ flash.uf2 cmake-build* __pycache__ +*.swp +*.swo +*~ diff --git a/bin/.promote-release.sh.swp b/bin/.promote-release.sh.swp deleted file mode 100644 index 0dddde02b17cd4bae1d425c6efcf64ae2f262208..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 12288 zcmeI&ON$dh5CGtcSMh=Vfif$IxXC2ZgBKA*(cnhKN6yWoe32?g%@aySUb#Qb5Uru^(v@BGp$)~AZ zZT8^B_>QrKo{T2r9Sc8f4$L09qFs`WA$x4%lQz$m6m(P}nqr_ymD%iUT++%El;y@| zjdx2IY2c|Q6=)drj%+d|0wS<2Z~<;l#-sGzUjG_iz4B&zT1Fxu0wN#+A|L`HAOa#F z0{^u@YFO z^#A|n_y6}x0N*%1b9~}39Gc@k$4!o(y#7bG&!@f8L_h>YKmYKmV?Bc>Ue{(aTrU=g;0_(*{i?Mu(M&y3O~y9#s*IvjKy4ZC#>u$Cwl5t*J|6 zD~y`3^lA}t^C%o~xDKv*uz;HB5JiFR5-`R)54sjOp(v5$aiG`bd}yaOb^++>o44}ImO!9 z>JXq~(S~a+ylEoxCui$ZTsV*X3Z81$kPmpwe9F_NmZV^bRT4?s(WM+B&K%#Z4QW&9 R?2X9l*mzxgpojxP_ziF4!36*S From 12f1fda934fa62854e4079f0ecbfb41d551c1069 Mon Sep 17 00:00:00 2001 From: linagee Date: Tue, 4 Jan 2022 18:32:58 -0700 Subject: [PATCH 2/4] NimBLE: less debugging data, no more constant stream of hex esp_nimble_cfg.h and syscfg/syscfg.h were providing the default previously. This should get rid of: ble_sm_alg_s1() and messages like that proving low-level BLE data. --- platformio.ini | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/platformio.ini b/platformio.ini index fa1e8f622..218e65020 100644 --- a/platformio.ini +++ b/platformio.ini @@ -106,7 +106,7 @@ upload_speed = 921600 debug_init_break = tbreak setup build_flags = ${arduino_base.build_flags} -Wall -Wextra -Isrc/esp32 -Isrc/esp32-mfix-esp32-psram-cache-issue -lnimble -std=c++11 - -DLOG_LOCAL_LEVEL=ESP_LOG_DEBUG -DCORE_DEBUG_LEVEL=ARDUHAL_LOG_LEVEL_DEBUG + -DLOG_LOCAL_LEVEL=ESP_LOG_DEBUG -DCORE_DEBUG_LEVEL=ARDUHAL_LOG_LEVEL_DEBUG -DMYNEWT_VAL_BLE_HS_LOG_LVL=4 -DAXP_DEBUG_PORT=Serial lib_deps = ${arduino_base.lib_deps} From 1157419e0527756b9bdea310975ac64a02d25396 Mon Sep 17 00:00:00 2001 From: linagee Date: Tue, 4 Jan 2022 18:38:05 -0700 Subject: [PATCH 3/4] Constants are better than magic numbers --- platformio.ini | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/platformio.ini b/platformio.ini index 218e65020..e4f4807c9 100644 --- a/platformio.ini +++ b/platformio.ini @@ -106,7 +106,7 @@ upload_speed = 921600 debug_init_break = tbreak setup build_flags = ${arduino_base.build_flags} -Wall -Wextra -Isrc/esp32 -Isrc/esp32-mfix-esp32-psram-cache-issue -lnimble -std=c++11 - -DLOG_LOCAL_LEVEL=ESP_LOG_DEBUG -DCORE_DEBUG_LEVEL=ARDUHAL_LOG_LEVEL_DEBUG -DMYNEWT_VAL_BLE_HS_LOG_LVL=4 + -DLOG_LOCAL_LEVEL=ESP_LOG_DEBUG -DCORE_DEBUG_LEVEL=ARDUHAL_LOG_LEVEL_DEBUG -DMYNEWT_VAL_BLE_HS_LOG_LVL=LOG_LEVEL_CRITICAL -DAXP_DEBUG_PORT=Serial lib_deps = ${arduino_base.lib_deps} From a8d10329f863738ce7bb480ff43fb18c32e29886 Mon Sep 17 00:00:00 2001 From: linagee Date: Tue, 4 Jan 2022 18:58:56 -0700 Subject: [PATCH 4/4] Added some platformio.ini comments --- platformio.ini | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/platformio.ini b/platformio.ini index e4f4807c9..7d2ac6b44 100644 --- a/platformio.ini +++ b/platformio.ini @@ -104,6 +104,10 @@ src_filter = ${arduino_base.src_filter} - upload_speed = 921600 debug_init_break = tbreak setup + +# Remove -DMYNEWT_VAL_BLE_HS_LOG_LVL=LOG_LEVEL_CRITICAL for low level BLE logging. +# See library directory for BLE logging possible values: .pio/libdeps/tbeam/NimBLE-Arduino/src/log_common/log_common.h +# This overrides the BLE logging default of LOG_LEVEL_INFO (1) from: .pio/libdeps/tbeam/NimBLE-Arduino/src/esp_nimble_cfg.h build_flags = ${arduino_base.build_flags} -Wall -Wextra -Isrc/esp32 -Isrc/esp32-mfix-esp32-psram-cache-issue -lnimble -std=c++11 -DLOG_LOCAL_LEVEL=ESP_LOG_DEBUG -DCORE_DEBUG_LEVEL=ARDUHAL_LOG_LEVEL_DEBUG -DMYNEWT_VAL_BLE_HS_LOG_LVL=LOG_LEVEL_CRITICAL