PendingCommand cmd;
cmd.command[0] = READ_POWER_STATE;
cmd.length = 1;
- push_command(cmd);
+ command_queue.push(cmd);
cmd.command[0] = MFX_SET_STATION_ID;
cmd.command[1] = 'R';
cmd.command[3] = 'C';
cmd.command[4] = '2';
cmd.length = 5;
- push_command(cmd);
+ command_queue.push(cmd);
}
ArduControl::~ArduControl()
cmd.tag.serial = power.serial;
cmd.command[0] = (p ? POWER_ON : POWER_OFF);
cmd.length = 1;
- push_command(cmd);
+ command_queue.push(cmd);
}
}
return protocol_info[map_protocol(proto_name)].max_speed;
}
+const Driver::DetectedLocomotive *ArduControl::enumerate_detected_locos(unsigned i) const
+{
+ if(i>=mfx_info.size())
+ return 0;
+
+ return &mfx_info[i];
+}
+
unsigned ArduControl::add_loco(unsigned addr, const string &proto_name, const VehicleType &)
{
if(!addr)
if(loco.speed.set(speed))
{
PendingCommand cmd(loco, Locomotive::SPEED);
- push_command(cmd);
+ command_queue.push(cmd);
refresh.add_loco(loco);
}
if(loco.reverse.set(rev))
{
PendingCommand cmd(loco, Locomotive::REVERSE);
- push_command(cmd);
+ command_queue.push(cmd);
refresh.add_loco(loco);
}
if(func>0 || loco.proto!=MM)
{
PendingCommand cmd(loco, Locomotive::FUNCTIONS, func);
- push_command(cmd);
+ command_queue.push(cmd);
}
refresh.add_loco(loco);
void ArduControl::tick()
{
- while(Tag tag = pop_completed_tag())
+ Tag tag;
+ while(completed_commands.pop(tag))
{
if(tag.type==Tag::GENERAL)
{
if(power.commit(tag.serial))
signal_power.emit(power.current);
}
+ else if(tag.command==NEW_LOCO)
+ {
+ MfxInfo info;
+ if(mfx_search.pop_info(info))
+ {
+ MfxInfoArray::iterator i;
+ for(i=mfx_info.begin(); (i!=mfx_info.end() && i->id!=info.id); ++i) ;
+ if(i==mfx_info.end())
+ {
+ mfx_info.push_back(info);
+ i = --mfx_info.end();
+ }
+ else
+ *i = info;
+ signal_locomotive_detected.emit(*i);
+ }
+ }
}
else if(tag.type==Tag::LOCOMOTIVE)
{
for(i=0; (lowest_bit>>i)>1; ++i) ;
acc.state.set(acc.state^lowest_bit);
PendingCommand cmd(acc, Accessory::ACTIVATE, i);
- push_command(cmd);
+ command_queue.push(cmd);
}
else
accessory_queue.pop_front();
{
off_timeout = Time::TimeStamp();
PendingCommand cmd(*active_accessory, Accessory::DEACTIVATE);
- push_command(cmd);
+ command_queue.push(cmd);
}
}
}
{
}
-void ArduControl::push_command(const PendingCommand &cmd)
-{
- MutexLock lock(mutex);
- command_queue.push_back(cmd);
-}
-
-bool ArduControl::pop_command(PendingCommand &cmd)
-{
- MutexLock lock(mutex);
- if(command_queue.empty())
- return false;
- cmd = command_queue.front();
- command_queue.pop_front();
- return true;
-}
-
-void ArduControl::push_completed_tag(const Tag &tag)
-{
- MutexLock lock(mutex);
- completed_commands.push_back(tag);
-}
-
-ArduControl::Tag ArduControl::pop_completed_tag()
-{
- MutexLock lock(mutex);
- if(completed_commands.empty())
- return Tag();
- Tag tag = completed_commands.front();
- completed_commands.pop_front();
- return tag;
-}
-
ArduControl::Tag::Tag():
type(NONE),
}
+template<typename T>
+void ArduControl::Queue<T>::push(const T &item)
+{
+ MutexLock lock(mutex);
+ items.push_back(item);
+}
+
+template<typename T>
+bool ArduControl::Queue<T>::pop(T &item)
+{
+ MutexLock lock(mutex);
+ if(items.empty())
+ return false;
+
+ item = items.front();
+ items.pop_front();
+ return true;
+}
+
+
ArduControl::RefreshTask::RefreshTask():
next(cycle.end()),
round(0),
tag.command = Sensor::STATE;
tag.serial = i->second.state.serial;
tag.id = i->first;
- control.push_completed_tag(tag);
+ control.completed_commands.push(tag);
}
if(count>octets_remaining)
next_address(1),
size(0),
bits(0),
- pending(false)
+ misses(0)
{ }
bool ArduControl::MfxSearchTask::get_work(PendingCommand &cmd)
{
- if(size==32)
+ if(size>32)
{
if(control.debug>=1)
IO::print("Assigning MFX address %d to decoder %08X\n", next_address, bits);
+ MfxInfo info;
+ info.protocol = "MFX";
+ info.address = next_address;
+ info.name = format("%08X", bits);
+ info.id = bits;
+ queue.push(info);
+
cmd.command[0] = MFX_ASSIGN_ADDRESS;
cmd.command[1] = next_address>>8;
cmd.command[2] = next_address;
cmd.command[3+i] = bits>>(24-i*8);
cmd.length = 7;
+ cmd.tag.type = Tag::GENERAL;
+ cmd.tag.command = NEW_LOCO;
+ cmd.tag.id = bits;
+
size = 0;
bits = 0;
++next_address;
cmd.length = 6;
next = t+200*Time::msec;
- pending = true;
if(control.debug>=1)
IO::print("Search %08X/%d\n", bits, size);
void ArduControl::MfxSearchTask::process_reply(const char *reply, unsigned length)
{
unsigned char type = reply[0];
- if(type==MFX_FEEDBACK && length==2 && pending)
+ if(type==MFX_SEARCH_FEEDBACK && length==2)
{
- pending = false;
- bool finished = true;
if(reply[1])
{
- if(size<32)
- ++size;
- finished = false;
+ misses = 0;
+ ++size;
}
- else if(size>0)
+ else if(size>0 && misses<6)
{
- unsigned mask = 1<<(32-size);
- if(!(bits&mask))
- {
- bits |= mask;
- finished = false;
- }
+ ++misses;
+ bits ^= 1<<(32-size);
}
-
- if(finished)
+ else
{
next = Time::now()+2*Time::sec;
bits = 0;
size = 0;
+ misses = 0;
}
}
}
+bool ArduControl::MfxSearchTask::pop_info(MfxInfo &info)
+{
+ return queue.pop(info);
+}
+
ArduControl::ControlThread::ControlThread(ArduControl &c):
control(c),
void ArduControl::ControlThread::main()
{
+ init_baud_rate();
+
while(!done)
{
PendingCommand cmd;
for(unsigned i=0; (success && i<cmd.repeat_count); ++i)
success = (do_command(cmd)==COMMAND_OK);
if(success && cmd.tag)
- control.push_completed_tag(cmd.tag);
+ control.completed_commands.push(cmd.tag);
}
else
Time::sleep(10*Time::msec);
}
}
+void ArduControl::ControlThread::init_baud_rate()
+{
+ static unsigned rates[] = { 57600, 9600, 19200, 38400, 0 };
+ unsigned rate = 0;
+ control.serial.set_data_bits(8);
+ control.serial.set_parity(IO::Serial::NONE);
+ control.serial.set_stop_bits(1);
+ for(unsigned i=0; rates[i]; ++i)
+ {
+ control.serial.set_baud_rate(rates[i]);
+ control.serial.put('\xFF');
+ if(IO::poll(control.serial, IO::P_INPUT, 500*Time::msec))
+ {
+ int c = control.serial.get();
+ if(c==0xFF)
+ {
+ rate = rates[i];
+ break;
+ }
+ }
+ }
+
+ if(!rate)
+ {
+ done = true;
+ return;
+ }
+
+ if(control.debug>=1)
+ IO::print("ArduControl detected at %d bits/s\n", rate);
+
+ if(rate!=rates[0])
+ {
+ PendingCommand cmd;
+ cmd.command[0] = SET_BAUD_RATE;
+ cmd.command[1] = rates[0]>>8;
+ cmd.command[2] = rates[0];
+ cmd.length = 3;
+ if(do_command(cmd)==COMMAND_OK)
+ {
+ control.serial.set_baud_rate(rates[0]);
+ Time::sleep(Time::sec);
+ if(do_command(cmd)==COMMAND_OK)
+ {
+ if(control.debug>=1)
+ IO::print("Rate changed to %d bits/s\n", rates[0]);
+ }
+ }
+ }
+}
+
bool ArduControl::ControlThread::get_work(PendingCommand &cmd)
{
- if(control.pop_command(cmd))
+ if(control.command_queue.pop(cmd))
return true;
for(vector<Task *>::iterator i=tasks.begin(); i!=tasks.end(); ++i)
tag.type = Tag::GENERAL;
tag.command = POWER;
tag.serial = control.power.serial;
- control.push_completed_tag(tag);
+ control.completed_commands.push(tag);
}
else
{
projects / r2c2.git / blobdiff