From 1292856c8ebfcc91451405de6f0b8e37daa42233 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Sim=C3=B5es?= Date: Thu, 7 Jun 2018 12:13:57 +0100 Subject: [PATCH] Fix ADC declaration on all community targets MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - Following nanoframework/nf-interpreter#736 Signed-off-by: José Simões --- .../GHI_FEZ_CERB40_NF/target_windows_devices_adc_config.cpp | 6 +++--- .../I2M_ELECTRON_NF/target_windows_devices_adc_config.cpp | 6 +++--- .../I2M_OXYGEN_NF/target_windows_devices_adc_config.cpp | 6 +++--- .../target_windows_devices_adc_config.cpp | 6 +++--- .../target_windows_devices_adc_config.cpp | 6 +++--- 5 files changed, 15 insertions(+), 15 deletions(-) diff --git a/CMSIS-OS/ChibiOS/GHI_FEZ_CERB40_NF/target_windows_devices_adc_config.cpp b/CMSIS-OS/ChibiOS/GHI_FEZ_CERB40_NF/target_windows_devices_adc_config.cpp index 8dcb915b..cca4032a 100644 --- a/CMSIS-OS/ChibiOS/GHI_FEZ_CERB40_NF/target_windows_devices_adc_config.cpp +++ b/CMSIS-OS/ChibiOS/GHI_FEZ_CERB40_NF/target_windows_devices_adc_config.cpp @@ -17,9 +17,9 @@ const NF_PAL_ADC_PORT_PIN_CHANNEL AdcPortPinConfig[] = { {3, GPIOC, 3, ADC_CHANNEL_IN13}, // these are the internal sources, available only at ADC1 - {1, NULL, NULL, ADC_CHANNEL_SENSOR}, - {1, NULL, NULL, ADC_CHANNEL_VREFINT}, - {1, NULL, NULL, ADC_CHANNEL_VBAT}, + {1, NULL, 0, ADC_CHANNEL_SENSOR}, + {1, NULL, 0, ADC_CHANNEL_VREFINT}, + {1, NULL, 0, ADC_CHANNEL_VBAT}, }; const int AdcChannelCount = ARRAYSIZE(AdcPortPinConfig); diff --git a/CMSIS-OS/ChibiOS/I2M_ELECTRON_NF/target_windows_devices_adc_config.cpp b/CMSIS-OS/ChibiOS/I2M_ELECTRON_NF/target_windows_devices_adc_config.cpp index d98b16a7..e609a401 100644 --- a/CMSIS-OS/ChibiOS/I2M_ELECTRON_NF/target_windows_devices_adc_config.cpp +++ b/CMSIS-OS/ChibiOS/I2M_ELECTRON_NF/target_windows_devices_adc_config.cpp @@ -13,9 +13,9 @@ const NF_PAL_ADC_PORT_PIN_CHANNEL AdcPortPinConfig[] = { {1, GPIOA, 5, ADC_CHANNEL_IN5}, // these are the internal sources, available only at ADC1 - {1, NULL, NULL, ADC_CHANNEL_SENSOR}, - {1, NULL, NULL, ADC_CHANNEL_VREFINT}, - {1, NULL, NULL, ADC_CHANNEL_VBAT}, + {1, NULL, 0, ADC_CHANNEL_SENSOR}, + {1, NULL, 0, ADC_CHANNEL_VREFINT}, + {1, NULL, 0, ADC_CHANNEL_VBAT}, }; const int AdcChannelCount = ARRAYSIZE(AdcPortPinConfig); diff --git a/CMSIS-OS/ChibiOS/I2M_OXYGEN_NF/target_windows_devices_adc_config.cpp b/CMSIS-OS/ChibiOS/I2M_OXYGEN_NF/target_windows_devices_adc_config.cpp index 480a115d..bded3dea 100644 --- a/CMSIS-OS/ChibiOS/I2M_OXYGEN_NF/target_windows_devices_adc_config.cpp +++ b/CMSIS-OS/ChibiOS/I2M_OXYGEN_NF/target_windows_devices_adc_config.cpp @@ -14,9 +14,9 @@ const NF_PAL_ADC_PORT_PIN_CHANNEL AdcPortPinConfig[] = { {1, GPIOA, 4, ADC_CHANNEL_IN4}, // these are the internal sources, available only at ADC1 - {1, NULL, NULL, ADC_CHANNEL_SENSOR}, - {1, NULL, NULL, ADC_CHANNEL_VREFINT}, - {1, NULL, NULL, ADC_CHANNEL_VBAT}, + {1, NULL, 0, ADC_CHANNEL_SENSOR}, + {1, NULL, 0, ADC_CHANNEL_VREFINT}, + {1, NULL, 0, ADC_CHANNEL_VBAT}, }; const int AdcChannelCount = ARRAYSIZE(AdcPortPinConfig); diff --git a/CMSIS-OS/ChibiOS/ST_NUCLEO64_F401RE_NF/target_windows_devices_adc_config.cpp b/CMSIS-OS/ChibiOS/ST_NUCLEO64_F401RE_NF/target_windows_devices_adc_config.cpp index 24339f8f..e5100bd9 100644 --- a/CMSIS-OS/ChibiOS/ST_NUCLEO64_F401RE_NF/target_windows_devices_adc_config.cpp +++ b/CMSIS-OS/ChibiOS/ST_NUCLEO64_F401RE_NF/target_windows_devices_adc_config.cpp @@ -17,9 +17,9 @@ const NF_PAL_ADC_PORT_PIN_CHANNEL AdcPortPinConfig[] = { {1, GPIOC, 0, ADC_CHANNEL_IN10}, // these are the internal sources, available only at ADC1 - {1, NULL, NULL, ADC_CHANNEL_SENSOR}, - {1, NULL, NULL, ADC_CHANNEL_VREFINT}, - {1, NULL, NULL, ADC_CHANNEL_VBAT}, + {1, NULL, 0, ADC_CHANNEL_SENSOR}, + {1, NULL, 0, ADC_CHANNEL_VREFINT}, + {1, NULL, 0, ADC_CHANNEL_VBAT}, }; const int AdcChannelCount = ARRAYSIZE(AdcPortPinConfig); diff --git a/CMSIS-OS/ChibiOS/ST_NUCLEO64_F411RE_NF/target_windows_devices_adc_config.cpp b/CMSIS-OS/ChibiOS/ST_NUCLEO64_F411RE_NF/target_windows_devices_adc_config.cpp index 24339f8f..e5100bd9 100644 --- a/CMSIS-OS/ChibiOS/ST_NUCLEO64_F411RE_NF/target_windows_devices_adc_config.cpp +++ b/CMSIS-OS/ChibiOS/ST_NUCLEO64_F411RE_NF/target_windows_devices_adc_config.cpp @@ -17,9 +17,9 @@ const NF_PAL_ADC_PORT_PIN_CHANNEL AdcPortPinConfig[] = { {1, GPIOC, 0, ADC_CHANNEL_IN10}, // these are the internal sources, available only at ADC1 - {1, NULL, NULL, ADC_CHANNEL_SENSOR}, - {1, NULL, NULL, ADC_CHANNEL_VREFINT}, - {1, NULL, NULL, ADC_CHANNEL_VBAT}, + {1, NULL, 0, ADC_CHANNEL_SENSOR}, + {1, NULL, 0, ADC_CHANNEL_VREFINT}, + {1, NULL, 0, ADC_CHANNEL_VBAT}, }; const int AdcChannelCount = ARRAYSIZE(AdcPortPinConfig);