From 23b682417ed04f4067f3c7625a2d5518bf7a1f46 Mon Sep 17 00:00:00 2001 From: Cristian Maglie Date: Tue, 11 Feb 2014 11:18:25 +0100 Subject: Revert "Changed pins definition in variants from constants to #defines." This reverts commit 7fcba37acfd11313640b3f5d5c813d63d2f59999. --- variants/robot_control/pins_arduino.h | 78 +++++++++++++++++------------------ 1 file changed, 39 insertions(+), 39 deletions(-) (limited to 'variants/robot_control/pins_arduino.h') diff --git a/variants/robot_control/pins_arduino.h b/variants/robot_control/pins_arduino.h index 545ec3a..4acfc0d 100644 --- a/variants/robot_control/pins_arduino.h +++ b/variants/robot_control/pins_arduino.h @@ -43,52 +43,52 @@ #define D4 TKD4 #define D5 TKD5 -#define RX 0 -#define TX 1 -#define SDA 2 -#define SCL 3 +static const uint8_t RX = 0; +static const uint8_t TX = 1; +static const uint8_t SDA = 2; +static const uint8_t SCL = 3; // Map SPI port to 'new' pins D14..D17 -#define SS 17 -#define MOSI 16 -#define MISO 14 -#define SCK 15 +static const uint8_t SS = 17; +static const uint8_t MOSI = 16; +static const uint8_t MISO = 14; +static const uint8_t SCK = 15; // Mapping of analog pins as digital I/O // A6-A11 share with digital pins -#define A0 18 -#define A1 19 -#define A2 20 -#define A3 21 -#define A4 22 -#define A5 23 -#define A6 24 // D4 -#define A7 25 // D6 -#define A8 26 // D8 -#define A9 27 // D9 -#define A10 28 // D10 -#define A11 29 // D12 +static const uint8_t A0 = 18; +static const uint8_t A1 = 19; +static const uint8_t A2 = 20; +static const uint8_t A3 = 21; +static const uint8_t A4 = 22; +static const uint8_t A5 = 23; +static const uint8_t A6 = 24; // D4 +static const uint8_t A7 = 25; // D6 +static const uint8_t A8 = 26; // D8 +static const uint8_t A9 = 27; // D9 +static const uint8_t A10 = 28; // D10 +static const uint8_t A11 = 29; // D12 // Specific Mapping for the Control Board -#define KEY 18 // AD0 -#define MUX_IN 24 // ADC8 - A6 -#define MUXA 6 // D5 - TKD4 -#define MUXB 11 // D11 -#define MUXC 12 // D12 - TKD5 -#define MUXD 13 // D13 -#define BUZZ 5 // D5 -#define POT 23 // AD5 -#define DC_LCD 10 // D10 -#define LCD_CS 9 // D9 -#define RST_LCD 7 // D6 -#define CARD_CS 8 // D8 -#define TKD0 19 // ADC6 - A1 -#define TKD1 20 // ADC5 - A2 -#define TKD2 21 // ADC4 - A3 -#define TKD3 22 // ADC1 - A4 -#define TKD4 6 // D5 - MUXA -#define TKD5 12 // D12 - MUXC -#define LED1 17 // D17 - RX_Led +static const uint8_t KEY = 18; // AD0 +static const uint8_t MUX_IN = 24; // ADC8 - A6 +static const uint8_t MUXA = 6; // D5 - TKD4 +static const uint8_t MUXB = 11; // D11 +static const uint8_t MUXC = 12; // D12 - TKD5 +static const uint8_t MUXD = 13; // D13 +static const uint8_t BUZZ = 5; // D5 +static const uint8_t POT = 23; // AD5 +static const uint8_t DC_LCD = 10; // D10 +static const uint8_t LCD_CS = 9; // D9 +static const uint8_t RST_LCD = 7; // D6 +static const uint8_t CARD_CS = 8; // D8 +static const uint8_t TKD0 = 19; // ADC6 - A1 +static const uint8_t TKD1 = 20; // ADC5 - A2 +static const uint8_t TKD2 = 21; // ADC4 - A3 +static const uint8_t TKD3 = 22; // ADC1 - A4 +static const uint8_t TKD4 = 6; // D5 - MUXA +static const uint8_t TKD5 = 12; // D12 - MUXC +static const uint8_t LED1 = 17; // D17 - RX_Led // __AVR_ATmega32U4__ has an unusual mapping of pins to channels extern const uint8_t PROGMEM analog_pin_to_channel_PGM[]; -- cgit v1.2.3-18-g5258