#include <msp/core/maputils.h>
+#include <msp/datafile/writer.h>
+#include <msp/fs/redirectedpath.h>
+#include <msp/fs/stat.h>
#include <msp/io/print.h>
#include <msp/time/utils.h>
#include "arducontrol.h"
ArduControl::ArduControl(const string &dev):
serial(dev),
debug(1),
+ state_file("arducontrol.state"),
power(false),
active_accessory(0),
s88(*this),
mfx_search(*this),
thread(*this)
{
+ if(FS::exists(state_file))
+ DataFile::load(*this, state_file.str());
+
+ unsigned max_address = 0;
+ for(MfxInfoArray::const_iterator i=mfx_info.begin(); i!=mfx_info.end(); ++i)
+ max_address = max(max_address, i->address);
+ mfx_search.set_next_address(max_address+1);
+
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 loco.id;
}
+ArduControl::MfxInfoArray::iterator ArduControl::add_mfx_info(const MfxInfo &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;
+ return i;
+}
+
void ArduControl::remove_loco(unsigned id)
{
Locomotive &loco = get_item(locomotives, id);
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)
{
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;
+ MfxInfoArray::iterator i = add_mfx_info(info);
+ save_state();
signal_locomotive_detected.emit(*i);
}
}
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)
+void ArduControl::save_state() const
{
- MutexLock lock(mutex);
- completed_commands.push_back(tag);
-}
+ FS::RedirectedPath tmp_file(state_file);
+ IO::BufferedFile out(tmp_file.str(), IO::M_WRITE);
+ DataFile::Writer writer(out);
-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;
+ writer.write((DataFile::Statement("mfx_announce_serial"), mfx_announce.get_serial()));
+ for(MfxInfoArray::const_iterator i=mfx_info.begin(); i!=mfx_info.end(); ++i)
+ {
+ DataFile::Statement st("mfx_locomotive");
+ st.append(i->id);
+ st.sub.push_back((DataFile::Statement("address"), i->address));
+ st.sub.push_back((DataFile::Statement("name"), i->name));
+ writer.write(st);
+ }
}
}
+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)
info.address = next_address;
info.name = format("%08X", bits);
info.id = bits;
- push_info(info);
+ queue.push(info);
cmd.command[0] = MFX_ASSIGN_ADDRESS;
cmd.command[1] = next_address>>8;
}
}
-void ArduControl::MfxSearchTask::push_info(const MfxInfo &info)
+void ArduControl::MfxSearchTask::set_next_address(unsigned a)
{
- MutexLock lock(mutex);
- queue.push_back(info);
+ next_address = a;
}
bool ArduControl::MfxSearchTask::pop_info(MfxInfo &info)
{
- MutexLock lock(mutex);
- if(queue.empty())
- return false;
- info = queue.back();
- queue.pop_back();
- return true;
+ return queue.pop(info);
}
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);
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
{
return 0;
}
+
+ArduControl::Loader::Loader(ArduControl &c):
+ DataFile::ObjectLoader<ArduControl>(c)
+{
+ add("mfx_announce_serial", &Loader::mfx_announce_serial);
+ add("mfx_locomotive", &Loader::mfx_locomotive);
+}
+
+void ArduControl::Loader::mfx_announce_serial(unsigned s)
+{
+ obj.mfx_announce.set_serial(s);
+}
+
+void ArduControl::Loader::mfx_locomotive(unsigned id)
+{
+ MfxInfo info;
+ info.id = id;
+ info.protocol = "MFX";
+ load_sub(info);
+ obj.add_mfx_info(info);
+}
+
+
+ArduControl::MfxInfo::Loader::Loader(MfxInfo &i):
+ DataFile::ObjectLoader<MfxInfo>(i)
+{
+ add("address", static_cast<unsigned MfxInfo::*>(&MfxInfo::address));
+ add("name", static_cast<string MfxInfo::*>(&MfxInfo::name));
+}
+
} // namespace R2C2
projects / r2c2.git / blobdiff