WebSVN – HomeAutomation – Diff – /trunk/PcSoftware/Atom1.5/src/atomd.cpp

+/*
+ *
-#include <iostream>
+ *  Copyright (C) 2010  Mattias Runge
+ *
-#include <fstream>
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
-#include <vector>
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#include <string>
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License along
+ *  with this program; if not, write to the Free Software Foundation, Inc.,
-#include <stdio.h>
+ *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ */
-#include <boost/bind.hpp>
 #include <boost/program_options.hpp>
 #include "net/Manager.h"
 #include "net/types.h"
 #include "timer/Manager.h"
 #include "timer/types.h"
 #include "config/Manager.h"
 #include "logging/Logger.h"
 #include "can/Network.h"
 #include "can/Monitor.h"
+#include "can/Manager.h"
 #include "can/Protocol.h"
 using namespace atom;
 logging::Logger LOG("Main");
-net::Manager::Pointer NM = net::Manager::Instance();
-net::ServerId server_id = 0;
-timer::TimerId timer_id;
-void Main_SlotOnNewState(net::ClientId client_id, net::ServerId server_id, net::ClientState client_state)
-{
-    std::cout << "client:" << client_id << " - New state: " << client_state << std::endl;
-}
-void Main_SlotOnNewData(net::ClientId client_id, net::ServerId server_id, type::Byteset data)
-{
-    char* t = new char[2048];
-    memset(t, 0, sizeof(t));
-    //LOG.Info("size:" + boost::lexical_cast<std::string>(data.GetSize()*3+2));
-    for (unsigned int n = 0; n < data.GetSize(); n++)
-    {
-        unsigned char c = data[n];
-        //LOG.Info(boost::lexical_cast<std::string>(n) + ":" + boost::lexical_cast<std::string>((unsigned int)c));
-        //std::cout << std::dec << n << ":(dec)" << std::dec << (unsigned int)c << std::endl;
-        std::cout << std::dec << n << ":(hex)" << std::hex << (unsigned int)c << std::endl;
-        sprintf(t + n*2, "%02X", c);
-    }
-    std::cout << std::dec << "client:" << client_id << " - New data: " << t << std::endl;
-    delete [] t;
+void CleanUp();
-}
-void Main_SlotOnTimeout(timer::TimerId timer_id)
-{
- /*   std::cout << "timer:" << timer_id << " - expired" << std::endl;
-    std::string out_string = "Timeout!";
-    type::Byteset out_data;
-    strncpy(out_data.GetRaw(), out_string.data(), out_data.size());
-   // NM->SendToAll(server_id, out_data);*/
-}
 int main(int argc, char **argv)
+{
     std::vector<broker::Subscriber::Pointer> subscribers;
-    config::Manager::Pointer CM = config::Manager::Instance();
-    if (!CM->Set(argc, argv))
+    if (!config::Manager::Instance()->Set(argc, argv))
     {
-        NM->Delete();
+        CleanUp();
-        return 0;
+        return EXIT_SUCCESS;
     }
-    if (CM->Exist("ProtocolFile"))
+    if (config::Manager::Instance()->Exist("ProtocolFile"))
     {
-        LOG.Info("ProtocolFile: " + CM->GetAsString("ProtocolFile"));
-        can::Protocol::Instance()->Load(CM->GetAsString("ProtocolFile"));
+        can::Protocol::Instance()->Load(config::Manager::Instance()->GetAsString("ProtocolFile"));
     }
-    if (CM->Exist("MonitorPort"))
+    if (config::Manager::Instance()->Exist("MonitorPort"))
     {
-        LOG.Info("MonitorPort: " + boost::lexical_cast<std::string>(CM->GetAsInt("MonitorPort")));
-        subscribers.push_back(can::Monitor::Pointer(new can::Monitor(CM->GetAsInt("MonitorPort"))));
+        subscribers.push_back(can::Monitor::Pointer(new can::Monitor(config::Manager::Instance()->GetAsInt("MonitorPort"))));
-    }
-    if (CM->Exist("CanNet"))
-    {
-        type::StringList cannets = CM->GetAsStringVector("CanNet");
-        for (int n = 0; n < cannets.size(); n++)
-        {
-            LOG.Info("CanNet[" + boost::lexical_cast<std::string>(n) + "]=" + cannets[n]);
-            subscribers.push_back(can::Network::Pointer(new can::Network(cannets[n])));
-        }
+    }
+    subscribers.push_back(can::Manager::Instance());
+    if (config::Manager::Instance()->Exist("CanNet"))
+    {
+        type::StringList cannetworks = config::Manager::Instance()->GetAsStringVector("CanNet");
-   /* timer::Manager::Pointer TM = timer::Manager::Instance();
-    TM->Set(10000, true);
-    TM->ConnectSlots(boost::bind(&Main_SlotOnTimeout, _1));
-    */
-   // std::cout << "connect slots2" << std::endl;
-   // NM->ConnectSlots(boost::bind(&Main_SlotOnNewState, _1, _2, _3), boost::bind(&Main_SlotOnNewData, _1, _2, _3));
-    try
-    {
-       // server_id = NM->StartServer(net::PROTOCOL_SERIAL, 2000);
-       // timer_id = TM->Set(10000, true);
-        //net::ClientId client_id_udp = NM->Connect(net::PROTOCOL_UDP, "192.168.1.250", 1100);
-        //net::ClientId client_id_udp = NM->Connect(net::PROTOCOL_SERIAL, "/dev/ttyUSB0", 57600);
-        //std::cout << "connected" << std::endl;
+        for (int n = 0; n < cannetworks.size(); n++)
-        /*char c[2] = { 251, 0 };
-        std::cout << "before send " << std::endl;
-        NM->SendTo(client_id_udp, c);*/
-    }
-    catch (std::exception e)
+        {
-        std::cerr << e.what() << std::endl;
+            subscribers.push_back(can::Network::Pointer(new can::Network(cannetworks[n])));
+        }
+    }
+    sleep(100000000);
-    std::cout << "sleep" << std::endl;
+    subscribers.clear();
-    sleep(100000000);
+    CleanUp();
-    return 0;
+    return EXIT_SUCCESS;
+}
+void CleanUp()
+{
+    config::Manager::Delete();
+    net::Manager::Delete();
+    can::Manager::Delete();
+    timer::Manager::Delete();
+}

Subversion Repositories HomeAutomation

(root)/trunk/PcSoftware/Atom1.5/src/atomd.cpp @ 1663 – Rev 1596 → 1598