From c9612984e865b61c69b72fbc621e08d33631e4b9 Mon Sep 17 00:00:00 2001 From: pmantoine Date: Tue, 9 Aug 2022 12:28:15 +0800 Subject: [PATCH] STM32F411 fix to DCC period --- DCCTimerSTM32.cpp | 2 +- platformio.ini | 24 ++++++++++++------------ 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/DCCTimerSTM32.cpp b/DCCTimerSTM32.cpp index 4ca20c0..229baec 100644 --- a/DCCTimerSTM32.cpp +++ b/DCCTimerSTM32.cpp @@ -51,7 +51,7 @@ void DCCTimer::begin(INTERRUPT_CALLBACK callback) { timer.pause(); timer.setPrescaleFactor(1); // timer.setOverflow(CLOCK_CYCLES * 2); - timer.setOverflow(DCC_SIGNAL_TIME * 2, MICROSEC_FORMAT); + timer.setOverflow(DCC_SIGNAL_TIME, MICROSEC_FORMAT); timer.attachInterrupt(Timer1_Handler); timer.refresh(); timer.resume(); diff --git a/platformio.ini b/platformio.ini index 43a4092..1a6356d 100644 --- a/platformio.ini +++ b/platformio.ini @@ -37,7 +37,7 @@ framework = arduino upload_protocol = sam-ba lib_deps = ${env.lib_deps} monitor_speed = 115200 -monitor_flags = --echo +monitor_echo = yes build_flags = -std=c++17 [env:samd21-zero-usb] @@ -47,7 +47,7 @@ framework = arduino upload_protocol = sam-ba lib_deps = ${env.lib_deps} monitor_speed = 115200 -monitor_flags = --echo +monitor_echo = yes build_flags = -std=c++17 [env:samc21-firebox] @@ -59,7 +59,7 @@ lib_deps = ${env.lib_deps} SparkFun External EEPROM Arduino Library monitor_speed = 115200 -monitor_flags = --echo +monitor_echo = yes build_flags = -std=c++17 [env:mega2560-debug] @@ -71,7 +71,7 @@ lib_deps = arduino-libraries/Ethernet SPI monitor_speed = 115200 -monitor_flags = --echo +monitor_echo = yes build_flags = -DDIAG_IO -DDIAG_LOOPTIMES [env:mega2560-no-HAL] @@ -83,7 +83,7 @@ lib_deps = arduino-libraries/Ethernet SPI monitor_speed = 115200 -monitor_flags = --echo +monitor_echo = yes build_flags = -DIO_NO_HAL [env:mega2560-I2C-wire] @@ -95,7 +95,7 @@ lib_deps = arduino-libraries/Ethernet SPI monitor_speed = 115200 -monitor_flags = --echo +monitor_echo = yes build_flags = -DI2C_USE_WIRE [env:mega2560] @@ -107,7 +107,7 @@ lib_deps = arduino-libraries/Ethernet SPI monitor_speed = 115200 -monitor_flags = --echo +monitor_echo = yes [env:mega328] platform = atmelavr @@ -118,7 +118,7 @@ lib_deps = arduino-libraries/Ethernet SPI monitor_speed = 115200 -monitor_flags = --echo +monitor_echo = yes [env:unowifiR2] platform = atmelmegaavr @@ -129,7 +129,7 @@ lib_deps = arduino-libraries/Ethernet SPI monitor_speed = 115200 -monitor_flags = --echo +monitor_echo = yes build_flags = "-DF_CPU=16000000L -DARDUINO=10813 -DARDUINO_AVR_UNO_WIFI_DEV_ED -DARDUINO_ARCH_AVR -DESP_CH_UART -DESP_CH_UART_BR=19200" [env:nanoevery] @@ -141,7 +141,7 @@ lib_deps = arduino-libraries/Ethernet SPI monitor_speed = 115200 -monitor_flags = --echo +monitor_echo = yes upload_speed = 19200 build_flags = -DDIAG_IO @@ -154,7 +154,7 @@ lib_deps = arduino-libraries/Ethernet SPI monitor_speed = 115200 -monitor_flags = --echo +monitor_echo = yes [env:nano] platform = atmelavr @@ -163,7 +163,7 @@ board_upload.maximum_size = 32256 framework = arduino lib_deps = ${env.lib_deps} monitor_speed = 115200 -monitor_flags = --echo +monitor_echo = yes [env:ESP32] platform = espressif32