]> git.tdb.fi Git - r2c2.git/blobdiff - source/libr2c2/arducontrol.cpp
Implement flush() for ArduControl
[r2c2.git] / source / libr2c2 / arducontrol.cpp
index e29614f6646a5c5fd3068d819c7e89c071a0c154..1bb48d47f88eac60a301fc32720abccf33c83809 100644 (file)
@@ -1,4 +1,7 @@
 #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"
@@ -15,15 +18,25 @@ ArduControl::ProtocolInfo ArduControl::protocol_info[2] =
        { 0x3FFF, 126, 15 }  // MFX
 };
 
-ArduControl::ArduControl(const string &dev):
-       serial(dev),
-       debug(1),
+ArduControl::ArduControl(const Options &opts):
+       serial(opts.get<string>(string(), "ttyUSB0")),
+       debug(opts.get<unsigned>("debug")),
+       state_file("arducontrol.state"),
        power(false),
+       halted(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;
@@ -55,8 +68,19 @@ void ArduControl::set_power(bool p)
        }
 }
 
-void ArduControl::halt(bool)
+void ArduControl::halt(bool h)
 {
+       if(h==halted)
+               return;
+
+       halted = h;
+       if(halted)
+       {
+               for(LocomotiveMap::const_iterator i=locomotives.begin(); i!=locomotives.end(); ++i)
+                       set_loco_speed(i->first, 0);
+       }
+
+       signal_halt.emit(halted);
 }
 
 const char *ArduControl::enumerate_protocols(unsigned i) const
@@ -107,6 +131,20 @@ unsigned ArduControl::add_loco(unsigned addr, const string &proto_name, const Ve
        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);
@@ -120,6 +158,9 @@ void ArduControl::set_loco_speed(unsigned id, unsigned speed)
        if(speed>protocol_info[loco.proto].max_speed)
                throw invalid_argument("ArduControl::set_loco_speed");
 
+       if(speed && halted)
+               return;
+
        if(loco.speed.set(speed))
        {
                PendingCommand cmd(loco, Locomotive::SPEED);
@@ -288,15 +329,8 @@ void ArduControl::tick()
                                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);
                                }
                        }
@@ -338,9 +372,7 @@ void ArduControl::tick()
 
                        Accessory &acc = i->second;
                        if(tag.command==Accessory::ACTIVATE)
-                       {
                                off_timeout = Time::now()+acc.active_time;
-                       }
                        else if(tag.command==Accessory::DEACTIVATE)
                        {
                                if(acc.state.commit(tag.serial))
@@ -372,7 +404,7 @@ void ArduControl::tick()
                }
        }
 
-       while(!active_accessory && !accessory_queue.empty())
+       while(power && !active_accessory && !accessory_queue.empty())
        {
                Accessory &acc = *accessory_queue.front();
 
@@ -384,9 +416,12 @@ void ArduControl::tick()
                        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();
                }
                else
                        accessory_queue.pop_front();
@@ -397,8 +432,23 @@ void ArduControl::tick()
                Time::TimeStamp t = Time::now();
                if(t>off_timeout)
                {
+                       Accessory &acc = *active_accessory;
+
+                       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;
+                               }
+                       }
+
                        off_timeout = Time::TimeStamp();
-                       PendingCommand cmd(*active_accessory, Accessory::DEACTIVATE);
+                       PendingCommand cmd(acc, Accessory::DEACTIVATE, active_index);
                        command_queue.push(cmd);
                }
        }
@@ -406,6 +456,25 @@ void ArduControl::tick()
 
 void ArduControl::flush()
 {
+       while(!command_queue.empty() || !accessory_queue.empty())
+               tick();
+}
+
+void ArduControl::save_state() const
+{
+       FS::RedirectedPath tmp_file(state_file);
+       IO::BufferedFile out(tmp_file.str(), IO::M_WRITE);
+       DataFile::Writer writer(out);
+
+       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);
+       }
 }
 
 
@@ -491,6 +560,8 @@ ArduControl::Accessory::Accessory(Kind k, unsigned a, unsigned b):
        address(a),
        bits(b),
        state(0),
+       uncertain((1<<bits)-1),
+       target(0),
        active_time(500*Time::msec)
 { }
 
@@ -588,6 +659,12 @@ bool ArduControl::Queue<T>::pop(T &item)
        return true;
 }
 
+template<typename T>
+bool ArduControl::Queue<T>::empty() const
+{
+       return items.empty();
+}
+
 
 ArduControl::RefreshTask::RefreshTask():
        next(cycle.end()),
@@ -685,11 +762,17 @@ void ArduControl::RefreshTask::advance()
 ArduControl::S88Task::S88Task(ArduControl &c):
        control(c),
        n_octets(0),
-       octets_remaining(0)
+       octets_remaining(0),
+       delay(0)
 { }
 
 bool ArduControl::S88Task::get_work(PendingCommand &cmd)
 {
+       if(delay)
+       {
+               --delay;
+               return false;
+       }
        if(octets_remaining || !n_octets)
                return false;
 
@@ -698,6 +781,8 @@ bool ArduControl::S88Task::get_work(PendingCommand &cmd)
        cmd.command[1] = octets_remaining;
        cmd.length = 2;
 
+       delay = 4;
+
        return true;
 }
 
@@ -852,16 +937,69 @@ void ArduControl::MfxSearchTask::process_reply(const char *reply, unsigned lengt
        }
 }
 
+void ArduControl::MfxSearchTask::set_next_address(unsigned a)
+{
+       next_address = a;
+}
+
 bool ArduControl::MfxSearchTask::pop_info(MfxInfo &info)
 {
        return queue.pop(info);
 }
 
 
+ArduControl::MonitorTask::MonitorTask():
+       voltage(0),
+       current(0),
+       base_level(0),
+       peak_level(0),
+       next_type(0)
+{ }
+
+bool ArduControl::MonitorTask::get_work(PendingCommand &cmd)
+{
+       Time::TimeStamp t = Time::now();
+       if(t<next_poll)
+               return false;
+
+       if(next_type==0)
+               cmd.command[0] = READ_INPUT_VOLTAGE;
+       else
+               cmd.command[0] = READ_TRACK_CURRENT;
+       cmd.length = 1;
+
+       next_poll = t+200*Time::msec;
+       next_type = (next_type+1)%5;
+
+       return true;
+}
+
+void ArduControl::MonitorTask::process_reply(const char *reply, unsigned length)
+{
+       unsigned char type = reply[0];
+       if(type==INPUT_VOLTAGE && length==3)
+               voltage = ((static_cast<unsigned char>(reply[1])<<8) | static_cast<unsigned char>(reply[2]))/1000.0f;
+       else if(type==TRACK_CURRENT && length==5)
+       {
+               current = ((static_cast<unsigned char>(reply[1])<<8) | static_cast<unsigned char>(reply[2]))/1000.0f;
+               float peak = ((static_cast<unsigned char>(reply[3])<<8) | static_cast<unsigned char>(reply[4]))/1000.0f;
+               peak_level = max(peak_level, peak);
+               base_level = min(base_level, current);
+       }
+}
+
+void ArduControl::MonitorTask::reset_peak()
+{
+       base_level = current;
+       peak_level = current;
+}
+
+
 ArduControl::ControlThread::ControlThread(ArduControl &c):
        control(c),
        done(false)
 {
+       tasks.push_back(&control.monitor);
        tasks.push_back(&control.mfx_announce);
        tasks.push_back(&control.mfx_search);
        tasks.push_back(&control.s88);
@@ -920,6 +1058,8 @@ void ArduControl::ControlThread::init_baud_rate()
 
        if(!rate)
        {
+               if(control.debug>=1)
+                       IO::print("ArduControl detection failed\n");
                done = true;
                return;
        }
@@ -1047,4 +1187,34 @@ unsigned ArduControl::ControlThread::process_reply(const char *reply, unsigned r
        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