mirror of
https://github.com/DCC-EX/CommandStation-EX.git
synced 2024-12-24 13:21:23 +01:00
Merge branch 'PORTX_HAL' of https://github.com/DCC-EX/CommandStation-EX into PORTX_HAL
This commit is contained in:
commit
11c5dc5f06
@ -36,7 +36,9 @@
|
|||||||
HardwareSerial Serial1(PA10, PA15); // Rx=PA10, Tx=PA15
|
HardwareSerial Serial1(PA10, PA15); // Rx=PA10, Tx=PA15
|
||||||
|
|
||||||
INTERRUPT_CALLBACK interruptHandler=0;
|
INTERRUPT_CALLBACK interruptHandler=0;
|
||||||
// Let's use STM32's timer #1 until disabused of this notion
|
// Let's use STM32's timer #11 until disabused of this notion
|
||||||
|
// Timer #11 is used for "servo" library, but as DCC-EX is not using
|
||||||
|
// this libary, we should be free and clear.
|
||||||
HardwareTimer timer(TIM11);
|
HardwareTimer timer(TIM11);
|
||||||
|
|
||||||
// Timer IRQ handler
|
// Timer IRQ handler
|
||||||
@ -44,8 +46,6 @@ void Timer11_Handler() {
|
|||||||
interruptHandler();
|
interruptHandler();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
void DCCTimer::begin(INTERRUPT_CALLBACK callback) {
|
void DCCTimer::begin(INTERRUPT_CALLBACK callback) {
|
||||||
interruptHandler=callback;
|
interruptHandler=callback;
|
||||||
noInterrupts();
|
noInterrupts();
|
||||||
|
Loading…
Reference in New Issue
Block a user