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

I2C left to test, all so far works well

Browse Source
This commit is contained in:
travis-farmer 2023-10-26 17:36:35 -04:00
parent 88f1c0c580
commit f2c9b5a496
2 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
DCCTimerGiga.cpp
View File

@ -34,6 +34,7 @@
#include "DIAG.h" #include "DIAG.h"
#include "Portenta_H7_TimerInterrupt.h" #include "Portenta_H7_TimerInterrupt.h"
#include <Arduino_AdvancedAnalog.h> #include <Arduino_AdvancedAnalog.h>
//#include "config.h"
/////////////////////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////////////////////
// Experimental code for High Accuracy (HA) DCC Signal mode // Experimental code for High Accuracy (HA) DCC Signal mode
// Warning - use of TIM2 and TIM3 can affect the use of analogWrite() function on certain pins, // Warning - use of TIM2 and TIM3 can affect the use of analogWrite() function on certain pins,
@ -121,18 +122,13 @@ void DCCTimer::clearPWM() {
} }
void DCCTimer::getSimulatedMacAddress(byte mac[6]) { void DCCTimer::getSimulatedMacAddress(byte mac[6]) {
volatile uint32_t *serno1 = (volatile uint32_t *)0x1FFF7A10; /*mac[0] = 0xDE;
volatile uint32_t *serno2 = (volatile uint32_t *)0x1FFF7A14; mac[1] = 0xAD;
// volatile uint32_t *serno3 = (volatile uint32_t *)0x1FFF7A18; mac[2] = 0xBE;
mac[3] = 0xEF;
volatile uint32_t m1 = *serno1; mac[4] = MAC_A;
volatile uint32_t m2 = *serno2; mac[5] = MAC_B;
mac[0] = m1 >> 8; DIAG(F("MAC: %d:%d:%d:%d:%d:%d"),mac[0],mac[1],mac[2],mac[3],mac[4],mac[5]);*/
mac[1] = m1 >> 0;
mac[2] = m2 >> 24;
mac[3] = m2 >> 16;
mac[4] = m2 >> 8;
mac[5] = m2 >> 0;
} }
volatile int DCCTimer::minimum_free_memory=__INT_MAX__; volatile int DCCTimer::minimum_free_memory=__INT_MAX__;

4
EthernetInterface.cpp
View File

@ -55,8 +55,12 @@ void EthernetInterface::setup()
*/ */
EthernetInterface::EthernetInterface() EthernetInterface::EthernetInterface()
{ {
#if defined(ARDUINO_GIGA)
byte mac[] = MAC_ADDRESS;
#else // no giga
byte mac[6]; byte mac[6];
DCCTimer::getSimulatedMacAddress(mac); DCCTimer::getSimulatedMacAddress(mac);
#endif // giga
connected=false; connected=false;
#ifdef IP_ADDRESS #ifdef IP_ADDRESS