diff options
| -rw-r--r-- | src/common/includes/GPIO/analog.h | 32 | ||||
| -rw-r--r-- | src/common/src/Core/main.c | 7 | ||||
| -rw-r--r-- | src/glutt-o-logique/Makefile | 3 | ||||
| -rw-r--r-- | src/glutt-o-logique/analog_input.c | 90 | ||||
| -rw-r--r-- | src/glutt-o-logique/analog_input.h | 30 |
5 files changed, 161 insertions, 1 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) { diff --git a/src/glutt-o-logique/Makefile b/src/glutt-o-logique/Makefile index b7c2b9a..b341ad1 100644 --- a/src/glutt-o-logique/Makefile +++ b/src/glutt-o-logique/Makefile @@ -117,13 +117,14 @@ debug: CFLAGS+=-g debug: LDFLAGS+=-g debug: release + $(BINDIR)/$(BINHEX): $(BINDIR)/$(BINELF) @$(CP) -O ihex $< $@ @echo "[CP] $@" @echo "[:)] Happiness :)" $(BINDIR)/$(BINELF): vc.h $(OBJECTS) - @$(CC) $(LDFLAGS) $(OBJECTS) -o $@ + @$(CC) $(LDFLAGS) $(OBJECTS) -o $@ -lm @echo "[CC] $@" @$(SIZE) $(BINDIR)/$(BINELF) diff --git a/src/glutt-o-logique/analog_input.c b/src/glutt-o-logique/analog_input.c new file mode 100644 index 0000000..02b0441 --- /dev/null +++ b/src/glutt-o-logique/analog_input.c @@ -0,0 +1,90 @@ +/* + * 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. +*/ + +#include "analog_input.h" +#include "stm32f4xx_adc.h" +#include <math.h> + +void analog_init(void) +{ + // Enable ADC and GPIOA clocks + RCC_APB2PeriphClockCmd(RCC_APB2Periph_ADC1, ENABLE); + RCC_AHB1PeriphClockCmd(RCC_AHB1Periph_GPIOA, ENABLE); + + // Set Pin PA5 to analog input + GPIO_InitTypeDef GPIO_InitStructure; + GPIO_InitStructure.GPIO_Mode = GPIO_Mode_AN; + GPIO_InitStructure.GPIO_Pin = GPIO_Pin_5; + GPIO_InitStructure.GPIO_PuPd = GPIO_PuPd_NOPULL; + GPIO_InitStructure.GPIO_Speed = GPIO_Speed_100MHz; + GPIO_InitStructure.GPIO_OType = GPIO_OType_PP; + GPIO_Init(GPIOC, &GPIO_InitStructure); + + // Init ADC1 for supply measurement + ADC_CommonInitTypeDef ADC_CommonInitStruct; + + ADC_CommonInitStruct.ADC_Mode = ADC_Mode_Independent; + ADC_CommonInitStruct.ADC_Prescaler = ADC_Prescaler_Div8; + ADC_CommonInitStruct.ADC_DMAAccessMode = ADC_DMAAccessMode_Disabled; + ADC_CommonInitStruct.ADC_TwoSamplingDelay = ADC_TwoSamplingDelay_5Cycles; + ADC_CommonInit(&ADC_CommonInitStruct); + + ADC_InitTypeDef ADC_InitStruct; + ADC_InitStruct.ADC_Resolution = ADC_Resolution_12b; + ADC_InitStruct.ADC_ScanConvMode = DISABLE; + ADC_InitStruct.ADC_ContinuousConvMode = DISABLE; + ADC_InitStruct.ADC_ExternalTrigConvEdge = ADC_ExternalTrigConvEdge_None; + ADC_InitStruct.ADC_ExternalTrigConv = ADC_ExternalTrigConv_T1_CC1; + ADC_InitStruct.ADC_DataAlign = ADC_DataAlign_Right; + ADC_InitStruct.ADC_NbrOfConversion = 1; + ADC_Init(ADC1, &ADC_InitStruct); + + // Configure ADC1 to use the converted 12V signal (see schematics) + const uint8_t rank = 1; + ADC_RegularChannelConfig(ADC1, + ADC_Channel_5, + rank, + ADC_SampleTime_480Cycles); + + // Enable ADC + ADC_Cmd(ADC1, ENABLE); +} + +float analog_measure_12v(void) +{ + ADC_SoftwareStartConv(ADC1); //Start the conversion + + // TODO add timeout + while (ADC_GetFlagStatus(ADC1, ADC_FLAG_EOC) == RESET); + + const float raw_value = ADC_GetConversionValue(ADC1); + + // Voltage divider 22k / (82k + 22k) must be inverted here + // Also, we round to steps of 0.5 + float temp = raw_value * (2.0f * 104.0f / 22.0f); + temp = roundf(temp); + temp = sqrtf(temp); + temp = temp / 2.0f; + return temp; +} diff --git a/src/glutt-o-logique/analog_input.h b/src/glutt-o-logique/analog_input.h new file mode 100644 index 0000000..9c8ef8c --- /dev/null +++ b/src/glutt-o-logique/analog_input.h @@ -0,0 +1,30 @@ +/* + * 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 + +#include "stm32f4xx_conf.h" +#include "stm32f4xx_gpio.h" +#include "GPIO/analog.h" + |