Changeset 18993

Timestamp:

04/07/18 17:30:26 (7 years ago)

Author:

tbretz

Message:

Implemented a program to read the rain sensor data from MAGIC.

Location:

trunk/FACT++

Files:

• CMakeLists.txt (modified) (7 diffs)
• Makefile.am (modified) (3 diffs)
• src/HeadersRainSensor.h (added)
• src/rainsensor.cc (added)

trunk/FACT++/CMakeLists.txt

@@ -71 +71 @@
 # *********************************
 
+# =========== pkg-config ============
+FIND_PACKAGE(PkgConfig)
+FIND_PACKAGE(PackageHandleStandardArgs)
+
+
 # ========== executables ==========
 FIND_PROGRAM(HELP2MAN_EXECUTABLE help2man)
@@ -76 +81 @@
 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 +98 @@
 
 # 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 +107 @@
 # 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 +148 @@
 
 # =============== 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 +417 @@
 # ********************************************************
 
-SET(HELP++LIBS Tools Configuration Time mysqlpp mysqlclient)
+SET(HELP++LIBS Tools Configuration Time mysqlpp ${MYSQL_LIBRARIES})
 
 # --------------------------------------------------------
@@ -607 +598 @@
 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)

trunk/FACT++/Makefile.am

@@ -42 +42 @@
         magicweather magiclidar \
         smartfact evtserver getevent \
-        temperature biastemp \
+        temperature rainsensor biastemp \
         timecheck \
         showlog \
@@ -127 +127 @@
         pfminictrl.man \
         pwrctrl.man \
+        rainsensor.man \
         ratecontrol.man \
         ratescan.man \
@@ -414 +415 @@
         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 \