summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorRiku Isokoski <riksu9000@gmail.com>2021-08-10 18:02:51 (GMT)
committerRiku Isokoski <riksu9000@gmail.com>2021-08-10 18:02:51 (GMT)
commit7e92577c14895f57f5adda27ad54adbbc4b7ffe9 (patch)
tree673e2ac43f65a78d478c6b9f847cefbe8025f161 /src
parentf1346f098ee2aa5bf59c91fa9f1a42a93c5d9c45 (diff)
Revert "Merge branch 'unblock_i2c' into develop"
This reverts commit 275a84b3238874d213271f4287e6c1c5bfcb4353, reversing changes made to 9fb37550886f09f6510e99a5b452262c53c3987c.
Diffstat (limited to 'src')
-rw-r--r--src/main.cpp15
1 files changed, 0 insertions, 15 deletions
diff --git a/src/main.cpp b/src/main.cpp
index 9a5b0cf..62e4446 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -5,7 +5,6 @@
#include <libraries/gpiote/app_gpiote.h>
#include <libraries/timer/app_timer.h>
#include <softdevice/common/nrf_sdh.h>
-#include <nrf_delay.h>
// nimble
#define min // workaround: nimble's min/max macros conflict with libstdc++
@@ -306,20 +305,6 @@ int main(void) {
nrf_drv_clock_init();
- // Unblock i2c?
- nrf_gpio_cfg(pinTwiScl,
- NRF_GPIO_PIN_DIR_OUTPUT,
- NRF_GPIO_PIN_INPUT_DISCONNECT,
- NRF_GPIO_PIN_NOPULL,
- NRF_GPIO_PIN_S0D1,
- NRF_GPIO_PIN_NOSENSE);
- nrf_gpio_pin_set(pinTwiScl);
- for (uint8_t i = 0; i < 16; i++) {
- nrf_gpio_pin_toggle(pinTwiScl);
- nrf_delay_us(5);
- }
- nrf_gpio_cfg_default(pinTwiScl);
-
debounceTimer = xTimerCreate("debounceTimer", 200, pdFALSE, (void*) 0, DebounceTimerCallback);
debounceChargeTimer = xTimerCreate("debounceTimerCharge", 200, pdFALSE, (void*) 0, DebounceTimerChargeCallback);