Commit 4db7e0bc authored by Mall, Anon's avatar Mall, Anon
Browse files

fixed errors

parent 16f583cb
......@@ -149,7 +149,7 @@ protected:
str *token,
coap_pdu_t *response);
static void hnd_get_max_height(coap_context_t *ctx,
void hnd_get_max_height(coap_context_t *ctx,
struct coap_resource_t *resource,
const coap_endpoint_t *local_interface,
coap_address_t *peer,
......@@ -157,7 +157,7 @@ protected:
str *token,
coap_pdu_t *response);
static void hnd_get_min_height(coap_context_t *ctx,
void hnd_get_min_height(coap_context_t *ctx,
struct coap_resource_t *resource,
const coap_endpoint_t *local_interface,
coap_address_t *peer,
......
......@@ -37,6 +37,8 @@ Controller::Controller(std::string offset_file):
f_in >> m_offset;
f_in.close();
}
m_minHeight = MIN_HEIGHT+m_offset;
m_maxHeight = MAX_HEIGHT+m_offset;
}
void
......@@ -134,8 +136,6 @@ LinakDesk::LinakDesk(std::string offset_file):
m_stopDelay(STOP_DELAY),
m_smallStepTime(SMALL_STEP_TIME),
Controller(offset_file),
m_minHeight(MIN_HEIGHT+m_offset),
m_maxHeight(MAX_HEIGHT+m_offset),
m_smallStep(false),
m_finished(true)
{
......
......@@ -38,12 +38,16 @@ class Controller
virtual void setHeight(int height) = 0;
virtual int getHeight() = 0;
virtual int getMaxHeight(void){return m_maxHeight;};
virtual int getMinHeight(void){return m_minHeight;};
protected:
std::string m_offsetFile;
int m_offset;
int m_targetHeight;
int m_currentHeight;
int m_minHeight;
int m_maxHeight;
std::set<std::reference_wrapper<Frontend>,
bool (*)(std::reference_wrapper<Frontend>,
......@@ -96,15 +100,11 @@ class LinakDesk : public Controller
virtual void doDeskControl(void);
virtual void setHeight(int height);
virtual int getHeight();
int getMaxHeight(void){return m_maxHeight};
int getMinHeight(void){return m_minHeight};
uint16_t move(Command cmd);
virtual ~LinakDesk();
protected:
int getInternalHeight();
int m_minHeight;
int m_maxHeight;
int m_stopDelay;
int m_smallStepTime;
std::mutex m_cmdMutex;
......
......@@ -23,7 +23,8 @@ public:
: m_msg(msg){ }
virtual const char* what()
const _GLIBCXX_TXN_SAFE_DYN _GLIBCXX_USE_NOEXCEPT{
//const _GLIBCXX_TXN_SAFE_DYN _GLIBCXX_USE_NOEXCEPT{
const _GLIBCXX_USE_NOEXCEPT{
return m_msg.c_str();
}
......@@ -37,7 +38,8 @@ public:
TimeoutException() _GLIBCXX_USE_NOEXCEPT { }
virtual const char* what()
const _GLIBCXX_TXN_SAFE_DYN _GLIBCXX_USE_NOEXCEPT{
//const _GLIBCXX_TXN_SAFE_DYN _GLIBCXX_USE_NOEXCEPT{
const _GLIBCXX_USE_NOEXCEPT{
return "timeout";
}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment