aboutsummaryrefslogtreecommitdiffstats
path: root/src/common
diff options
context:
space:
mode:
authorMatthias P. Braendli <matthias.braendli@mpb.li>2016-06-12 12:47:58 +0200
committerMatthias P. Braendli <matthias.braendli@mpb.li>2016-06-12 12:47:58 +0200
commit486e5fa41b892333ec73ae8475b3605b3e35640f (patch)
tree84193f96cbcedbf928dfbde2fb12e3b8042067c2 /src/common
parent6510a291af9a06e3c0d23ec461cf65301ab6e7b9 (diff)
downloadglutte-o-matic-486e5fa41b892333ec73ae8475b3605b3e35640f.tar.gz
glutte-o-matic-486e5fa41b892333ec73ae8475b3605b3e35640f.tar.bz2
glutte-o-matic-486e5fa41b892333ec73ae8475b3605b3e35640f.zip
Add analog readout code for supply monitoring
Diffstat (limited to 'src/common')
-rw-r--r--src/common/includes/GPIO/analog.h32
-rw-r--r--src/common/src/Core/main.c7
2 files changed, 39 insertions, 0 deletions
diff --git a/src/common/includes/GPIO/analog.h b/src/common/includes/GPIO/analog.h
new file mode 100644
index 0000000..99404f6
--- /dev/null
+++ b/src/common/includes/GPIO/analog.h
@@ -0,0 +1,32 @@
+/*
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2016 Matthias P. Braendli, Maximilien Cuony
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+*/
+
+#pragma once
+
+void analog_init(void);
+
+/* Measure the 12V supply voltage, in 0.5V increments.
+ * Returns 0.0f in case of error */
+float analog_measure_12v(void);
+
diff --git a/src/common/src/Core/main.c b/src/common/src/Core/main.c
index d23cda7..9fe84ab 100644
--- a/src/common/src/Core/main.c
+++ b/src/common/src/Core/main.c
@@ -45,6 +45,7 @@
#include "Core/delay.h"
#include "GPIO/temperature.h"
#include "GPIO/leds.h"
+#include "GPIO/analog.h"
#include "vc.h"
@@ -117,6 +118,9 @@ static void launcher_task(void __attribute__ ((unused))*pvParameters)
usart_debug_puts("PIO init\r\n");
pio_init();
+ usart_debug_puts("Analog init\r\n");
+ analog_init();
+
usart_debug_puts("I2C init\r\n");
i2c_init();
@@ -233,6 +237,9 @@ static void detect_button_press(void __attribute__ ((unused))*pvParameters)
} else {
usart_debug_puts("No temp\r\n");
}
+
+ const float supply_voltage = analog_measure_12v();
+ usart_debug("12V monitor %f\r\n", supply_voltage);
}
else if (pin_high_count == 0 &&
last_pin_high_count != pin_high_count) {