From f4a4f674534db1d03ee0dc65a256be7708dceacd Mon Sep 17 00:00:00 2001 From: Pascal Langer Date: Thu, 25 Jan 2018 11:07:54 +0100 Subject: [PATCH] Addition of LED2 for iRangeX modules --- Multiprotocol/Multiprotocol.h | 2 +- Multiprotocol/Multiprotocol.ino | 5 +++++ Multiprotocol/Pins.h | 13 +++++++++++++ 3 files changed, 19 insertions(+), 1 deletion(-) diff --git a/Multiprotocol/Multiprotocol.h b/Multiprotocol/Multiprotocol.h index 07b2938..1c70f02 100644 --- a/Multiprotocol/Multiprotocol.h +++ b/Multiprotocol/Multiprotocol.h @@ -19,7 +19,7 @@ #define VERSION_MAJOR 1 #define VERSION_MINOR 2 #define VERSION_REVISION 0 -#define VERSION_PATCH_LEVEL 14 +#define VERSION_PATCH_LEVEL 15 //****************** // Protocols //****************** diff --git a/Multiprotocol/Multiprotocol.ino b/Multiprotocol/Multiprotocol.ino index 66bb32e..ca8881e 100644 --- a/Multiprotocol/Multiprotocol.ino +++ b/Multiprotocol/Multiprotocol.ino @@ -243,6 +243,7 @@ void setup() #elif defined STM32_BOARD //STM32 afio_cfg_debug_ports(AFIO_DEBUG_NONE); + pinMode(LED2_pin,OUTPUT); pinMode(A7105_CSN_pin,OUTPUT); pinMode(CC25_CSN_pin,OUTPUT); pinMode(NRF_CSN_pin,OUTPUT); @@ -313,6 +314,8 @@ void setup() random_init(); #endif + LED2_on; + // Set Chip selects #ifdef A7105_CSN_pin A7105_CSN_on; @@ -470,6 +473,7 @@ void setup() #endif #endif //ENABLE_SERIAL } + LED2_on; debugln("Init complete"); } @@ -1330,6 +1334,7 @@ void modules_reset() { usart_init(USART2); usart_config_gpios_async(USART2,GPIOA,PIN_MAP[PA3].gpio_bit,GPIOA,PIN_MAP[PA2].gpio_bit,config); + LED2_output; usart_set_baud_rate(USART2, STM32_PCLK1, baud); usart_enable(USART2); } diff --git a/Multiprotocol/Pins.h b/Multiprotocol/Pins.h index 771cfb6..3d91623 100644 --- a/Multiprotocol/Pins.h +++ b/Multiprotocol/Pins.h @@ -190,6 +190,12 @@ #define IS_LED_on (LED_port & _BV(LED_pin)) #endif + #define LED2_on + #define LED2_off + #define LED2_toggle + #define LED2_output + #define IS_LED2_on 0 + //BIND #ifdef ORANGE_TX #define BIND_pin 2 //PD2 @@ -208,6 +214,7 @@ #else //STM32_BOARD #define BIND_pin PA0 #define LED_pin PA1 + #define LED2_pin PA2 // #define PPM_pin PA8 //PPM 5V tolerant // @@ -284,6 +291,12 @@ #define LED_output pinMode(LED_pin,OUTPUT) #define IS_LED_on ( digitalRead(LED_pin)==HIGH) + #define LED2_on digitalWrite(LED2_pin,HIGH) + #define LED2_off digitalWrite(LED2_pin,LOW) + #define LED2_toggle digitalWrite(LED2_pin ,!digitalRead(LED2_pin)) + #define LED2_output pinMode(LED2_pin,OUTPUT) + #define IS_LED2_on ( digitalRead(LED2_pin)==HIGH) + #define BIND_SET_INPUT pinMode(BIND_pin,INPUT) #define BIND_SET_PULLUP digitalWrite(BIND_pin,HIGH) #define BIND_SET_OUTPUT pinMode(BIND_pin,OUTPUT)