diff options
| author | hassless <85612141+hassless@users.noreply.github.com> | 2021-06-18 15:17:26 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-06-18 15:17:26 (GMT) |
| commit | 84a6c88e98d8b1420edbddd7b67a38737bf5cbb2 (patch) | |
| tree | b10cab7ef1a7645fa897aabb179c2e8849a919d7 /src/drivers/TwiMaster.cpp | |
| parent | d0df278b0be2aae0493d901569a094dba221ce99 (diff) | |
| parent | e90e8c7426f9a44e696b208a5b393a60476a3d43 (diff) | |
Merge branch 'JF002:develop' into improve-battery-percentage-to-battery-icon-mapping
Diffstat (limited to 'src/drivers/TwiMaster.cpp')
| -rw-r--r-- | src/drivers/TwiMaster.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/drivers/TwiMaster.cpp b/src/drivers/TwiMaster.cpp index 7b6582d..fc9edf8 100644 --- a/src/drivers/TwiMaster.cpp +++ b/src/drivers/TwiMaster.cpp @@ -9,10 +9,12 @@ using namespace Pinetime::Drivers; // TODO use DMA/IRQ TwiMaster::TwiMaster(const Modules module, const Parameters& params) : module {module}, params {params} { - mutex = xSemaphoreCreateBinary(); } void TwiMaster::Init() { + if(mutex == nullptr) + mutex = xSemaphoreCreateBinary(); + NRF_GPIO->PIN_CNF[params.pinScl] = ((uint32_t) GPIO_PIN_CNF_DIR_Input << GPIO_PIN_CNF_DIR_Pos) | ((uint32_t) GPIO_PIN_CNF_INPUT_Connect << GPIO_PIN_CNF_INPUT_Pos) | ((uint32_t) GPIO_PIN_CNF_PULL_Pullup << GPIO_PIN_CNF_PULL_Pos) | ((uint32_t) GPIO_PIN_CNF_DRIVE_S0D1 << GPIO_PIN_CNF_DRIVE_Pos) | |