Mirror/ardupilot
5
0
Fork 0
mirror of https://github.com/ArduPilot/ardupilot synced 2025-02-08 08:53:56 -04:00
Code Issues Packages Projects Releases Wiki Activity

AP_HAL_Linux: Adapt code to common RPI layer

Browse Source
This commit is contained in:
Víctor Mayoral Vilches 2015-11-02 16:24:33 +01:00 committed by Andrew Tridgell
parent b1a53c383c
commit d5d1bfae8c
3 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libraries/AP_HAL_Linux/AP_HAL_Linux_Namespace.h
View File

@ -22,7 +22,7 @@ namespace Linux {
class RCInput; class RCInput;
class RCInput_PRU; class RCInput_PRU;
class RCInput_AioPRU; class RCInput_AioPRU;
class RCInput_Navio; class RCInput_RPI;
class RCInput_Raspilot; class RCInput_Raspilot;
class RCInput_ZYNQ; class RCInput_ZYNQ;
class RCInput_UART; class RCInput_UART;

4
libraries/AP_HAL_Linux/AP_HAL_Linux_Private.h
View File

@ -12,13 +12,13 @@
#include "I2CDriver.h" #include "I2CDriver.h"
#include "SPIDriver.h" #include "SPIDriver.h"
#include "AnalogIn.h" #include "AnalogIn.h"
#include "AnalogIn_Navio.h" #include "AnalogIn_ADS1115.h"
#include "RaspilotAnalogIn.h" #include "RaspilotAnalogIn.h"
#include "Storage.h" #include "Storage.h"
#include "GPIO.h" #include "GPIO.h"
#include "RCInput.h" #include "RCInput.h"
#include "RCInput_AioPRU.h" #include "RCInput_AioPRU.h"
#include "RCInput_Navio.h" #include "RCInput_RPI.h"
#include "RCInput_UART.h" #include "RCInput_UART.h"
#include "RCInput_UDP.h" #include "RCInput_UDP.h"
#include "RCInput_Raspilot.h" #include "RCInput_Raspilot.h"

16
libraries/AP_HAL_Linux/HAL_Linux_Class.cpp
View File

@ -58,8 +58,8 @@ static Semaphore i2cSemaphore0;
static I2CDriver i2cDriver0(&i2cSemaphore0, "/dev/i2c-1"); static I2CDriver i2cDriver0(&i2cSemaphore0, "/dev/i2c-1");
#endif #endif
static SPIDeviceManager spiDeviceManager; static SPIDeviceManager spiDeviceManager;
#if CONFIG_HAL_BOARD_SUBTYPE == HAL_BOARD_SUBTYPE_LINUX_NAVIO #if CONFIG_HAL_BOARD_SUBTYPE == HAL_BOARD_SUBTYPE_LINUX_NAVIO || CONFIG_HAL_BOARD_SUBTYPE == HAL_BOARD_SUBTYPE_LINUX_ERLEBRAIN2
static NavioAnalogIn analogIn; static ADS1115AnalogIn analogIn;
#elif CONFIG_HAL_BOARD_SUBTYPE == HAL_BOARD_SUBTYPE_LINUX_RASPILOT #elif CONFIG_HAL_BOARD_SUBTYPE == HAL_BOARD_SUBTYPE_LINUX_RASPILOT
static RaspilotAnalogIn analogIn; static RaspilotAnalogIn analogIn;
#else #else
@ -83,7 +83,7 @@ static GPIO_BBB gpioDriver;
/* /*
use the RPI gpio driver on Navio use the RPI gpio driver on Navio
*/ */
#elif CONFIG_HAL_BOARD_SUBTYPE == HAL_BOARD_SUBTYPE_LINUX_NAVIO || CONFIG_HAL_BOARD_SUBTYPE == HAL_BOARD_SUBTYPE_LINUX_RASPILOT #elif CONFIG_HAL_BOARD_SUBTYPE == HAL_BOARD_SUBTYPE_LINUX_NAVIO || CONFIG_HAL_BOARD_SUBTYPE == HAL_BOARD_SUBTYPE_LINUX_RASPILOT || CONFIG_HAL_BOARD_SUBTYPE == HAL_BOARD_SUBTYPE_LINUX_ERLEBRAIN2
static GPIO_RPI gpioDriver; static GPIO_RPI gpioDriver;
#elif CONFIG_HAL_BOARD_SUBTYPE == HAL_BOARD_SUBTYPE_LINUX_MINLURE #elif CONFIG_HAL_BOARD_SUBTYPE == HAL_BOARD_SUBTYPE_LINUX_MINLURE
static GPIO_Sysfs gpioDriver; static GPIO_Sysfs gpioDriver;
@ -98,8 +98,8 @@ static Empty::EmptyGPIO gpioDriver;
static RCInput_PRU rcinDriver; static RCInput_PRU rcinDriver;
#elif CONFIG_HAL_BOARD_SUBTYPE == HAL_BOARD_SUBTYPE_LINUX_BBBMINI #elif CONFIG_HAL_BOARD_SUBTYPE == HAL_BOARD_SUBTYPE_LINUX_BBBMINI
static RCInput_AioPRU rcinDriver; static RCInput_AioPRU rcinDriver;
#elif CONFIG_HAL_BOARD_SUBTYPE == HAL_BOARD_SUBTYPE_LINUX_NAVIO #elif CONFIG_HAL_BOARD_SUBTYPE == HAL_BOARD_SUBTYPE_LINUX_NAVIO || CONFIG_HAL_BOARD_SUBTYPE == HAL_BOARD_SUBTYPE_LINUX_ERLEBRAIN2
static RCInput_Navio rcinDriver; static RCInput_RPI rcinDriver;
#elif CONFIG_HAL_BOARD_SUBTYPE == HAL_BOARD_SUBTYPE_LINUX_RASPILOT #elif CONFIG_HAL_BOARD_SUBTYPE == HAL_BOARD_SUBTYPE_LINUX_RASPILOT
static RCInput_Raspilot rcinDriver; static RCInput_Raspilot rcinDriver;
#elif CONFIG_HAL_BOARD_SUBTYPE == HAL_BOARD_SUBTYPE_LINUX_ZYNQ #elif CONFIG_HAL_BOARD_SUBTYPE == HAL_BOARD_SUBTYPE_LINUX_ZYNQ
@ -120,9 +120,9 @@ static RCOutput_PRU rcoutDriver;
#elif CONFIG_HAL_BOARD_SUBTYPE == HAL_BOARD_SUBTYPE_LINUX_BBBMINI #elif CONFIG_HAL_BOARD_SUBTYPE == HAL_BOARD_SUBTYPE_LINUX_BBBMINI
static RCOutput_AioPRU rcoutDriver; static RCOutput_AioPRU rcoutDriver;
/* /*
use the PCA9685 based RCOutput driver on Navio use the PCA9685 based RCOutput driver on Navio and Erle-Brain 2
*/ */
#elif CONFIG_HAL_BOARD_SUBTYPE == HAL_BOARD_SUBTYPE_LINUX_NAVIO #elif CONFIG_HAL_BOARD_SUBTYPE == HAL_BOARD_SUBTYPE_LINUX_NAVIO || CONFIG_HAL_BOARD_SUBTYPE == HAL_BOARD_SUBTYPE_LINUX_ERLEBRAIN2
static RCOutput_PCA9685 rcoutDriver(PCA9685_PRIMARY_ADDRESS, true, 3, RPI_GPIO_27); static RCOutput_PCA9685 rcoutDriver(PCA9685_PRIMARY_ADDRESS, true, 3, RPI_GPIO_27);
/* /*
use the STM32 based RCOutput driver on Raspilot use the STM32 based RCOutput driver on Raspilot
@ -140,7 +140,7 @@ static Empty::EmptyRCOutput rcoutDriver;
#endif #endif
static Scheduler schedulerInstance; static Scheduler schedulerInstance;
#if CONFIG_HAL_BOARD_SUBTYPE == HAL_BOARD_SUBTYPE_LINUX_NAVIO || CONFIG_HAL_BOARD_SUBTYPE == HAL_BOARD_SUBTYPE_LINUX_RASPILOT #if CONFIG_HAL_BOARD_SUBTYPE == HAL_BOARD_SUBTYPE_LINUX_NAVIO || CONFIG_HAL_BOARD_SUBTYPE == HAL_BOARD_SUBTYPE_LINUX_RASPILOT || CONFIG_HAL_BOARD_SUBTYPE == HAL_BOARD_SUBTYPE_LINUX_ERLEBRAIN2
static UtilRPI utilInstance; static UtilRPI utilInstance;
#else #else
static Util utilInstance; static Util utilInstance;