From c546bec9997e11e879dba8720ca0e5f1ecc57af4 Mon Sep 17 00:00:00 2001 From: Siddharth Purohit Date: Wed, 2 May 2018 18:20:06 +0530 Subject: [PATCH] AP_HAL: do not use ch for channel, its used as a global var under ChibiOS --- libraries/AP_HAL/RCOutput.h | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/libraries/AP_HAL/RCOutput.h b/libraries/AP_HAL/RCOutput.h index 6832688d93..eda2a7b611 100644 --- a/libraries/AP_HAL/RCOutput.h +++ b/libraries/AP_HAL/RCOutput.h @@ -37,18 +37,18 @@ public: /* Output freq (1/period) control */ virtual void set_freq(uint32_t chmask, uint16_t freq_hz) = 0; - virtual uint16_t get_freq(uint8_t ch) = 0; + virtual uint16_t get_freq(uint8_t chan) = 0; /* Output active/highZ control, either by single channel at a time * or a mask of channels */ - virtual void enable_ch(uint8_t ch) = 0; - virtual void disable_ch(uint8_t ch) = 0; + virtual void enable_ch(uint8_t chan) = 0; + virtual void disable_ch(uint8_t chan) = 0; /* * Output a single channel, possibly grouped with previous writes if * cork() has been called before. */ - virtual void write(uint8_t ch, uint16_t period_us) = 0; + virtual void write(uint8_t chan, uint16_t period_us) = 0; /* * Delay subsequent calls to write() going to the underlying hardware in @@ -67,11 +67,11 @@ public: * array of channels. On boards that have a separate IO controller, * this returns the latest output value that the IO controller has * reported */ - virtual uint16_t read(uint8_t ch) = 0; + virtual uint16_t read(uint8_t chan) = 0; virtual void read(uint16_t* period_us, uint8_t len) = 0; /* Read the current input state. This returns the last value that was written. */ - virtual uint16_t read_last_sent(uint8_t ch) { return read(ch); } + virtual uint16_t read_last_sent(uint8_t chan) { return read(chan); } virtual void read_last_sent(uint16_t* period_us, uint8_t len) { read(period_us, len); }; /*