Mirror
/
ardupilot
mirror of https://github.com/ArduPilot/ardupilot
5
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

RC_Channel: RC_Channel refactor 

Fix up RC_Channel examples.

Change direct access to data members
to access via member functions
This commit is contained in:
skyscraper 2016-05-09 09:05:49 +01:00 committed by Andrew Tridgell
parent de5130fa13
commit c0c8f1a5cc
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libraries/RC_Channel/examples/RC_Channel/RC_Channel.cpp
View File

@ -79,7 +79,7 @@ void loop()
static void print_pwm(void) static void print_pwm(void)
{ {
for (int i=0; i<NUM_CHANNELS; i++) { for (int i=0; i<NUM_CHANNELS; i++) {
hal.console->printf("ch%u: %4d ", (unsigned)i+1, (int)rc[i]->control_in); hal.console->printf("ch%u: %4d ", (unsigned)i+1, (int)rc[i]->get_control_in());
} }
hal.console->printf("\n"); hal.console->printf("\n");
} }
@ -90,8 +90,8 @@ static void print_radio_values()
for (int i=0; i<NUM_CHANNELS; i++) { for (int i=0; i<NUM_CHANNELS; i++) {
hal.console->printf("CH%u: %u|%u\n", hal.console->printf("CH%u: %u|%u\n",
(unsigned)i+1, (unsigned)i+1,
(unsigned)rc[i]->radio_min, (unsigned)rc[i]->get_radio_min(),
(unsigned)rc[i]->radio_max); (unsigned)rc[i]->get_radio_max());
} }
} }
@ -102,7 +102,7 @@ static void print_radio_values()
static void copy_input_output(void) static void copy_input_output(void)
{ {
for (int i=0; i<NUM_CHANNELS; i++) { for (int i=0; i<NUM_CHANNELS; i++) {
rc[i]->servo_out = rc[i]->control_in; rc[i]->set_servo_out(rc[i]->get_control_in());
rc[i]->calc_pwm(); rc[i]->calc_pwm();
rc[i]->output(); rc[i]->output();
} }

2
libraries/RC_Channel/examples/RC_UART/RC_UART.cpp
View File

@ -97,7 +97,7 @@ void RC_UART::loop()
rc[i].enable_out(); rc[i].enable_out();
enable_mask |= 1U<<i; enable_mask |= 1U<<i;
} }
rc[i].radio_out = u.period[i]; rc[i].set_radio_out(u.period[i]);
rc[i].output(); rc[i].output();
} }