Subversion Repositories HomeAutomation

Rev

Rev 1679 | Rev 1939 | Go to most recent revision | Show entire file | Regard whitespace | Details | Blame | Last modification | View Log | SVN | RSS feed

Rev 1679 Rev 1914
Line 34... Line 34...
34 
#include "can/Protocol.h"
 34 
#include "can/Protocol.h"
35 
#include "broker/Manager.h"
 35 
#include "broker/Manager.h"
36 
#include "control/Manager.h"
 36 
#include "control/Manager.h"
37 
#include "can/Network.h"
 37 
#include "can/Network.h"
38 
#include "can/Monitor.h"
 38 
#include "can/Monitor.h"
- 
 
 39 
#include "can/CanDaemon.h"
39 
#include "vm/Manager.h"
 40 
#include "vm/Manager.h"
40 
#include "storage/Manager.h"
 41 
#include "storage/Manager.h"
41 
 
 42 
 
42 
#include "vm/plugin/System.h"
 43 
#include "vm/plugin/System.h"
43 
#include "vm/plugin/Timer.h"
 44 
#include "vm/plugin/Timer.h"
Line 118... Line 119...
118 
    can::Protocol::Instance()->Load(config::Manager::Instance()->GetAsString("ProtocolFile"));
 119 
    can::Protocol::Instance()->Load(config::Manager::Instance()->GetAsString("ProtocolFile"));
119 
   
 120 
   
120 
    if (config::Manager::Instance()->Exist("MonitorPort"))
 121 
    if (config::Manager::Instance()->Exist("MonitorPort"))
121 
    {
 122 
    {
122 
        subscribers.push_back(can::Monitor::Pointer(new can::Monitor(config::Manager::Instance()->GetAsInt("MonitorPort"))));  
 123 
        subscribers.push_back(can::Monitor::Pointer(new can::Monitor(config::Manager::Instance()->GetAsInt("MonitorPort"))));  
- 
 
 124 
    }
- 
 
 125 
 
- 
 
 126 
    if (config::Manager::Instance()->Exist("DaemonPort"))
- 
 
 127 
    {
- 
 
 128 
        subscribers.push_back(can::CanDaemon::Pointer(new can::CanDaemon(config::Manager::Instance()->GetAsInt("DaemonPort"))));  
123 
    }
 129 
    }
124 
   
 130 
   
125 
    subscribers.push_back(control::Manager::Instance());  
 131 
    subscribers.push_back(control::Manager::Instance());  
126 
   
 132 
   
127 
    vm::Manager::Instance()->AddPlugin(vm::Plugin::Pointer(new vm::plugin::System(vm::Manager::Instance()->GetIoService())));
 133 
    vm::Manager::Instance()->AddPlugin(vm::Plugin::Pointer(new vm::plugin::System(vm::Manager::Instance()->GetIoService())));
Line 140... Line 146...
140 
   
 146 
   
141 
    if (config::Manager::Instance()->Exist("CanNet"))
 147 
    if (config::Manager::Instance()->Exist("CanNet"))
142 
    {
 148 
    {
143 
        common::StringList cannetworks = config::Manager::Instance()->GetAsStringVector("CanNet");
 149 
        common::StringList cannetworks = config::Manager::Instance()->GetAsStringVector("CanNet");
144 
       
 150 
       
145 
        for (int n = 0; n < cannetworks.size(); n++)
 151 
        for (uint n = 0; n < cannetworks.size(); n++)
146 
        {
 152 
        {
147 
            subscribers.push_back(can::Network::Pointer(new can::Network(cannetworks[n])));            
 153 
            subscribers.push_back(can::Network::Pointer(new can::Network(cannetworks[n])));            
148 
        }
 154 
        }
149 
    }
 155 
    }
150 
   
 156