Created
June 7, 2019 02:30
-
-
Save pdp7/b898803d32894d83f5ab156d4295d621 to your computer and use it in GitHub Desktop.
diff
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
pdp7@sp3:~/dev/macchina/watchdog$ git diff src/ | |
diff --git a/src/exti.h b/src/exti.h | |
index 0715fba..c93d290 100644 | |
--- a/src/exti.h | |
+++ b/src/exti.h | |
@@ -9,6 +9,7 @@ | |
#include <libopencm3/cm3/scb.h> | |
#include "hal.h" | |
diff --git a/src/exti.h b/src/exti.h | |
index 0715fba..c93d290 100644 | |
--- a/src/exti.h | |
+++ b/src/exti.h | |
@@ -9,6 +9,7 @@ | |
#include <libopencm3/cm3/scb.h> | |
#include "hal.h" | |
+#include "comms.h" | |
#define check_interrupt(pin) ((EXTI_PR & pin & wakeup_mask) != 0) | |
#define WRITE_BUF_LEN 8 | |
@@ -22,4 +23,4 @@ extern volatile bool should_power_off; | |
extern volatile bool should_use_internal_power; | |
extern volatile bool should_use_car_power; | |
-#endif | |
\ No newline at end of file | |
+#endif | |
diff --git a/src/hal.c b/src/hal.c | |
index b0f749f..408034a 100644 | |
--- a/src/hal.c | |
+++ b/src/hal.c | |
@@ -145,6 +145,7 @@ void i2c_setup(void) | |
i2c_peripheral_enable(I2C1); | |
// i2c_enable_ack(I2C1); | |
+ I2C1_OAR1 |= I2C_OAR1_OA1EN_ENABLE; | |
} | |
void adc_setup(void) |
Author
pdp7
commented
Jun 7, 2019
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment