fly316/PX4-Autopilot
7
0
Fork 0
mirror of https://gitee.com/mirrors_PX4/PX4-Autopilot.git synced 2026-10-24 05:53:34 +08:00
Code Issues Packages Projects Releases Wiki Activity

board_hw_rev_ve:ADC returns 32 bits

Browse Source
This commit is contained in:
David Sidrane
2022-03-22 21:15:03 -04:00
committed by Daniel Agar
parent 1c224be8f6
commit ebc8ecdee6
1 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platforms/nuttx/src/px4/stm/stm32_common/board_hw_info/board_hw_rev_ver.c
+10 -10
View File
@@ -203,7 +203,7 @@ static int read_id_dn(int *id, uint32_t gpio_drive, uint32_t gpio_sense, int adc
/* Are Resistors in place ?*/ /* Are Resistors in place ?*/
uint32_t dn_sum = 0; uint32_t dn_sum = 0;
uint16_t dn = 0; uint32_t dn = 0;
if ((high ^ low) && low == 0) { if ((high ^ low) && low == 0) {
@@ -216,14 +216,14 @@ static int read_id_dn(int *id, uint32_t gpio_drive, uint32_t gpio_sense, int adc
for (unsigned av = 0; av < samples; av++) { for (unsigned av = 0; av < samples; av++) {
dn = px4_arch_adc_sample(HW_REV_VER_ADC_BASE, adc_channel); dn = px4_arch_adc_sample(HW_REV_VER_ADC_BASE, adc_channel);
if (dn == 0xffff) { if (dn == UINT32_MAX) {
break; break;
} }
dn_sum += dn; dn_sum += dn;
} }
if (dn != 0xffff) { if (dn != UINT32_MAX) {
*id = dn_sum / samples; *id = dn_sum / samples;
rv = OK; rv = OK;
} }
@@ -264,9 +264,9 @@ static int read_id_dn(int *id, uint32_t gpio_drive, uint32_t gpio_sense, int adc
*/ */
uint32_t dn_sum = 0; uint32_t dn_sum = 0;
uint16_t dn = 0; uint32_t dn = 0;
uint16_t high = 0; uint32_t high = 0;
uint16_t low = 0; uint32_t low = 0;
/* Turn the drive lines to digital outputs High */ /* Turn the drive lines to digital outputs High */
@@ -278,7 +278,7 @@ static int read_id_dn(int *id, uint32_t gpio_drive, uint32_t gpio_sense, int adc
if (px4_arch_adc_init(HW_REV_VER_ADC_BASE) == OK) { if (px4_arch_adc_init(HW_REV_VER_ADC_BASE) == OK) {
dn = px4_arch_adc_sample(HW_REV_VER_ADC_BASE, adc_channel); dn = px4_arch_adc_sample(HW_REV_VER_ADC_BASE, adc_channel);
if (dn == 0xffff) { if (dn == UINT32_MAX) {
break; break;
} }
@@ -286,7 +286,7 @@ static int read_id_dn(int *id, uint32_t gpio_drive, uint32_t gpio_sense, int adc
} }
} }
if (dn != 0xffff) { if (dn != UINT32_MAX) {
high = dn_sum / samples; high = dn_sum / samples;
} }
@@ -302,14 +302,14 @@ static int read_id_dn(int *id, uint32_t gpio_drive, uint32_t gpio_sense, int adc
dn = px4_arch_adc_sample(HW_REV_VER_ADC_BASE, adc_channel); dn = px4_arch_adc_sample(HW_REV_VER_ADC_BASE, adc_channel);
if (dn == 0xffff) { if (dn == UINT32_MAX) {
break; break;
} }
dn_sum += dn; dn_sum += dn;
} }
if (dn != 0xffff) { if (dn != UINT32_MAX) {
low = dn_sum / samples; low = dn_sum / samples;
} }