Skip to content

Commit 3c90408

Browse files
committed
Revert "Initial Build of DCC++ Server"
This reverts commit 5f0fde7.
1 parent 8373299 commit 3c90408

File tree

9 files changed

+16
-462
lines changed

9 files changed

+16
-462
lines changed

DCCpp_Uno/Config.h

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -55,13 +55,4 @@ Part of DCC++ BASE STATION for the Arduino
5555
#define MAC_ADDRESS { 0xDE, 0xAD, 0xBE, 0xEF, 0xFE, 0xEF }
5656

5757
/////////////////////////////////////////////////////////////////////////////////////
58-
//
59-
// DEFINE CONFIGURATION-MODE PIN (ENTER CONFIG MODE AT STARTUP IF THIS PIN IS GROUND)
60-
//
61-
62-
#define CONFIG_PIN A2
63-
64-
/////////////////////////////////////////////////////////////////////////////////////
65-
66-
6758

DCCpp_Uno/DCCpp_Uno.ino

Lines changed: 6 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -177,15 +177,14 @@ DCC++ BASE STATION is configured through the Config.h file that contains all use
177177
#include "EEStore.h"
178178
#include "Config.h"
179179
#include "Comm.h"
180-
#include "DccServer.h"
181180

182181
void showConfiguration();
183182

184183
// SET UP COMMUNICATIONS INTERFACE - FOR STANDARD SERIAL, NOTHING NEEDS TO BE DONE
185184

186185
#if COMM_TYPE == 1
187186
byte mac[] = MAC_ADDRESS; // Create MAC address (to be used for DHCP when initializing server)
188-
EthernetServer INTERFACE(ETHERNET_PORT); // Create an instance of an EnternetServer
187+
EthernetServer INTERFACE(ETHERNET_PORT); // Create and instance of an EnternetServer
189188
#endif
190189

191190
// NEXT DECLARE GLOBAL OBJECTS TO PROCESS AND STORE DCC PACKETS AND MONITOR TRACK CURRENTS.
@@ -211,7 +210,6 @@ void loop(){
211210
}
212211

213212
Sensor::check(); // check sensors for activate/de-activate
214-
DccServer::check(); // check status of DCC++ Servers
215213

216214
} // loop
217215

@@ -223,18 +221,17 @@ void setup(){
223221

224222
Serial.begin(115200); // configure serial interface
225223
Serial.flush();
226-
224+
227225
#ifdef SDCARD_CS
228226
pinMode(SDCARD_CS,OUTPUT);
229227
digitalWrite(SDCARD_CS,HIGH); // Deselect the SD card
230228
#endif
231229

232-
EEStore::init(); // initialize and load Turnout, Sensor, Output, and Server definitions stored in EEPROM
233-
DccServer::init(); // initialize DCC Master/Server Wire Interface
230+
EEStore::init(); // initialize and load Turnout and Sensor definitions stored in EEPROM
234231

235-
pinMode(CONFIG_PIN,INPUT); // if pin CONFIG_PIN is grounded upon start-up, print system configuration and halt
236-
digitalWrite(CONFIG_PIN,HIGH);
237-
if(!digitalRead(CONFIG_PIN))
232+
pinMode(A5,INPUT); // if pin A5 is grounded upon start-up, print system configuration and halt
233+
digitalWrite(A5,HIGH);
234+
if(!digitalRead(A5))
238235
showConfiguration();
239236

240237
Serial.print("<iDCC++ BASE STATION FOR ARDUINO "); // Print Status to Serial Line regardless of COMM_TYPE setting so use can open Serial Monitor and check configurtion
@@ -523,9 +520,6 @@ void showConfiguration(){
523520
Serial.print(EEStore::eeStore->data.nSensors);
524521
Serial.print("\n OUTPUTS: ");
525522
Serial.print(EEStore::eeStore->data.nOutputs);
526-
527-
Serial.print("\n\nSERVER ID: ");
528-
Serial.print(EEStore::eeStore->data.serverID);
529523

530524
Serial.print("\n\nINTERFACE: ");
531525
#if COMM_TYPE == 0

DCCpp_Uno/DccServer.cpp

Lines changed: 0 additions & 263 deletions
This file was deleted.

DCCpp_Uno/DccServer.h

Lines changed: 0 additions & 52 deletions
This file was deleted.

0 commit comments

Comments
 (0)