integrated config file into desk-controller

src/callback-test.cpp

+/*
+ * callback-test.cpp
+ *
+ *  Created on: 21.09.2017
+ *      Author: geith
+ */
+
+#include <iostream>
+#include <functional>
+
+using namespace std;
+
+typedef int (callback_t) (int, int);
+
+void
+test_function(callback_t cb, int arg1, int arg2){
+	cout << "calling callback function with arguments "
+			<< arg1 << " and " << arg2 << endl;
+
+	auto rv = cb(arg1, arg2);
+
+	cout << "got result " << rv << endl;
+}
+
+class Test{
+public:
+
+	int test_cb(int arg1, int arg2){
+		return arg1 + arg2;
+	}
+
+	void doCallbackTest(){
+		int a1 = 5;
+		int a2 = 7;
+
+#if 0
+		std::function<int(int, int)> func([this](int arg1, int arg2) -> int{
+			return this->test_cb(arg1, arg1);
+		});
+		test_function(func, a1, a2);
+#else
+		/*
+		test_function([this](int arg1, int arg2) -> int{
+			return this->test_cb(arg1, arg1);
+		}, a1, a2);
+		*/
+#endif
+	}
+
+protected:
+
+};
+
+
+int main(int argc, char** argv){
+	cout << "starting callback test" << endl;
+
+	Test t;
+
+	t.doCallbackTest();
+
+
+	cout << "finished callback test" << endl;
+	return 0;
+}

src/config.h

@@ -36,6 +36,9 @@ public:
 	std::string get(const std::string& key, const std::string& default_value);
 
 	void set(const std::string& key, const std::string& value);
+	void set(const std::string& key, const int& value){
+		set(key, std::to_string(value));
+	}
 
 protected:
 	void readFile();

src/desk-controller.cpp

@@ -20,8 +20,8 @@ using namespace usb2lin06;
 #define STOP_DELAY 2
 #define SMALL_STEP_TIME 220
 
-Controller::Controller(std::string offset_file):
-		m_offsetFile(offset_file),
+Controller::Controller(Config& conf):
+		m_config(conf),
 		m_offset(0),
 		m_targetHeight(0),
 		m_currentHeight(0),
@@ -31,14 +31,10 @@ Controller::Controller(std::string offset_file):
 				return &a.get() < &b.get();
 			})
 {
-	ifstream f_in(m_offsetFile);
 
-	if(f_in.is_open()){
-		f_in >> m_offset;
-		f_in.close();
-	}
-	m_minHeight = MIN_HEIGHT+m_offset;
-	m_maxHeight = MAX_HEIGHT+m_offset;
+	m_offset = stoi(m_config.get("offset", "0"));
+	m_minHeight = stoi(m_config.get("min_height", std::to_string(MIN_HEIGHT)));
+	m_maxHeight = stoi(m_config.get("max_height",  std::to_string(MAX_HEIGHT)));
 }
 
 void
@@ -56,13 +52,8 @@ Controller::removeFrontend(Frontend& frontend)
 void
 Controller::setOffset(int offset)
 {
-	m_offset = offset;
-	ofstream f_out(m_offsetFile);
+	m_config.set("offset", offset);
 
-	if(f_out.is_open()){
-		f_out << m_offset;
-		f_out.close();
-	}
 	m_maxHeight = m_offset + MAX_HEIGHT;
 	m_minHeight = m_offset + MIN_HEIGHT;
 }
@@ -134,10 +125,10 @@ DummyDesk::doDeskControl()
 	}
 }
 
-LinakDesk::LinakDesk(std::string offset_file):
+LinakDesk::LinakDesk(Config& conf):
 	m_stopDelay(STOP_DELAY),
 	m_smallStepTime(SMALL_STEP_TIME),
-	Controller(offset_file),
+	Controller(conf),
 	m_smallStep(false),
 	m_finished(true)
 {

src/desk-controller.h

@@ -10,6 +10,7 @@
 
 #include "desk-frontend.h"
 #include "message-queue.h"
+#include "config.h"
 
 #include <memory>
 #include <iostream>
@@ -26,7 +27,8 @@ namespace desk
 class Controller
 {
   public:
-	Controller(std::string offset_file = "desk_offset.conf");
+	Controller(Config& conf);
+	virtual ~Controller() {}
 
 	void addFrontend(Frontend &f);
 	void removeFrontend(Frontend &f);
@@ -42,7 +44,7 @@ class Controller
 	virtual int getMinHeight(void){return m_minHeight;};
 
   protected:
-	std::string m_offsetFile;
+	Config& m_config;
 	int m_offset;
 	int m_targetHeight;
 	int m_currentHeight;
@@ -95,7 +97,7 @@ class LinakDesk : public Controller
 		Operation operationState;
 	};
 
-	LinakDesk(std::string offset_file = "desk_offset.conf");
+	LinakDesk(Config& conf);
 	void notifyFrontends(int height);
 	virtual void doDeskControl(void);
 	virtual void setHeight(int height);

src/desk-main.cpp

@@ -8,20 +8,21 @@
 #include "desk-controller.h"
 #include "cmd-frontend.h"
 #include "coap-frontend.h"
+#include "config.h"
 
 #include <iostream>
 
 using namespace std;
 using namespace desk;
 
-int main(int rgc, char** argv){
-	//Controller c;
-	//DummyDesk c;
-	LinakDesk c;
-	CmdFrontend cf(c);
-	CoapFrontend cof(c, 5678);
+int main(int argc, char** argv){
+	Config conf("/etc/desk.conf");
 
-	c.doDeskControl();
+	LinakDesk desk(conf);
+	CmdFrontend cf(desk);
+	CoapFrontend cof(desk, 5678);
+
+	desk.doDeskControl();
 
 	return 0;
 }