diff options
author | JF <jf@codingfield.com> | 2020-05-24 16:58:29 +0200 |
---|---|---|
committer | Gitea <gitea@fake.local> | 2020-05-24 16:58:29 +0200 |
commit | 82b4ddc25b4c7913e0e6a13a209a4415dff044f1 (patch) | |
tree | 8eeafef1f4150a1cf238ee80e53c8901b0ec67af /src/libs/mynewt-nimble/porting | |
parent | be1ad9b07083e656a649d223750ff4b14b781b7b (diff) | |
parent | 073717980f5c00f553ac3b58a50b792b32a14c7a (diff) |
Merge branch 'nimble-ota' of JF/PineTime into develop
Diffstat (limited to 'src/libs/mynewt-nimble/porting')
-rw-r--r-- | src/libs/mynewt-nimble/porting/nimble/include/logcfg/logcfg.h | 2 | ||||
-rw-r--r-- | src/libs/mynewt-nimble/porting/nimble/include/syscfg/syscfg.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/libs/mynewt-nimble/porting/nimble/include/logcfg/logcfg.h b/src/libs/mynewt-nimble/porting/nimble/include/logcfg/logcfg.h index 6119ecfa..983f419f 100644 --- a/src/libs/mynewt-nimble/porting/nimble/include/logcfg/logcfg.h +++ b/src/libs/mynewt-nimble/porting/nimble/include/logcfg/logcfg.h @@ -14,7 +14,7 @@ #define BLE_HS_LOG_INFO(...) NRF_LOG_INFO(__VA_ARGS__) #define BLE_HS_LOG_WARN(...) NRF_LOG_WARNING( __VA_ARGS__) #define BLE_HS_LOG_ERROR(...) NRF_LOG_ERROR(__VA_ARGS__) -#define BLE_HS_LOG_CRITICAL(...) MODLOG_CRITICAL(4, __VA_ARGS__) +#define BLE_HS_LOG_CRITICAL(...) NRF_LOG_ERROR(__VA_ARGS__) #define BLE_HS_LOG_DISABLED(...) MODLOG_DISABLED(4, __VA_ARGS__) #endif #if 0 diff --git a/src/libs/mynewt-nimble/porting/nimble/include/syscfg/syscfg.h b/src/libs/mynewt-nimble/porting/nimble/include/syscfg/syscfg.h index d4913caf..d06056eb 100644 --- a/src/libs/mynewt-nimble/porting/nimble/include/syscfg/syscfg.h +++ b/src/libs/mynewt-nimble/porting/nimble/include/syscfg/syscfg.h @@ -460,7 +460,7 @@ /* Overridden by @apache-mynewt-nimble/targets/riot (defined by @apache-mynewt-core/kernel/os) */ #ifndef MYNEWT_VAL_MSYS_1_BLOCK_COUNT -#define MYNEWT_VAL_MSYS_1_BLOCK_COUNT (5) +#define MYNEWT_VAL_MSYS_1_BLOCK_COUNT (12) #endif /* Overridden by @apache-mynewt-nimble/targets/riot (defined by @apache-mynewt-core/kernel/os) */ |