import for backup

server/server.cc

@@ -45,6 +45,11 @@ Server::Server() {
 	thread_running = 0;
 	railways.SetSize(200, 200);
 	status_text = "init server";
+	mode = SMODE_STARTUP;
+	data_reset.mr_idx = -1;
+	data_reset.mr_step = SMRESET_STEP_INIT;
+	gettimeofday(&data_reset.mr_timestamp, NULL);
+
 	Load ();
 };
 
@@ -59,6 +64,31 @@ void Server::ThreadProcess() {
 	while (running) {
 		interfaces.Loop();
 		turnouts.Loop();
+
+		debug (0, "%s:%d mode:%d data_reset.step:%d data_reset.idx:%d", __FILE__, __LINE__, mode, data_reset.mr_step, data_reset.mr_idx);
+
+		//
+		// startup process
+		if (mode == SMODE_STARTUP) {
+			SetModeReset();
+		}
+
+		//
+		// reset all internal data
+		else if (mode == SMODE_RESET) {
+			SetModeManual();
+		}
+
+		//
+		// mode manual
+		else if (mode == SMODE_MANUAL) {
+		}
+
+		//
+		// mode auto
+		else if (mode == SMODE_AUTO) {
+		}
+
 		usleep (25000);
 	}
 	debug (0, "Server::ThreadProcess Finished");
@@ -102,14 +132,14 @@ bool Server::IsChanged() {
 
 //
 // Set Mode Auto
-void Server::ModeAuto() {
+void Server::SetModeAuto() {
 	debug (0, "%s:%d * Mode Auto", __FILE__, __LINE__);
 	status_text = "Mode Auto";
 }
 
 //
 // Set Mode Manual
-void Server::ModeManual() {
+void Server::SetModeManual() {
 	debug (0, "%s:%d * Mode Manual", __FILE__, __LINE__);
 	status_text = "Mode Manual";
 }
@@ -117,16 +147,21 @@ void Server::ModeManual() {
 //
 // Set Mode Error
 // FIXME: maybe adding error text as parameter?
-void Server::ModeError(string text) {
+void Server::SetModeError(string text) {
 	debug (0, "%s:%d * Mode Error :'%s'", __FILE__, __LINE__, text.c_str());
 	status_text = "Error:'" + text + "'";
 }
 
 //
 // Set Mode Reset
-void Server::ModeReset() {
+void Server::SetModeReset() {
 	debug (0, "%s:%d * Reset Data", __FILE__, __LINE__);
 	status_text = "Mode Reset";
+
+	mode = SMODE_RESET;
+	data_reset.mr_step = SMRESET_STEP_INIT;
+	data_reset.mr_idx = -1;
+	gettimeofday(&data_reset.mr_timestamp, NULL);
 };
 
 

server/server.h

@@ -29,27 +29,28 @@
 #include "sensor.h"
 #include "interface.h"
 
-enum SSTATUS {
-	SSTATUS_STARTUP,
-	SSTATUS_RESET,
-	SSTATUS_MANUAL,
-	SSTATUS_AUTO,
+enum SMODE {
+	SMODE_STARTUP,
+	SMODE_RESET,
+	SMODE_MANUAL,
+	SMODE_AUTO,
 
-	SSTATUS_MAX
+	SMODE_MAX
 };
 
-enum MRESET {
-	MRESET_STEP_INTERFACES,
-	MRESET_STEP_LOCOMOTIVES,
-	MRESET_STEP_TURNOUTS,
-	MRESET_STEP_SENSORS,
+enum SMRESET {
+	SMRESET_STEP_INIT,
+	SMRESET_STEP_LOCOMOTIVES,
+	SMRESET_STEP_TURNOUTS,
+	SMRESET_STEP_SENSORS,
+	SMRESET_STEP_INTERFACES,
 
-	MRESET_STEP_MAX
+	SMRESET_STEP_MAX
 };
 
 struct s_ModeResetData{
 	int mr_step;					// current step
-	int mr_timestamp;	// timestamp ( needed for times )
+	struct timeval mr_timestamp;	// timestamp ( needed for times )
 	int mr_idx;						// mode index
 } typedef ModeResetData;
 
@@ -119,10 +120,10 @@ public:
 	// FIXME:
 	// FIXME:
 	JSONParse GetJSONServerStatus();
-	void ModeReset();				// mode Reset if finished will go to Manual
-	void ModeManual();				// Manual Mode
-	void ModeAuto();				// only allowed if Manual was set
-	void ModeError(string text);	// will cut power and keep this mode, until reset or Mode Manual
+	void SetModeReset();				// mode Reset if finished will go to Manual
+	void SetModeManual();				// Manual Mode
+	void SetModeAuto();					// only allowed if Manual was set
+	void SetModeError(string text);		// will cut power and keep this mode, until reset or Mode Manual
 	string GetStatus();					// return status
 
 	/////////////////////////////////////////

server/session.cc

@@ -113,7 +113,7 @@ int Session::ProcessData(JSONParse *jin, JSONParse *jout) {
 		}
 		else if (command.compare("resetdata") == 0) {
 			debug (0, "* Reset All Data");
-			server->ModeReset();
+			server->SetModeReset();
 		}
 		else if (command.compare("getall") == 0) {
 			json.Clear();