removed newlines to clean up code

This commit is contained in:
Jason Short 2011-12-26 15:14:26 -08:00
parent 9f7aae5945
commit 3878ac01ef
1 changed files with 34 additions and 21 deletions

View File

@ -1,18 +1,22 @@
#ifndef __APM_RC_H__ #ifndef __APM_RC_H__
#define __APM_RC_H__ #define __APM_RC_H__
#include <inttypes.h> #include <inttypes.h>
// Radio channels
// Note channels are from 0! // Radio channels
#define CH_1 0
#define CH_2 1 // Note channels are from 0!
#define CH_3 2
#define CH_4 3 #define CH_1 0
#define CH_5 4 #define CH_2 1
#define CH_6 5 #define CH_3 2
#define CH_7 6 #define CH_4 3
#define CH_8 7 #define CH_5 4
#define CH_6 5
#define CH_7 6
#define CH_8 7
#define CH_9 8 #define CH_9 8
#define CH_10 9 #define CH_10 9
#define CH_11 10 #define CH_11 10
@ -30,15 +34,20 @@
#define MSK_CH_11 (1 << CH_11) #define MSK_CH_11 (1 << CH_11)
#define NUM_CHANNELS 8 #define NUM_CHANNELS 8
class Arduino_Mega_ISR_Registry; class Arduino_Mega_ISR_Registry;
class APM_RC_Class class APM_RC_Class
{
public: {
public:
virtual void Init( Arduino_Mega_ISR_Registry * isr_reg ) = 0; virtual void Init( Arduino_Mega_ISR_Registry * isr_reg ) = 0;
virtual void OutputCh(uint8_t ch, uint16_t pwm) = 0; virtual void OutputCh(uint8_t ch, uint16_t pwm) = 0;
virtual uint16_t InputCh(uint8_t ch) = 0; virtual uint16_t InputCh(uint8_t ch) = 0;
@ -46,9 +55,13 @@ class APM_RC_Class
virtual void clearOverride(void) = 0; virtual void clearOverride(void) = 0;
virtual void Force_Out() = 0; virtual void Force_Out() = 0;
virtual void SetFastOutputChannels( uint32_t channelmask ) = 0; virtual void SetFastOutputChannels( uint32_t channelmask ) = 0;
}; };
#include "APM_RC_APM1.h" #include "APM_RC_APM1.h"
#include "APM_RC_APM2.h" #include "APM_RC_APM2.h"
#endif
#endif