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

changed read_pwm to read 

git-svn-id: https://arducopter.googlecode.com/svn/trunk@480 f9c3cf11-9bcb-44bc-f272-b75c42450872
This commit is contained in:
jasonshort 2010-09-11 19:42:49 +00:00
parent b7778b2ad9
commit f4b024f194
5 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libraries/RC/APM2_RC.cpp
View File

@ -99,7 +99,7 @@ APM2_RC::init()
// trim out the radio // trim out the radio
for(int c = 0; c < 50; c++){ for(int c = 0; c < 50; c++){
delay(20); delay(20);
read_pwm(); read();
} }
trim(); trim();
@ -109,7 +109,7 @@ APM2_RC::init()
} }
} }
void APM2_RC::read_pwm() void APM2_RC::read()
{ {
//Serial.print("ch1 in "); //Serial.print("ch1 in ");
//Serial.print(raw[CH1],DEC); //Serial.print(raw[CH1],DEC);
@ -189,7 +189,7 @@ APM2_RC::trim()
{ {
uint8_t temp = _mix_mode; uint8_t temp = _mix_mode;
_mix_mode = 0; _mix_mode = 0;
read_pwm(); read();
_mix_mode = temp; _mix_mode = temp;
// Store the trim values // Store the trim values

2
libraries/RC/APM2_RC.h
View File

@ -10,7 +10,7 @@ class APM2_RC : public RC
public: public:
APM2_RC(); APM2_RC();
void init(); void init();
void read_pwm(); void read();
void output(); void output();
void set_ch_pwm(uint8_t ch, uint16_t pwm); void set_ch_pwm(uint8_t ch, uint16_t pwm);
void trim(); void trim();

6
libraries/RC/AP_RC.cpp
View File

@ -75,7 +75,7 @@ AP_RC::init()
// trim out the radio // trim out the radio
for(int c = 0; c < 50; c++){ for(int c = 0; c < 50; c++){
delay(20); delay(20);
read_pwm(); read();
} }
trim(); trim();
@ -90,7 +90,7 @@ AP_RC::init()
} }
void void
AP_RC::read_pwm() AP_RC::read()
{ {
if((_direction_mask & 1) == 0 ) if((_direction_mask & 1) == 0 )
timer1diff = REVERSE - timer1diff; timer1diff = REVERSE - timer1diff;
@ -163,7 +163,7 @@ AP_RC::trim()
{ {
uint8_t temp = _mix_mode; uint8_t temp = _mix_mode;
_mix_mode = 0; _mix_mode = 0;
read_pwm(); read();
_mix_mode = temp; _mix_mode = temp;
radio_trim[CH1] = radio_in[CH1]; radio_trim[CH1] = radio_in[CH1];

2
libraries/RC/AP_RC.h
View File

@ -10,7 +10,7 @@ class AP_RC : public RC
public: public:
AP_RC(); AP_RC();
void init(); void init();
void read_pwm(); void read();
void output(); void output();
void set_ch_pwm(uint8_t ch, uint16_t pwm); void set_ch_pwm(uint8_t ch, uint16_t pwm);
void trim(); void trim();

2
libraries/RC/RC.h
View File

@ -24,7 +24,7 @@ class RC
// RC(); // RC();
virtual void init(); virtual void init();
virtual void trim(); virtual void trim();
virtual void read_pwm(); virtual void read();
virtual void output(); virtual void output();
virtual void set_channel_direction(uint8_t ch, int8_t dir); virtual void set_channel_direction(uint8_t ch, int8_t dir);
virtual void set_ch_pwm(uint8_t ch, uint16_t pwm); virtual void set_ch_pwm(uint8_t ch, uint16_t pwm);