gomaomao/DIY-Multiprotocol-TX-Module
1
0
Fork 0
mirror of https://github.com/pascallanger/DIY-Multiprotocol-TX-Module.git synced 2025-07-03 03:57:51 +00:00
Code Issues Projects Releases Wiki Activity

Fix for STM32 board

Browse Source
This commit is contained in:
pascallanger 2016-10-17 08:37:09 +02:00
parent 8a177c34fa
commit eb6fc4f8cf
2 changed files with 7 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
Multiprotocol/Multiprotocol.ino
View File

@ -34,12 +34,18 @@
#include <avr/eeprom.h> #include <avr/eeprom.h>
#else #else
#include <arduino.h> #include <arduino.h>
#undef __cplusplus
#include <libmaple/usart.h> #include <libmaple/usart.h>
#include <libmaple/timer.h> #include <libmaple/timer.h>
#include <SPI.h> #include <SPI.h>
#include <EEPROM.h> #include <EEPROM.h>
HardwareTimer timer(2); HardwareTimer timer(2);
void PPM_decode();
void ISR_COMPB();
extern "C"
{
void __irq_usart2(void);
void __irq_usart3(void);
}
#endif #endif
//Global constants/variables //Global constants/variables
@ -119,10 +125,6 @@ volatile uint8_t rx_buff[RXBUFFER_SIZE];
volatile uint8_t rx_ok_buff[RXBUFFER_SIZE]; volatile uint8_t rx_ok_buff[RXBUFFER_SIZE];
volatile uint8_t discard_frame = 0; volatile uint8_t discard_frame = 0;
#ifdef STM32_BOARD
void PPM_decode();
void ISR_COMPB();
#endif
// Telemetry // Telemetry
#define MAX_PKT 27 #define MAX_PKT 27
uint8_t pkt[MAX_PKT];//telemetry receiving packets uint8_t pkt[MAX_PKT];//telemetry receiving packets
@ -1061,9 +1063,6 @@ static uint32_t random_id(uint16_t adress, uint8_t create_new)
#ifdef ORANGE_TX #ifdef ORANGE_TX
ISR(USARTC0_RXC_vect) ISR(USARTC0_RXC_vect)
#elif defined STM32_BOARD #elif defined STM32_BOARD
#ifdef __cplusplus
extern "C" {
#endif
void __irq_usart2() void __irq_usart2()
#else #else
ISR(USART_RX_vect) ISR(USART_RX_vect)
@ -1138,9 +1137,6 @@ static uint32_t random_id(uint16_t adress, uint8_t create_new)
UCSR0B |= _BV(RXCIE0) ; // RX interrupt enable UCSR0B |= _BV(RXCIE0) ; // RX interrupt enable
#endif #endif
} }
#if defined (STM32_BOARD) && defined (__cplusplus)
}
#endif
//Serial timer //Serial timer
#ifdef ORANGE_TX #ifdef ORANGE_TX

8
Multiprotocol/Telemetry.ino
View File

@ -599,9 +599,6 @@ void TelemetryUpdate()
ISR(USARTC0_DRE_vect) ISR(USARTC0_DRE_vect)
#else #else
#ifdef STM32_BOARD #ifdef STM32_BOARD
#ifdef __cplusplus
extern "C" {
#endif
void __irq_usart3() void __irq_usart3()
#else #else
ISR(USART_UDRE_vect) ISR(USART_UDRE_vect)
@ -630,11 +627,6 @@ void TelemetryUpdate()
tx_pause(); // Check if all data is transmitted . if yes disable transmitter UDRE interrupt tx_pause(); // Check if all data is transmitted . if yes disable transmitter UDRE interrupt
#endif #endif
} }
#if defined STM32_BOARD
#ifdef __cplusplus
}
#endif
#endif //STM32_BOARD
#else //BASH_SERIAL #else //BASH_SERIAL
// Routines for bit-bashed serial output // Routines for bit-bashed serial output