From aee3eaa087206a97aad0a45d0c6cc9d3a56b9fc1 Mon Sep 17 00:00:00 2001 From: Giovanni Di Sirio Date: Sat, 5 Mar 2016 10:15:04 +0000 Subject: [PATCH] DAC demos fixed, non-standard GNU syntax removed. git-svn-id: svn://svn.code.sf.net/p/chibios/svn/branches/stable_16.1.x@9012 35acf78f-673a-0410-8e92-d51de3d6d3f4 --- testhal/STM32/STM32F3xx/DAC/main.c | 20 ++++++++++---------- testhal/STM32/STM32F4xx/DAC/main.c | 20 ++++++++++---------- testhal/STM32/STM32F4xx/DAC_DUAL/main.c | 20 ++++++++++---------- testhal/STM32/STM32L1xx/DAC/main.c | 20 ++++++++++---------- 4 files changed, 40 insertions(+), 40 deletions(-) diff --git a/testhal/STM32/STM32F3xx/DAC/main.c b/testhal/STM32/STM32F3xx/DAC/main.c index ca2410a93..00b8afc5d 100644 --- a/testhal/STM32/STM32F3xx/DAC/main.c +++ b/testhal/STM32/STM32F3xx/DAC/main.c @@ -88,25 +88,25 @@ static void error_cb1(DACDriver *dacp, dacerror_t err) { } static const DACConfig dac1cfg1 = { - init: 2047U, - datamode: DAC_DHRM_12BIT_RIGHT + .init = 2047U, + .datamode = DAC_DHRM_12BIT_RIGHT }; static const DACConversionGroup dacgrpcfg1 = { - num_channels: 1U, - end_cb: end_cb1, - error_cb: error_cb1, - trigger: DAC_TRG(0) + .num_channels = 1U, + .end_cb = end_cb1, + .error_cb = error_cb1, + .trigger = DAC_TRG(0) }; /* * GPT6 configuration. */ static const GPTConfig gpt6cfg1 = { - frequency: 1000000U, - callback: NULL, - cr2: TIM_CR2_MMS_1, /* MMS = 010 = TRGO on Update Event. */ - dier: 0U + .frequency = 1000000U, + .callback = NULL, + .cr2 = TIM_CR2_MMS_1, /* MMS = 010 = TRGO on Update Event. */ + .dier = 0U }; /* diff --git a/testhal/STM32/STM32F4xx/DAC/main.c b/testhal/STM32/STM32F4xx/DAC/main.c index 67049ff37..1e8ce9a3f 100644 --- a/testhal/STM32/STM32F4xx/DAC/main.c +++ b/testhal/STM32/STM32F4xx/DAC/main.c @@ -88,25 +88,25 @@ static void error_cb1(DACDriver *dacp, dacerror_t err) { } static const DACConfig dac1cfg1 = { - init: 2047U, - datamode: DAC_DHRM_12BIT_RIGHT + .init = 2047U, + .datamode = DAC_DHRM_12BIT_RIGHT }; static const DACConversionGroup dacgrpcfg1 = { - num_channels: 1U, - end_cb: end_cb1, - error_cb: error_cb1, - trigger: DAC_TRG(0) + .num_channels = 1U, + .end_cb = end_cb1, + .error_cb = error_cb1, + .trigger = DAC_TRG(0) }; /* * GPT6 configuration. */ static const GPTConfig gpt6cfg1 = { - frequency: 1000000U, - callback: NULL, - cr2: TIM_CR2_MMS_1, /* MMS = 010 = TRGO on Update Event. */ - dier: 0U + .frequency = 1000000U, + .callback = NULL, + .cr2 = TIM_CR2_MMS_1, /* MMS = 010 = TRGO on Update Event. */ + .dier = 0U }; /* diff --git a/testhal/STM32/STM32F4xx/DAC_DUAL/main.c b/testhal/STM32/STM32F4xx/DAC_DUAL/main.c index d72cd7ec4..bf90f72a6 100644 --- a/testhal/STM32/STM32F4xx/DAC_DUAL/main.c +++ b/testhal/STM32/STM32F4xx/DAC_DUAL/main.c @@ -88,25 +88,25 @@ static void error_cb1(DACDriver *dacp, dacerror_t err) { } static const DACConfig dac1cfg1 = { - init: 2047U, - datamode: DAC_DHRM_12BIT_RIGHT_DUAL + .init = 2047U, + .datamode = DAC_DHRM_12BIT_RIGHT_DUAL }; static const DACConversionGroup dacgrpcfg1 = { - num_channels: 2U, - end_cb: end_cb1, - error_cb: error_cb1, - trigger: DAC_TRG(0) + .num_channels = 2U, + .end_cb = end_cb1, + .error_cb = error_cb1, + .trigger = DAC_TRG(0) }; /* * GPT2 configuration. */ static const GPTConfig gpt6cfg1 = { - frequency: 1000000U, - callback: NULL, - cr2: TIM_CR2_MMS_1, /* MMS = 010 = TRGO on Update Event. */ - dier: 0U + .frequency = 1000000U, + .callback = NULL, + .cr2 = TIM_CR2_MMS_1, /* MMS = 010 = TRGO on Update Event. */ + .dier = 0U }; /* diff --git a/testhal/STM32/STM32L1xx/DAC/main.c b/testhal/STM32/STM32L1xx/DAC/main.c index 62be88aaf..beb04e574 100644 --- a/testhal/STM32/STM32L1xx/DAC/main.c +++ b/testhal/STM32/STM32L1xx/DAC/main.c @@ -88,25 +88,25 @@ static void error_cb1(DACDriver *dacp, dacerror_t err) { } static const DACConfig dac1cfg1 = { - init: 2047U, - datamode: DAC_DHRM_12BIT_RIGHT + .init = 2047U, + .datamode = DAC_DHRM_12BIT_RIGHT }; static const DACConversionGroup dacgrpcfg1 = { - num_channels: 1U, - end_cb: end_cb1, - error_cb: error_cb1, - trigger: DAC_TRG(0) + .num_channels = 1U, + .end_cb = end_cb1, + .error_cb = error_cb1, + .trigger = DAC_TRG(0) }; /* * GPT6 configuration. */ static const GPTConfig gpt6cfg1 = { - frequency: 1000000U, - callback: NULL, - cr2: TIM_CR2_MMS_1, /* MMS = 010 = TRGO on Update Event. */ - dier: 0U + .frequency = 1000000U, + .callback = NULL, + .cr2 = TIM_CR2_MMS_1, /* MMS = 010 = TRGO on Update Event. */ + .dier = 0U }; /*