aepko/Ardupilot2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

AP_ADC: fixed example build

Browse Source
This commit is contained in:
Andrew Tridgell 2015-11-20 17:33:17 +11:00
parent 7375f395f9
commit 1ee7963edb
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
libraries/AP_ADC/examples/AP_ADC_test/AP_ADC_test.cpp
View File

@ -32,7 +32,7 @@ void setup()
adc.Init(); // APM ADC initialization adc.Init(); // APM ADC initialization
hal.scheduler->delay(1000); hal.scheduler->delay(1000);
timer = hal.scheduler->millis(); timer = AP_HAL::millis();
} }
static const uint8_t channel_map[6] = { 1, 2, 0, 4, 5, 6}; static const uint8_t channel_map[6] = { 1, 2, 0, 4, 5, 6};
@ -42,7 +42,7 @@ uint32_t last_usec = 0;
static void show_timing() static void show_timing()
{ {
uint32_t mint = (uint32_t)-1, maxt = 0, totalt=0; uint32_t mint = (uint32_t)-1, maxt = 0, totalt=0;
uint32_t start_time = hal.scheduler->millis(); uint32_t start_time = AP_HAL::millis();
float result[6]; float result[6];
uint32_t count = 0; uint32_t count = 0;
@ -56,7 +56,7 @@ static void show_timing()
if (deltat < mint) mint = deltat; if (deltat < mint) mint = deltat;
totalt += deltat; totalt += deltat;
count++; count++;
} while ((hal.scheduler->millis() - start_time) < 5000); } while ((AP_HAL::millis() - start_time) < 5000);
hal.console->printf("timing: mint=%lu maxt=%lu avg=%lu\n", mint, maxt, totalt/count); hal.console->printf("timing: mint=%lu maxt=%lu avg=%lu\n", mint, maxt, totalt/count);
} }
@ -86,9 +86,9 @@ static void show_data()
hal.console->printf("result[%u]=%f\n", (unsigned)i, result[i]); hal.console->printf("result[%u]=%f\n", (unsigned)i, result[i]);
} }
} }
} while ((hal.scheduler->millis() - timer) < 200); } while ((AP_HAL::millis() - timer) < 200);
timer = hal.scheduler->millis(); timer = AP_HAL::millis();
hal.console->printf("g=(%f,%f,%f) a=(%f,%f,%f) +/-(%.0f,%.0f,%.0f,%.0f,%.0f,%.0f) gt=%u dt=%u\n", hal.console->printf("g=(%f,%f,%f) a=(%f,%f,%f) +/-(%.0f,%.0f,%.0f,%.0f,%.0f,%.0f) gt=%u dt=%u\n",
result[0], result[1], result[2], result[0], result[1], result[2],
result[3], result[4], result[5], result[3], result[4], result[5],
@ -100,7 +100,7 @@ static void show_data()
void loop() void loop()
{ {
if (hal.scheduler->millis() < 5000) { if (AP_HAL::millis() < 5000) {
show_timing(); show_timing();
} else { } else {
show_data(); show_data();