From 86428716d531d10261170eb990e6f60938e3cfd7 Mon Sep 17 00:00:00 2001 From: Fabien Poussin Date: Mon, 6 Feb 2017 20:09:28 +0100 Subject: Adding COMP Driver. --- testhal/STM32/STM32F3xx/COMP/main.c | 68 +++++++++++++++++++++++++++++++++++++ 1 file changed, 68 insertions(+) create mode 100644 testhal/STM32/STM32F3xx/COMP/main.c (limited to 'testhal/STM32/STM32F3xx/COMP/main.c') diff --git a/testhal/STM32/STM32F3xx/COMP/main.c b/testhal/STM32/STM32F3xx/COMP/main.c new file mode 100644 index 0000000..dfea2cc --- /dev/null +++ b/testhal/STM32/STM32F3xx/COMP/main.c @@ -0,0 +1,68 @@ +/* + ChibiOS - Copyright (C) 2006..2015 Giovanni Di Sirio + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +*/ + +#include "ch.h" +#include "hal.h" + +static const EXTConfig extcfg = { + { + {EXT_CH_MODE_DISABLED, NULL}, + {EXT_CH_MODE_DISABLED, NULL}, + {EXT_CH_MODE_DISABLED, NULL}, + {EXT_CH_MODE_DISABLED, NULL}, + {EXT_CH_MODE_DISABLED, NULL}, + {EXT_CH_MODE_DISABLED, NULL}, + {EXT_CH_MODE_DISABLED, NULL}, + {EXT_CH_MODE_DISABLED, NULL}, + {EXT_CH_MODE_DISABLED, NULL}, + {EXT_CH_MODE_DISABLED, NULL}, + {EXT_CH_MODE_DISABLED, NULL}, + {EXT_CH_MODE_DISABLED, NULL}, + {EXT_CH_MODE_DISABLED, NULL}, + {EXT_CH_MODE_DISABLED, NULL}, + {EXT_CH_MODE_DISABLED, NULL}, + {EXT_CH_MODE_DISABLED, NULL}, + {EXT_CH_MODE_DISABLED, NULL}, + {EXT_CH_MODE_DISABLED, NULL}, + {EXT_CH_MODE_DISABLED, NULL}, + {EXT_CH_MODE_DISABLED, NULL}, + {EXT_CH_MODE_DISABLED, NULL}, + {EXT_CH_MODE_DISABLED, NULL}, + {EXT_CH_MODE_DISABLED, NULL} + } +}; + + +/* + * Application entry point. + */ +int main(void) { + + halInit(); + chSysInit(); + + extStart(&EXTD1, &extcfg); + //compStart(&COMPD2, &comp2_conf); + + /* + * Normal main() thread activity, it resets the watchdog. + */ + while (true) { + palToggleLine(LINE_LED4_BLUE); + chThdSleepMilliseconds(500); + } + return 0; +} -- cgit v1.2.3 From 7059c87ab4f237187bab6db709280de3a6b8ea6b Mon Sep 17 00:00:00 2001 From: Fabien Poussin Date: Tue, 7 Feb 2017 10:58:11 +0100 Subject: [COMP] Fixing headers, missing includes. --- testhal/STM32/STM32F3xx/COMP/main.c | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) (limited to 'testhal/STM32/STM32F3xx/COMP/main.c') diff --git a/testhal/STM32/STM32F3xx/COMP/main.c b/testhal/STM32/STM32F3xx/COMP/main.c index dfea2cc..5b377aa 100644 --- a/testhal/STM32/STM32F3xx/COMP/main.c +++ b/testhal/STM32/STM32F3xx/COMP/main.c @@ -45,6 +45,18 @@ static const EXTConfig extcfg = { } }; +static const COMPConfig comp2_conf = { + COMP_OUTPUT_NORMAL, + NULL, + 0 +}; + +static const COMPConfig comp4_conf = { + COMP_OUTPUT_INVERTED, + NULL, + 0 +}; + /* * Application entry point. @@ -55,7 +67,8 @@ int main(void) { chSysInit(); extStart(&EXTD1, &extcfg); - //compStart(&COMPD2, &comp2_conf); + compStart(&COMPD2, &comp2_conf); + compStart(&COMPD4, &comp4_conf); /* * Normal main() thread activity, it resets the watchdog. -- cgit v1.2.3 From f4687bd298290f54574f213406c21b6d7c38511c Mon Sep 17 00:00:00 2001 From: Fabien Poussin Date: Tue, 7 Feb 2017 15:20:28 +0100 Subject: [Comp] Cleaning example, removing dependencies and adding checks. --- testhal/STM32/STM32F3xx/COMP/main.c | 48 +++++++++++++------------------------ 1 file changed, 16 insertions(+), 32 deletions(-) (limited to 'testhal/STM32/STM32F3xx/COMP/main.c') diff --git a/testhal/STM32/STM32F3xx/COMP/main.c b/testhal/STM32/STM32F3xx/COMP/main.c index 5b377aa..83a00ff 100644 --- a/testhal/STM32/STM32F3xx/COMP/main.c +++ b/testhal/STM32/STM32F3xx/COMP/main.c @@ -17,44 +17,30 @@ #include "ch.h" #include "hal.h" -static const EXTConfig extcfg = { - { - {EXT_CH_MODE_DISABLED, NULL}, - {EXT_CH_MODE_DISABLED, NULL}, - {EXT_CH_MODE_DISABLED, NULL}, - {EXT_CH_MODE_DISABLED, NULL}, - {EXT_CH_MODE_DISABLED, NULL}, - {EXT_CH_MODE_DISABLED, NULL}, - {EXT_CH_MODE_DISABLED, NULL}, - {EXT_CH_MODE_DISABLED, NULL}, - {EXT_CH_MODE_DISABLED, NULL}, - {EXT_CH_MODE_DISABLED, NULL}, - {EXT_CH_MODE_DISABLED, NULL}, - {EXT_CH_MODE_DISABLED, NULL}, - {EXT_CH_MODE_DISABLED, NULL}, - {EXT_CH_MODE_DISABLED, NULL}, - {EXT_CH_MODE_DISABLED, NULL}, - {EXT_CH_MODE_DISABLED, NULL}, - {EXT_CH_MODE_DISABLED, NULL}, - {EXT_CH_MODE_DISABLED, NULL}, - {EXT_CH_MODE_DISABLED, NULL}, - {EXT_CH_MODE_DISABLED, NULL}, - {EXT_CH_MODE_DISABLED, NULL}, - {EXT_CH_MODE_DISABLED, NULL}, - {EXT_CH_MODE_DISABLED, NULL} +void comp2_cb(COMPDriver *comp) { + + if (comp->reg->CSR & COMP_CSR_COMPxOUT) { + + } -}; + +} + +void comp4_cb(COMPDriver *comp) { + (void) comp; + +} static const COMPConfig comp2_conf = { COMP_OUTPUT_NORMAL, - NULL, - 0 + comp2_cb, + COMP_CSR_COMPxINSEL_0 | COMP_CSR_COMPxOUTSEL_0 // CSR }; static const COMPConfig comp4_conf = { COMP_OUTPUT_INVERTED, - NULL, - 0 + comp4_cb, + COMP_CSR_COMPxINSEL_0 | COMP_CSR_COMPxOUTSEL_1 // CSR }; @@ -66,7 +52,6 @@ int main(void) { halInit(); chSysInit(); - extStart(&EXTD1, &extcfg); compStart(&COMPD2, &comp2_conf); compStart(&COMPD4, &comp4_conf); @@ -74,7 +59,6 @@ int main(void) { * Normal main() thread activity, it resets the watchdog. */ while (true) { - palToggleLine(LINE_LED4_BLUE); chThdSleepMilliseconds(500); } return 0; -- cgit v1.2.3 From 1d10f06ab48c8d7a52f50825097aade45710fb10 Mon Sep 17 00:00:00 2001 From: Fabien Poussin Date: Tue, 7 Feb 2017 15:37:20 +0100 Subject: [Comp] Adding init, helper defines. --- testhal/STM32/STM32F3xx/COMP/main.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'testhal/STM32/STM32F3xx/COMP/main.c') diff --git a/testhal/STM32/STM32F3xx/COMP/main.c b/testhal/STM32/STM32F3xx/COMP/main.c index 83a00ff..06b35d3 100644 --- a/testhal/STM32/STM32F3xx/COMP/main.c +++ b/testhal/STM32/STM32F3xx/COMP/main.c @@ -34,13 +34,13 @@ void comp4_cb(COMPDriver *comp) { static const COMPConfig comp2_conf = { COMP_OUTPUT_NORMAL, comp2_cb, - COMP_CSR_COMPxINSEL_0 | COMP_CSR_COMPxOUTSEL_0 // CSR + STM32_COMP_InvertingInput_VREFINT // CSR }; static const COMPConfig comp4_conf = { COMP_OUTPUT_INVERTED, comp4_cb, - COMP_CSR_COMPxINSEL_0 | COMP_CSR_COMPxOUTSEL_1 // CSR + STM32_COMP_InvertingInput_1_2VREFINT | COMP_CSR_COMPxOUTSEL_1 // CSR }; -- cgit v1.2.3 From 8b7e318d784ff0c724c3564dc4313ba14061223e Mon Sep 17 00:00:00 2001 From: Fabien Poussin Date: Tue, 7 Feb 2017 15:46:43 +0100 Subject: [Comp] Adding more defines --- testhal/STM32/STM32F3xx/COMP/main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'testhal/STM32/STM32F3xx/COMP/main.c') diff --git a/testhal/STM32/STM32F3xx/COMP/main.c b/testhal/STM32/STM32F3xx/COMP/main.c index 06b35d3..eb1e1c0 100644 --- a/testhal/STM32/STM32F3xx/COMP/main.c +++ b/testhal/STM32/STM32F3xx/COMP/main.c @@ -34,7 +34,7 @@ void comp4_cb(COMPDriver *comp) { static const COMPConfig comp2_conf = { COMP_OUTPUT_NORMAL, comp2_cb, - STM32_COMP_InvertingInput_VREFINT // CSR + STM32_COMP_InvertingInput_VREFINT || STM32_COMP_Hysteresis_High // CSR }; static const COMPConfig comp4_conf = { -- cgit v1.2.3 From 4ffde4b17e7d74924e38531422e9af999110b92c Mon Sep 17 00:00:00 2001 From: Fabien Poussin Date: Thu, 9 Feb 2017 12:30:21 +0100 Subject: [Comp] Adding interrupt functions, updating example. --- testhal/STM32/STM32F3xx/COMP/main.c | 114 ++++++++++++++++++++++++++++++------ 1 file changed, 97 insertions(+), 17 deletions(-) (limited to 'testhal/STM32/STM32F3xx/COMP/main.c') diff --git a/testhal/STM32/STM32F3xx/COMP/main.c b/testhal/STM32/STM32F3xx/COMP/main.c index eb1e1c0..a1d5d54 100644 --- a/testhal/STM32/STM32F3xx/COMP/main.c +++ b/testhal/STM32/STM32F3xx/COMP/main.c @@ -17,33 +17,86 @@ #include "ch.h" #include "hal.h" -void comp2_cb(COMPDriver *comp) { +#define DAC_BUFFER_SIZE 360 - if (comp->reg->CSR & COMP_CSR_COMPxOUT) { +/* + * DAC test buffer (sine wave). + */ +static const dacsample_t dac_buffer[DAC_BUFFER_SIZE] = { + 2047, 2082, 2118, 2154, 2189, 2225, 2260, 2296, 2331, 2367, 2402, 2437, + 2472, 2507, 2542, 2576, 2611, 2645, 2679, 2713, 2747, 2780, 2813, 2846, + 2879, 2912, 2944, 2976, 3008, 3039, 3070, 3101, 3131, 3161, 3191, 3221, + 3250, 3278, 3307, 3335, 3362, 3389, 3416, 3443, 3468, 3494, 3519, 3544, + 3568, 3591, 3615, 3637, 3660, 3681, 3703, 3723, 3744, 3763, 3782, 3801, + 3819, 3837, 3854, 3870, 3886, 3902, 3917, 3931, 3944, 3958, 3970, 3982, + 3993, 4004, 4014, 4024, 4033, 4041, 4049, 4056, 4062, 4068, 4074, 4078, + 4082, 4086, 4089, 4091, 4092, 4093, 4094, 4093, 4092, 4091, 4089, 4086, + 4082, 4078, 4074, 4068, 4062, 4056, 4049, 4041, 4033, 4024, 4014, 4004, + 3993, 3982, 3970, 3958, 3944, 3931, 3917, 3902, 3886, 3870, 3854, 3837, + 3819, 3801, 3782, 3763, 3744, 3723, 3703, 3681, 3660, 3637, 3615, 3591, + 3568, 3544, 3519, 3494, 3468, 3443, 3416, 3389, 3362, 3335, 3307, 3278, + 3250, 3221, 3191, 3161, 3131, 3101, 3070, 3039, 3008, 2976, 2944, 2912, + 2879, 2846, 2813, 2780, 2747, 2713, 2679, 2645, 2611, 2576, 2542, 2507, + 2472, 2437, 2402, 2367, 2331, 2296, 2260, 2225, 2189, 2154, 2118, 2082, + 2047, 2012, 1976, 1940, 1905, 1869, 1834, 1798, 1763, 1727, 1692, 1657, + 1622, 1587, 1552, 1518, 1483, 1449, 1415, 1381, 1347, 1314, 1281, 1248, + 1215, 1182, 1150, 1118, 1086, 1055, 1024, 993, 963, 933, 903, 873, + 844, 816, 787, 759, 732, 705, 678, 651, 626, 600, 575, 550, + 526, 503, 479, 457, 434, 413, 391, 371, 350, 331, 312, 293, + 275, 257, 240, 224, 208, 192, 177, 163, 150, 136, 124, 112, + 101, 90, 80, 70, 61, 53, 45, 38, 32, 26, 20, 16, + 12, 8, 5, 3, 2, 1, 0, 1, 2, 3, 5, 8, + 12, 16, 20, 26, 32, 38, 45, 53, 61, 70, 80, 90, + 101, 112, 124, 136, 150, 163, 177, 192, 208, 224, 240, 257, + 275, 293, 312, 331, 350, 371, 391, 413, 434, 457, 479, 503, + 526, 550, 575, 600, 626, 651, 678, 705, 732, 759, 787, 816, + 844, 873, 903, 933, 963, 993, 1024, 1055, 1086, 1118, 1150, 1182, + 1215, 1248, 1281, 1314, 1347, 1381, 1415, 1449, 1483, 1518, 1552, 1587, + 1622, 1657, 1692, 1727, 1763, 1798, 1834, 1869, 1905, 1940, 1976, 2012 +}; +static const DACConfig dac1cfg1 = { + .init = 2047U, + .datamode = DAC_DHRM_12BIT_RIGHT, + .cr = 0 +}; - } +static const DACConversionGroup dacgrpcfg1 = { + .num_channels = 1U, + .end_cb = NULL, + .error_cb = NULL, + .trigger = DAC_TRG(0) +}; -} +/* + * GPT6 configuration. + */ +static const GPTConfig gpt6cfg1 = { + .frequency = 10000U, + .callback = NULL, + .cr2 = TIM_CR2_MMS_1, /* MMS = 010 = TRGO on Update Event. */ + .dier = 0U +}; + +void comp2_cb(COMPDriver *comp) { + + /* Check if output is high (rising) */ + if (comp->reg->CSR & COMP_CSR_COMPxOUT) { -void comp4_cb(COMPDriver *comp) { - (void) comp; + palToggleLine(LINE_LED9_BLUE); + } } static const COMPConfig comp2_conf = { COMP_OUTPUT_NORMAL, + COMP_IRQ_RISING, comp2_cb, - STM32_COMP_InvertingInput_VREFINT || STM32_COMP_Hysteresis_High // CSR -}; - -static const COMPConfig comp4_conf = { - COMP_OUTPUT_INVERTED, - comp4_cb, - STM32_COMP_InvertingInput_1_2VREFINT | COMP_CSR_COMPxOUTSEL_1 // CSR + STM32_COMP_InvertingInput_VREFINT | + STM32_COMP_NonInvertingInput_IO2 | + STM32_COMP_Hysteresis_High // CSR }; - /* * Application entry point. */ @@ -52,14 +105,41 @@ int main(void) { halInit(); chSysInit(); + /* + * Set PA3 - PA4 to Analog (DAC1_CH1, COMP2_INP) + * You will have to connect these with a jumper wire + */ + palSetPadMode(GPIOA, 3, PAL_MODE_INPUT_ANALOG); + palSetPadMode(GPIOA, 4, PAL_MODE_INPUT_ANALOG); + + /* + * Set PA2 to alternate 8 (COMP2_OUT) + * You can connect this to an oscilloscope along with PA4 to compare input/output. + */ + palSetPadMode(GPIOA, 2, PAL_MODE_ALTERNATE(8)); + + /* + * Start peripherals + */ + dacStart(&DACD1, &dac1cfg1); compStart(&COMPD2, &comp2_conf); - compStart(&COMPD4, &comp4_conf); + gptStart(&GPTD6, &gpt6cfg1); + + /* + * Starting a continuous conversion. + */ + dacStartConversion(&DACD1, &dacgrpcfg1, dac_buffer, DAC_BUFFER_SIZE); + gptStartContinuous(&GPTD6, 2U); + + compEnable(&COMPD2); /* - * Normal main() thread activity, it resets the watchdog. + * Normal main() thread activity. */ while (true) { - chThdSleepMilliseconds(500); + + chThdSleepMilliseconds(250); + palToggleLine(LINE_LED3_RED); } return 0; } -- cgit v1.2.3