X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Flibr2c2%2Farducontrol.cpp;h=1d1ece9adb4eb4fb5e347c373298f8d1a64f869e;hb=f139a89c01dfc6580ecd1a5399e146ce45f865a4;hp=7f95b631aa119bd77e7698d48c52b94fedd7bb23;hpb=b4beace6f1d3e018dbe1495430d32f828d406229;p=r2c2.git

diff --git a/source/libr2c2/arducontrol.cpp b/source/libr2c2/arducontrol.cpp
index 7f95b63..1d1ece9 100644
--- a/source/libr2c2/arducontrol.cpp
+++ b/source/libr2c2/arducontrol.cpp
@@ -276,7 +276,7 @@ void ArduControl::set_accessory(Accessory::Kind kind, unsigned addr, unsigned st
 	if(acc.kind!=kind)
 		throw key_error(addr);
 
-	if(state!=acc.target)
+	if(state!=acc.target || acc.uncertain)
 	{
 		acc.target = state;
 		accessory_queue.push_back(&acc);
@@ -378,13 +378,6 @@ void ArduControl::tick()
 			{
 				if(acc.state.commit(tag.serial))
 				{
-					if(acc.state==acc.target)
-					{
-						if(acc.kind==Accessory::TURNOUT)
-							signal_turnout.emit(acc.address, acc.state);
-						else if(acc.kind==Accessory::SIGNAL)
-							signal_signal.emit(acc.address, acc.state);
-					}
 					if(&acc==active_accessory)
 						active_accessory = 0;
 				}
@@ -409,23 +402,40 @@ void ArduControl::tick()
 	{
 		Accessory &acc = *accessory_queue.front();
 
-		if(acc.state!=acc.target)
+		if(acc.state!=acc.target || acc.uncertain)
 		{
-			active_accessory = &acc;
-
 			unsigned changes = acc.state^acc.target;
 			unsigned lowest_bit = changes&~(changes-1);
-			unsigned i;
-			for(i=0; (lowest_bit>>i)>1; ++i) ;
-			active_index = i;
-			acc.state.set(acc.state^lowest_bit);
-			PendingCommand cmd(acc, Accessory::ACTIVATE, i);
-			command_queue.push(cmd);
-
-			monitor.reset_peak();
+			if(lowest_bit>>acc.bits)
+			{
+				// All remaining changes are in non-physical bits
+				acc.state.set(acc.state^changes);
+				acc.state.commit(acc.state.serial);
+			}
+			else
+			{
+				unsigned mask = (lowest_bit ? lowest_bit : acc.uncertain);
+				for(active_index=0; (mask>>active_index)>1; ++active_index) ;
+				acc.state.set(acc.state^lowest_bit);
+				PendingCommand cmd(acc, Accessory::ACTIVATE, active_index);
+				command_queue.push(cmd);
+				active_accessory = &acc;
+
+				monitor.reset_peak();
+			}
 		}
 		else
+		{
 			accessory_queue.pop_front();
+
+			if(acc.state==acc.target)
+			{
+				if(acc.kind==Accessory::TURNOUT)
+					signal_turnout.emit(acc.address, acc.state);
+				else if(acc.kind==Accessory::SIGNAL)
+					signal_signal.emit(acc.address, acc.state);
+			}
+		}
 	}
 
 	if(active_accessory && off_timeout)
@@ -435,17 +445,16 @@ void ArduControl::tick()
 		{
 			Accessory &acc = *active_accessory;
 
-			if(acc.kind==Accessory::TURNOUT && monitor.get_peak()<0.5f)
+			unsigned bit = 1<<active_index;
+
+			// Assume success if we were uncertain of the physical setting
+			if(acc.uncertain&bit)
+				acc.uncertain &= ~bit;
+			else if(acc.kind==Accessory::TURNOUT && monitor.get_peak()<0.5f)
 			{
-				unsigned bit = 1<<active_index;
-				if(acc.uncertain&bit)
-					acc.uncertain &= ~bit;
-				else
-				{
-					signal_turnout_failed.emit(acc.address);
-					acc.state.rollback();
-					acc.target ^= bit;
-				}
+				signal_turnout_failed.emit(acc.address);
+				acc.state.rollback();
+				acc.target ^= bit;
 			}
 
 			off_timeout = Time::TimeStamp();
@@ -457,7 +466,7 @@ void ArduControl::tick()
 
 void ArduControl::flush()
 {
-	while(!command_queue.empty() || !accessory_queue.empty())
+	while(!command_queue.empty() || (power && !accessory_queue.empty()))
 		tick();
 }
 
@@ -1025,10 +1034,41 @@ void ArduControl::ControlThread::main()
 		if(get_work(cmd))
 		{
 			bool success = true;
+			bool resync = false;
 			for(unsigned i=0; (success && i<cmd.repeat_count); ++i)
-				success = (do_command(cmd)==COMMAND_OK);
+			{
+				unsigned result = do_command(cmd, control.command_timeout);
+				success = (result==COMMAND_OK);
+				resync = (result==0);
+			}
+
 			if(success && cmd.tag)
 				control.completed_commands.push(cmd.tag);
+
+			if(resync)
+			{
+				if(control.debug>=1)
+					IO::print("Synchronization with ArduControl lost, attempting to recover\n");
+				for(unsigned i=0; (resync && i<16); ++i)
+				{
+					control.serial.put('\xFF');
+					while(IO::poll(control.serial, IO::P_INPUT, control.command_timeout))
+						resync = (control.serial.get()!=0xFF);
+				}
+				if(resync)
+				{
+					if(control.debug>=1)
+						IO::print("Resynchronization failed, giving up\n");
+					done = true;
+				}
+				else
+				{
+					if(control.debug>=1)
+						IO::print("Resynchronization successful\n");
+					if(cmd.tag)
+						control.command_queue.push(cmd);
+				}
+			}
 		}
 		else
 			Time::sleep(10*Time::msec);
@@ -1174,14 +1214,11 @@ unsigned ArduControl::ControlThread::process_reply(const char *reply, unsigned r
 		return type;
 	}
 	else if(type==POWER_STATE && rlength==2)
+		set_power(reply[1]);
+	else if(type==OVERCURRENT)
 	{
-		control.power.set(reply[1]);
-
-		Tag tag;
-		tag.type = Tag::GENERAL;
-		tag.command = POWER;
-		tag.serial = control.power.serial;
-		control.completed_commands.push(tag);
+		set_power(false);
+		IO::print("Overcurrent detected!\n");
 	}
 	else
 	{
@@ -1192,6 +1229,17 @@ unsigned ArduControl::ControlThread::process_reply(const char *reply, unsigned r
 	return 0;
 }
 
+void ArduControl::ControlThread::set_power(bool p)
+{
+	control.power.set(p);
+
+	Tag tag;
+	tag.type = Tag::GENERAL;
+	tag.command = POWER;
+	tag.serial = control.power.serial;
+	control.completed_commands.push(tag);
+}
+
 
 ArduControl::Loader::Loader(ArduControl &c):
 	DataFile::ObjectLoader<ArduControl>(c)