andreika-git
/
ChibiOS
mirror of https://github.com/andreika-git/ChibiOS.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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
This commit is contained in:
Giovanni Di Sirio 2016-03-05 10:15:04 +00:00
parent 6cbb350497
commit aee3eaa087
4 changed files with 40 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
testhal/STM32/STM32F3xx/DAC/main.c
View File

@ -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
};
/*

20
testhal/STM32/STM32F4xx/DAC/main.c
View File

@ -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
};
/*

20
testhal/STM32/STM32F4xx/DAC_DUAL/main.c
View File

@ -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
};
/*

20
testhal/STM32/STM32L1xx/DAC/main.c
View File

@ -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
};
/*