Browse Source

AP_HAL_AVR GPIO: rename Arduino to be AVR

mission-4.1.18
Pat Hickey 12 years ago committed by Andrew Tridgell
parent
commit
2e32ec3013
  1. 24
      libraries/AP_HAL_AVR/GPIO.cpp
  2. 8
      libraries/AP_HAL_AVR/GPIO.h

24
libraries/AP_HAL_AVR/GPIO.cpp

@ -8,11 +8,11 @@
using namespace AP_HAL_AVR; using namespace AP_HAL_AVR;
AP_HAL::Proc ArduinoGPIO::_interrupt_6 = NULL; AP_HAL::Proc AVRGPIO::_interrupt_6 = NULL;
SIGNAL(INT6_vect) { SIGNAL(INT6_vect) {
if (ArduinoGPIO::_interrupt_6) { if (AVRGPIO::_interrupt_6) {
ArduinoGPIO::_interrupt_6(); AVRGPIO::_interrupt_6();
} }
} }
@ -36,7 +36,7 @@ SIGNAL(INT6_vect) {
#define portModeRegister(P) ( (volatile uint8_t *)( pgm_read_word( port_to_mode_PGM + (P))) ) #define portModeRegister(P) ( (volatile uint8_t *)( pgm_read_word( port_to_mode_PGM + (P))) )
void ArduinoGPIO::pinMode(uint8_t pin, uint8_t mode) { void AVRGPIO::pinMode(uint8_t pin, uint8_t mode) {
uint8_t bit = digitalPinToBitMask(pin); uint8_t bit = digitalPinToBitMask(pin);
uint8_t port = digitalPinToPort(pin); uint8_t port = digitalPinToPort(pin);
volatile uint8_t *reg; volatile uint8_t *reg;
@ -59,7 +59,7 @@ void ArduinoGPIO::pinMode(uint8_t pin, uint8_t mode) {
} }
} }
uint8_t ArduinoGPIO::read(uint8_t pin) { uint8_t AVRGPIO::read(uint8_t pin) {
uint8_t bit = digitalPinToBitMask(pin); uint8_t bit = digitalPinToBitMask(pin);
uint8_t port = digitalPinToPort(pin); uint8_t port = digitalPinToPort(pin);
@ -69,7 +69,7 @@ uint8_t ArduinoGPIO::read(uint8_t pin) {
return 0; return 0;
} }
void ArduinoGPIO::write(uint8_t pin, uint8_t value) { void AVRGPIO::write(uint8_t pin, uint8_t value) {
uint8_t bit = digitalPinToBitMask(pin); uint8_t bit = digitalPinToBitMask(pin);
uint8_t port = digitalPinToPort(pin); uint8_t port = digitalPinToPort(pin);
volatile uint8_t *out; volatile uint8_t *out;
@ -91,7 +91,7 @@ void ArduinoGPIO::write(uint8_t pin, uint8_t value) {
} }
/* Implement GPIO Interrupt 6, used for MPU6000 data ready on APM2. */ /* Implement GPIO Interrupt 6, used for MPU6000 data ready on APM2. */
bool ArduinoGPIO::attach_interrupt( bool AVRGPIO::attach_interrupt(
int interrupt_num, AP_HAL::Proc proc, int mode) { int interrupt_num, AP_HAL::Proc proc, int mode) {
if (interrupt_num == 6) { if (interrupt_num == 6) {
_interrupt_6 = proc; _interrupt_6 = proc;
@ -104,14 +104,14 @@ bool ArduinoGPIO::attach_interrupt(
} }
AP_HAL::DigitalSource* ArduinoGPIO::channel(int pin) { AP_HAL::DigitalSource* AVRGPIO::channel(int pin) {
uint8_t bit = digitalPinToBitMask(pin); uint8_t bit = digitalPinToBitMask(pin);
uint8_t port = digitalPinToPort(pin); uint8_t port = digitalPinToPort(pin);
if (port == NOT_A_PIN) return NULL; if (port == NOT_A_PIN) return NULL;
return new ArduinoDigitalSource(bit, port); return new AVRDigitalSource(bit, port);
} }
void ArduinoDigitalSource::mode(uint8_t output) { void AVRDigitalSource::mode(uint8_t output) {
const uint8_t bit = _bit; const uint8_t bit = _bit;
const uint8_t port = _port; const uint8_t port = _port;
@ -131,14 +131,14 @@ void ArduinoDigitalSource::mode(uint8_t output) {
} }
} }
uint8_t ArduinoDigitalSource::read() { uint8_t AVRDigitalSource::read() {
const uint8_t bit = _bit; const uint8_t bit = _bit;
const uint8_t port = _port; const uint8_t port = _port;
if (*portInputRegister(port) & bit) return 1; if (*portInputRegister(port) & bit) return 1;
return 0; return 0;
} }
void ArduinoDigitalSource::write(uint8_t value) { void AVRDigitalSource::write(uint8_t value) {
const uint8_t bit = _bit; const uint8_t bit = _bit;
const uint8_t port = _port; const uint8_t port = _port;
volatile uint8_t* out; volatile uint8_t* out;

8
libraries/AP_HAL_AVR/GPIO.h

@ -5,9 +5,9 @@
#include <AP_HAL.h> #include <AP_HAL.h>
#include "AP_HAL_AVR_Namespace.h" #include "AP_HAL_AVR_Namespace.h"
class AP_HAL_AVR::ArduinoDigitalSource : public AP_HAL::DigitalSource { class AP_HAL_AVR::AVRDigitalSource : public AP_HAL::DigitalSource {
public: public:
ArduinoDigitalSource(uint8_t bit, uint8_t port) : _bit(bit), _port(port) {} AVRDigitalSource(uint8_t bit, uint8_t port) : _bit(bit), _port(port) {}
void mode(uint8_t output); void mode(uint8_t output);
uint8_t read(); uint8_t read();
void write(uint8_t value); void write(uint8_t value);
@ -17,9 +17,9 @@ private:
const uint8_t _port; const uint8_t _port;
}; };
class AP_HAL_AVR::ArduinoGPIO : public AP_HAL::GPIO { class AP_HAL_AVR::AVRGPIO : public AP_HAL::GPIO {
public: public:
ArduinoGPIO() {} AVRGPIO() {}
void init() {} void init() {}
void pinMode(uint8_t pin, uint8_t output); void pinMode(uint8_t pin, uint8_t output);
uint8_t read(uint8_t pin); uint8_t read(uint8_t pin);

Loading…
Cancel
Save