dani/CommandStation-EX
1
0
Fork 0
mirror of https://github.com/DCC-EX/CommandStation-EX.git synced 2024-11-24 16:46:13 +01:00
Code Releases Activity

fixing a few stale placeholders

Browse Source
This commit is contained in:
travis-farmer 2023-10-21 06:45:52 -04:00
parent be0471679d
commit a84eba7ab6
3 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
DCCTimer.h
View File

@ -88,8 +88,10 @@ private:
static int freeMemory(); static int freeMemory();
static volatile int minimum_free_memory; static volatile int minimum_free_memory;
static const int DCC_SIGNAL_TIME=58; // this is the 58uS DCC 1-bit waveform half-cycle static const int DCC_SIGNAL_TIME=58; // this is the 58uS DCC 1-bit waveform half-cycle
#if defined(ARDUINO_ARCH_STM32) || defined(ARDUINO_GIGA) // TODO: PMA temporary hack - assumes 100Mhz F_CPU as STM32 can change frequency #if defined(ARDUINO_ARCH_STM32) // TODO: PMA temporary hack - assumes 100Mhz F_CPU as STM32 can change frequency
static const long CLOCK_CYCLES=(100000000L / 1000000 * DCC_SIGNAL_TIME) >>1; static const long CLOCK_CYCLES=(100000000L / 1000000 * DCC_SIGNAL_TIME) >>1;
#elif defined(ARDUINO_GIGA)
static const long CLOCK_CYCLES=(480000000L / 1000000 * DCC_SIGNAL_TIME) >>1;
#else #else
static const long CLOCK_CYCLES=(F_CPU / 1000000 * DCC_SIGNAL_TIME) >>1; static const long CLOCK_CYCLES=(F_CPU / 1000000 * DCC_SIGNAL_TIME) >>1;
#endif #endif

2
DCCTimerGiga.cpp
View File

@ -256,7 +256,7 @@ void DCCTimer::reset() {
int16_t ADCee::ADCmax() int16_t ADCee::ADCmax()
{ {
return 4095; return 1024;
} }
int ADCee::init(uint8_t pin) { int ADCee::init(uint8_t pin) {

6
defines.h
View File

@ -152,9 +152,9 @@
#ifndef DISABLE_EEPROM #ifndef DISABLE_EEPROM
#define DISABLE_EEPROM #define DISABLE_EEPROM
#endif #endif
#if !defined(I2C_USE_WIRE) //#if !defined(I2C_USE_WIRE)
#define I2C_USE_WIRE //#define I2C_USE_WIRE
#endif //#endif
#define SDA I2C_SDA #define SDA I2C_SDA
#define SCL I2C_SCL #define SCL I2C_SCL