Index: trunk/FACT++/CMakeLists.txt =================================================================== --- trunk/FACT++/CMakeLists.txt (revision 18992) +++ trunk/FACT++/CMakeLists.txt (revision 18993) @@ -71,4 +71,9 @@ # ********************************* +# =========== pkg-config ============ +FIND_PACKAGE(PkgConfig) +FIND_PACKAGE(PackageHandleStandardArgs) + + # ========== executables ========== FIND_PROGRAM(HELP2MAN_EXECUTABLE help2man) @@ -76,11 +81,15 @@ FIND_PROGRAM(MAILX_EXECUTABLE mailx) FIND_PROGRAM(CURL_EXECUTABLE curl) -FIND_PROGRAM(PS2DPF_EXECUTABLE ps2pdf) FIND_PROGRAM(GROFF_EXECUTABLE groff) -# =========== pkg-config ============ -FIND_PACKAGE(PkgConfig) -FIND_PACKAGE(PackageHandleStandardArgs) - +FIND_PACKAGE_HANDLE_STANDARD_ARGS(groff DEFAULT_MSG GROFF_EXECUTABLE) +FIND_PACKAGE_HANDLE_STANDARD_ARGS(curl DEFAULT_MSG CURL_EXECUTABLE) +FIND_PACKAGE_HANDLE_STANDARD_ARGS(mailx DEFAULT_MSG MAILX_EXECUTABLE) +FIND_PACKAGE_HANDLE_STANDARD_ARGS(jsdoc DEFAULT_MSG JSDOC_EXECUTABLE) +FIND_PACKAGE_HANDLE_STANDARD_ARGS(help2man DEFAULT_MSG HELP2MAN_EXECUTABLE) + +#IF(NOT SOME_COND) +# MESSAGE(FATAL_ERROR "At least one required executable was not found") +#ENDIF() # =========== libraries ============= @@ -89,4 +98,8 @@ # FIXME: Need to check which package finders accept REQUIERED. For all others implement checks + +FIND_PACKAGE(Threads REQUIRED) # Threads::Threads +FIND_PACKAGE(ZLIB REQUIRED) # ZLIB::ZLIB +FIND_PACKAGE(OpenGL REQUIRED) # OpenGL::GL OpenGL::GLU / OPENGL_FOUND OPENGL_GLU_FOUND SET(CURSES_NEED_NCURSES ON) @@ -94,15 +107,32 @@ # FIXME : Require panel -FIND_PACKAGE(DBus) -FIND_PACKAGE(Motif) # MOTIF_FOUND +# FIND_PACKAGE(DBus) => skaypeclient +# FIND_PACKAGE(Motif) => did # MOTIF_FOUND +FIND_PACKAGE(Readline REQUIRED) +FIND_PACKAGE(Panel REQUIRED) FIND_PACKAGE(Nova REQUIRED) -FIND_PACKAGE(Readline REQUIRED) -FIND_PACKAGE(ZLIB REQUIRED) # ZLIB::ZLIB -FIND_PACKAGE(Threads REQUIRED) # Threads::Threads -FIND_PACKAGE(OpenGL REQUIRED) # OpenGL::GL OpenGL::GLU / OPENGL_FOUND OPENGL_GLU_FOUND - -INCLUDE_DIRECTORIES("/usr/include/mysql") - +FIND_PACKAGE(MySQL REQUIRED) +FIND_PACKAGE(MySQL++ REQUIRED) +FIND_PACKAGE(V8 REQUIRED) +FIND_PACKAGE(Cfitsio REQUIRED) +FIND_PACKAGE(CCfits REQUIRED) + +#INCLUDE_DIRECTORIES("/usr/include/mysql") +# dbus-1 dbus-glib-1 +# doxygen + +MESSAGE("") +MESSAGE(${V8_LIBRARY}) +MESSAGE(${MYSQLPP_LIBRARY}) +MESSAGE(${PANEL_LIBRARY}) MESSAGE(${CURSES_LIBRARIES}) +MESSAGE(${CCFITS_LIBRARY}) +MESSAGE(${CFITSIO_LIBRARY}) +MESSAGE(${MYSQL_LIBRARY}) +MESSAGE(${NOVA_LIBRARY}) +MESSAGE(${READLINE_LIBRARY}) +MESSAGE("") + +INCLUDE_DIRECTORIES(${MYSQL_INCLUDE_DIR}) @@ -118,45 +148,6 @@ # =============== QT4 ============== -#SET(CMAKE_AUTOMOC ON) -#SET(CMAKE_AUTORCC ON) SET(CMAKE_INCLUDE_CURRENT_DIR ON) - -# set(CMAKE_AUTOMOC ON) -# set(CMAKE_INCLUDE_CURRENT_DIR ON) -# find_package(Qt4 4.4.3 REQUIRED QtGui QtXml) -# add_executable(myexe main.cpp) -# target_link_libraries(myexe Qt4::QtGui Qt4::QtXml) - -# QtCore QtSql QtOpenGL QtXml FIND_PACKAGE(Qt4 REQUIRED QtCore QtGui QtOpenGL QtSql QtXml) -#INCLUDE_DIRECTORIES(${QT_INCLUDE_DIR}) -#INCLUDE_DIRECTORIES(${QT_QTGUI_INCLUDE_DIR}) -#INCLUDE_DIRECTORIES(${QT_QTSQL_INCLUDE_DIR}) -#INCLUDE_DIRECTORIES(${QT_QTXML_INCLUDE_DIR}) -#INCLUDE_DIRECTORIES(${QT_QTCORE_INCLUDE_DIR}) -#INCLUDE_DIRECTORIES(${QT_QTOPENGL_INCLUDE_DIR}) - -#MESSAGE(${QT_INCLUDE_DIR}) -#MESSAGE(${QT_QTGUI_INCLUDE_DIR}) -#MESSAGE(${QT_QTSQL_INCLUDE_DIR}) -#MESSAGE(${QT_QTXML_INCLUDE_DIR}) -#MESSAGE(${QT_QTCORE_INCLUDE_DIR}) -#MESSAGE(${QT_QTOPENGL_INCLUDE_DIR}) - -# dbus-1 dbus-glib-1 -# doxygen -# libm -# readline -# ncurses libpanel panel.h -# motif -# GL -# GLU -# cfitsio -# ccfits -# mysql devel -# mysqlpp devel -# boost system, asio, date_time, filesystem, program_options, regex, thread -# v8 -# Qt4/5 Core QGL QWT @@ -426,5 +417,5 @@ # ******************************************************** -SET(HELP++LIBS Tools Configuration Time mysqlpp mysqlclient) +SET(HELP++LIBS Tools Configuration Time mysqlpp ${MYSQL_LIBRARIES}) # -------------------------------------------------------- @@ -607,4 +598,8 @@ TARGET_LINK_LIBRARIES(pwrctrl ${FACT++LIBS} Qt4::QtXml) MANPAGE(pwrctrl "") + +ADD_EXECUTABLE(rainsensor src/rainsensor.cc) +TARGET_LINK_LIBRARIES(rainsensor ${FACT++LIBS}) +MANPAGE(rainsensor "") ADD_EXECUTABLE(ratecontrol src/ratecontrol.cc) Index: trunk/FACT++/Makefile.am =================================================================== --- trunk/FACT++/Makefile.am (revision 18992) +++ trunk/FACT++/Makefile.am (revision 18993) @@ -42,5 +42,5 @@ magicweather magiclidar \ smartfact evtserver getevent \ - temperature biastemp \ + temperature rainsensor biastemp \ timecheck \ showlog \ @@ -127,4 +127,5 @@ pfminictrl.man \ pwrctrl.man \ + rainsensor.man \ ratecontrol.man \ ratescan.man \ @@ -414,4 +415,9 @@ libConfiguration.la +rainsensor_SOURCES = src/rainsensor.cc src/LocalControl.h +rainsensor_LDADD = libDim++.la libDim.la libDimExtension.la \ + libStateMachine.la libTools.la libTime.la \ + libConfiguration.la + temperature_SOURCES = src/temperature.cc src/LocalControl.h temperature_LDADD = libDim++.la libDim.la libDimExtension.la \ Index: trunk/FACT++/src/HeadersRainSensor.h =================================================================== --- trunk/FACT++/src/HeadersRainSensor.h (revision 18993) +++ trunk/FACT++/src/HeadersRainSensor.h (revision 18993) @@ -0,0 +1,16 @@ +#ifndef FACT_HeadersRainSensor +#define FACT_HeadersRainSensor + +namespace RainSensor +{ + namespace State + { + enum states_t + { + kDisconnected = 1, + kConnected, + kValid + }; + }; +}; +#endif Index: trunk/FACT++/src/rainsensor.cc =================================================================== --- trunk/FACT++/src/rainsensor.cc (revision 18993) +++ trunk/FACT++/src/rainsensor.cc (revision 18993) @@ -0,0 +1,571 @@ +#if BOOST_VERSION < 104600 +#include +#endif + +#include + +#include +#include + +#include +#include + +#include // std::string +#include // std::transform +#include // std::tolower + +#include "FACT.h" +#include "Dim.h" +#include "Event.h" +#include "Shell.h" +#include "StateMachineDim.h" +#include "StateMachineAsio.h" +#include "Connection.h" +#include "LocalControl.h" +#include "Configuration.h" +#include "Timers.h" +#include "Console.h" + +#include "tools.h" + +#include "HeadersRainSensor.h" + +namespace ba = boost::asio; +namespace bs = boost::system; +namespace pt = boost::property_tree; +namespace dummy = ba::placeholders; + +using namespace std; +using namespace RainSensor; + +// ------------------------------------------------------------------------ + +class ConnectionRain : public Connection +{ + uint16_t fInterval; + + bool fDebugRx; + + string fSite; + string fRdfData; + string fAuthentication; + + boost::array fArray; + + Time fLastReport; + + int fStatus; + +protected: + struct data_t + { + float rain; + int64_t stat; + } __attribute__((__packed__)); + + virtual void UpdateRain(const Time &, const data_t &) + { + } + + void ProcessAnswer() + { + if (fDebugRx) + { + Out() << "------------------------------------------------------" << endl; + Out() << fRdfData << endl; + Out() << "------------------------------------------------------" << endl; + } + + const size_t p1 = fRdfData.find("\r\n\r\n"); + if (p1==string::npos) + { + Warn("HTTP header not found."); + PostClose(false); + return; + } + + fRdfData.erase(0, p1+4); + + data_t data; + Time time; + try + { + //{"rain": 0.0, "time": "2018-04-07T15:28:01.044273", "statistics": 30} + + std::stringstream ss; + ss << fRdfData; + + pt::ptree tree; + pt::read_json(ss, tree); + + data.rain = tree.get_child("rain").get_value(); + data.stat = tree.get_child("statistics").get_value(); + time = Time(tree.get_child("time").get_value()); + } + catch (std::exception const& e) + { + Warn("Parsing of JSON failed: "+string(e.what())); + + fStatus = RainSensor::State::kConnected; + + PostClose(false); + return; + } + + fRdfData = ""; + + UpdateRain(time, data); + + ostringstream msg; + msg << Time::iso << time << " - Rain=" << data.rain << " [N=" << data.stat << "]"; + Message(msg); + + fStatus = RainSensor::State::kValid; + + fLastReport = Time(); + PostClose(false); + } + + void HandleRead(const boost::system::error_code& err, size_t bytes_received) + { + // Do not schedule a new read if the connection failed. + if (bytes_received==0 || err) + { + if (err==ba::error::eof) + { + if (!fRdfData.empty()) + ProcessAnswer(); + return; + } + + // 107: Transport endpoint is not connected (bs::error_code(107, bs::system_category)) + // 125: Operation canceled + if (err && err!=ba::error::eof && // Connection closed by remote host + err!=ba::error::basic_errors::not_connected && // Connection closed by remote host + err!=ba::error::basic_errors::operation_aborted) // Connection closed by us + { + ostringstream str; + str << "Reading from " << URL() << ": " << err.message() << " (" << err << ")";// << endl; + Error(str); + } + PostClose(err!=ba::error::basic_errors::operation_aborted); + + fRdfData = ""; + return; + } + + fRdfData += string(fArray.data(), bytes_received); + + // Does the message contain a header? + const size_t p1 = fRdfData.find("\r\n\r\n"); + if (p1!=string::npos) + { + // Does the answer also contain the body? + const size_t p2 = fRdfData.find("\r\n\r\n", p1+4); + if (p2!=string::npos) + ProcessAnswer(); + } + + // Go on reading until the web-server closes the connection + StartReadReport(); + } + + boost::asio::streambuf fBuffer; + + void StartReadReport() + { + async_read_some(ba::buffer(fArray), + boost::bind(&ConnectionRain::HandleRead, this, + dummy::error, dummy::bytes_transferred)); + } + + + ba::deadline_timer fKeepAlive; + + void PostRequest() + { + const string cmd = + "GET "+fSite+" HTTP/1.1\r\n" + "Accept: */*\r\n" + "Content-Type: application/octet-stream\r\n" + "Authorization: Basic "+fAuthentication+"\r\n" + "User-Agent: FACT\r\n" + "Host: www.fact-project.org\r\n" + "Pragma: no-cache\r\n" + "Cache-Control: no-cache\r\n" + "Expires: 0\r\n" + "Connection: Keep-Alive\r\n" + "Cache-Control: max-age=0\r\n" + "\r\n"; + + PostMessage(cmd); + } + + void Request() + { + PostRequest(); + + fKeepAlive.expires_from_now(boost::posix_time::seconds(fInterval/2)); + fKeepAlive.async_wait(boost::bind(&ConnectionRain::HandleRequest, + this, dummy::error)); + } + + void HandleRequest(const bs::error_code &error) + { + // 125: Operation canceled (bs::error_code(125, bs::system_category)) + if (error && error!=ba::error::basic_errors::operation_aborted) + { + ostringstream str; + str << "Write timeout of " << URL() << ": " << error.message() << " (" << error << ")";// << endl; + Error(str); + + PostClose(false); + return; + } + + if (!is_open()) + { + // For example: Here we could schedule a new accept if we + // would not want to allow two connections at the same time. + PostClose(true); + return; + } + + // Check whether the deadline has passed. We compare the deadline + // against the current time since a new asynchronous operation + // may have moved the deadline before this actor had a chance + // to run. + if (fKeepAlive.expires_at() > ba::deadline_timer::traits_type::now()) + return; + + Request(); + } + + +private: + // This is called when a connection was established + void ConnectionEstablished() + { + Request(); + StartReadReport(); + } + +public: + + static const uint16_t kMaxAddr; + +public: + ConnectionRain(ba::io_service& ioservice, MessageImp &imp) : Connection(ioservice, imp()), + fLastReport(Time::none), fKeepAlive(ioservice) + { + SetLogStream(&imp); + } + + void SetDebugRx(bool b) + { + fDebugRx = b; + } + + void SetInterval(uint16_t i) + { + fInterval = i; + } + + void SetSite(const string &site) + { + fSite = site; + } + + int GetState() const + { + if (!fLastReport.IsValid() || Time()>fLastReport+boost::posix_time::seconds(fInterval*3)) + return RainSensor::State::kDisconnected; + + return fStatus; + } + + void SetAuthentication(const string &user, const string &password) + { + const string auth = user+":"+password; + + // convert binary values to base64 characters + // retrieve 6 bit integers from a sequence of 8 bit bytes + // compose all the above operations in to a new iterator + + using namespace boost::archive::iterators; + using it = base64_from_binary>; + + fAuthentication = string(it(begin(auth)), it(end(auth))); + } +}; + +const uint16_t ConnectionRain::kMaxAddr = 0xfff; + +// ------------------------------------------------------------------------ + +#include "DimDescriptionService.h" + +class ConnectionDimRain : public ConnectionRain +{ +private: + + DimDescribedService fDimRain; + + virtual void UpdateRain(const Time &tm, const data_t &data) + { + fDimRain.setData(data); + fDimRain.Update(tm); + } + +public: + ConnectionDimRain(ba::io_service& ioservice, MessageImp &imp) : + ConnectionRain(ioservice, imp), + fDimRain("RAIN_SENSOR/DATA", "F:1;X:1", + "|rain[float]:Rain" + "|count:Number of sensor requests") + { + } +}; + +// ------------------------------------------------------------------------ + +template +class StateMachineRain : public StateMachineAsio +{ +private: + S fRain; + + bool CheckEventSize(size_t has, const char *name, size_t size) + { + if (has==size) + return true; + + ostringstream msg; + msg << name << " - Received event has " << has << " bytes, but expected " << size << "."; + T::Fatal(msg); + return false; + } + + int SetVerbosity(const EventImp &evt) + { + if (!CheckEventSize(evt.GetSize(), "SetVerbosity", 1)) + return T::kSM_FatalError; + + fRain.SetVerbose(evt.GetBool()); + + return T::GetCurrentState(); + } + + int SetDebugRx(const EventImp &evt) + { + if (!CheckEventSize(evt.GetSize(), "SetDebugRx", 1)) + return T::kSM_FatalError; + + fRain.SetDebugRx(evt.GetBool()); + + return T::GetCurrentState(); + } +/* + int Disconnect() + { + // Close all connections + fRain.PostClose(false); + + return T::GetCurrentState(); + } + + int Reconnect(const EventImp &evt) + { + // Close all connections to supress the warning in SetEndpoint + fRain.PostClose(false); + + // Now wait until all connection have been closed and + // all pending handlers have been processed + ba::io_service::poll(); + + if (evt.GetBool()) + fRain.SetEndpoint(evt.GetString()); + + // Now we can reopen the connection + fRain.PostClose(true); + + return T::GetCurrentState(); + } +*/ + int Execute() + { + return fRain.GetState(); + } + +public: + StateMachineRain(ostream &out=cout) : + StateMachineAsio(out, "RAIN_SENSOR"), fRain(*this, *this) + { + // State names + T::AddStateName(RainSensor::State::kDisconnected, "NoConnection", + "No connection to web-server could be established recently"); + + T::AddStateName(RainSensor::State::kConnected, "Connected", + "Connection established, but no valid data received"); + + T::AddStateName(RainSensor::State::kValid, "Valid", + "Connection established, received data valid"); + + // Verbosity commands + T::AddEvent("SET_VERBOSE", "B") + (bind(&StateMachineRain::SetVerbosity, this, placeholders::_1)) + ("set verbosity state" + "|verbosity[bool]:disable or enable verbosity for received data (yes/no), except dynamic data"); + + T::AddEvent("SET_DEBUG_RX", "B") + (bind(&StateMachineRain::SetDebugRx, this, placeholders::_1)) + ("enable debugging for received data" + "|debug-rx[bool]:disable or enable verbosity for received data (yes/no)"); +/* + // Conenction commands + AddEvent("DISCONNECT") + (bind(&StateMachineRain::Disconnect, this)) + ("disconnect from ethernet"); + + AddEvent("RECONNECT", "O") + (bind(&StateMachineRain::Reconnect, this, placeholders::_1)) + ("(Re)connect ethernet connection to FTM, a new address can be given" + "|[host][string]:new ethernet address in the form "); +*/ + } + + int EvalOptions(Configuration &conf) + { + fRain.SetInterval(conf.Get("interval")); + fRain.SetDebugTx(conf.Get("debug-tx")); + fRain.SetDebugRx(conf.Get("debug-rx")); + fRain.SetSite(conf.Get("url")); + fRain.SetEndpoint(conf.Get("addr")); + fRain.SetAuthentication(conf.Get("user"), conf.Get("password")); + fRain.StartConnect(); + + return -1; + } +}; + + + +// ------------------------------------------------------------------------ + +#include "Main.h" + + +template +int RunShell(Configuration &conf) +{ + return Main::execute>(conf); +} + +void SetupConfiguration(Configuration &conf) +{ + po::options_description control("MAGIC rain sensor connection"); + control.add_options() + ("no-dim,d", po_switch(), "Disable dim services") + ("addr,a", var("www.magic.iac.es:80"), "Network address of Cosy") + ("url,u", var("/site/weather/protected/current.json"), "File name and path to load") + ("quiet,q", po_bool(true), "Disable printing contents of all received messages (except dynamic data) in clear text.") + ("interval,i", var(60), "Interval between two updates on the server in seconds") + ("debug-tx", po_bool(), "Enable debugging of ethernet transmission.") + ("debug-rx", po_bool(), "Enable debugging of ethernet receptions.") + ("user", var("FACT")->required(), "User name for authentication.") + ("password", var()->required(), "Password for authentication.") + ; + + conf.AddOptions(control); +} + +/* + Extract usage clause(s) [if any] for SYNOPSIS. + Translators: "Usage" and "or" here are patterns (regular expressions) which + are used to match the usage synopsis in program output. An example from cp + (GNU coreutils) which contains both strings: + Usage: cp [OPTION]... [-T] SOURCE DEST + or: cp [OPTION]... SOURCE... DIRECTORY + or: cp [OPTION]... -t DIRECTORY SOURCE... + */ +void PrintUsage() +{ + cout << + "The rainsensor is an interface to the MAGIC rainsensor data.\n" + "\n" + "The default is that the program is started without user intercation. " + "All actions are supposed to arrive as DimCommands. Using the -c " + "option, a local shell can be initialized. With h or help a short " + "help message about the usuage can be brought to the screen.\n" + "\n" + "Usage: rainsensor [-c type] [OPTIONS]\n" + " or: rainsensor [OPTIONS]\n"; + cout << endl; +} + +void PrintHelp() +{ +// Main::PrintHelp>(); + + /* Additional help text which is printed after the configuration + options goes here */ + + /* + cout << "bla bla bla" << endl << endl; + cout << endl; + cout << "Environment:" << endl; + cout << "environment" << endl; + cout << endl; + cout << "Examples:" << endl; + cout << "test exam" << endl; + cout << endl; + cout << "Files:" << endl; + cout << "files" << endl; + cout << endl; + */ +} + +int main(int argc, const char* argv[]) +{ + Configuration conf(argv[0]); + conf.SetPrintUsage(PrintUsage); + Main::SetupConfiguration(conf); + SetupConfiguration(conf); + + if (!conf.DoParse(argc, argv, PrintHelp)) + return 127; + + //try + { + // No console access at all + if (!conf.Has("console")) + { + if (conf.Get("no-dim")) + return RunShell(conf); + else + return RunShell(conf); + } + // Cosole access w/ and w/o Dim + if (conf.Get("no-dim")) + { + if (conf.Get("console")==0) + return RunShell(conf); + else + return RunShell(conf); + } + else + { + if (conf.Get("console")==0) + return RunShell(conf); + else + return RunShell(conf); + } + } + /*catch (std::exception& e) + { + cerr << "Exception: " << e.what() << endl; + return -1; + }*/ + + return 0; +}