diff --git a/lib-api.cpp b/lib-api.cpp index 4fa58f3..55c5c8a 100644 --- a/lib-api.cpp +++ b/lib-api.cpp @@ -1,6 +1,6 @@ #include "lib-api.h" -#include "lib-main.h" #include "lib-errors.h" +#include "lib-main.h" namespace TrkSim { @@ -67,15 +67,11 @@ int disconnect() { return 0; } -bool connected() { - return lib.connected; -} +bool connected() { return lib.connected; } /////////////////////////////////////////////////////////////////////////////// -int trackStatus() { - return static_cast(lib.trkStatus); -} +int trackStatus() { return static_cast(lib.trkStatus); } void setTrackStatus(unsigned int trkStatus, LibStdCallback ok, LibStdCallback) { auto status = static_cast(trkStatus); @@ -99,7 +95,7 @@ void emergencyStop(LibStdCallback ok, LibStdCallback) { } void locoEmergencyStop(uint16_t addr, LibStdCallback ok, LibStdCallback) { - lib.log("PUT: Loco "+QString::number(addr)+" Emergency Stop", LogLevel::Commands); + lib.log("PUT: Loco " + QString::number(addr) + " Emergency Stop", LogLevel::Commands); lib.hist.push([ok]() { lib.log("GET: OK", LogLevel::Commands); callEv(&lib, ok); @@ -107,8 +103,9 @@ void locoEmergencyStop(uint16_t addr, LibStdCallback ok, LibStdCallback) { } void locoSetSpeed(uint16_t addr, int speed, bool dir, LibStdCallback ok, LibStdCallback) { - lib.log("PUT: Loco "+QString::number(addr)+" set speed: "+QString::number(speed)+ - ", direction: "+QString::number(static_cast(dir)), LogLevel::Commands); + lib.log("PUT: Loco " + QString::number(addr) + " set speed: " + QString::number(speed) + + ", direction: " + QString::number(static_cast(dir)), + LogLevel::Commands); lib.hist.push([ok]() { lib.log("GET: OK", LogLevel::Commands); callEv(&lib, ok); @@ -117,8 +114,9 @@ void locoSetSpeed(uint16_t addr, int speed, bool dir, LibStdCallback ok, LibStdC void locoSetFunc(uint16_t addr, uint32_t funcMask, uint32_t funcState, LibStdCallback ok, LibStdCallback) { - lib.log("PUT: Loco "+QString::number(addr)+" set func: mask="+QString::number(funcMask, 2)+ - ", state="+QString::number(funcState, 2), LogLevel::Commands); + lib.log("PUT: Loco " + QString::number(addr) + " set func: mask=" + + QString::number(funcMask, 2) + ", state=" + QString::number(funcState, 2), + LogLevel::Commands); lib.hist.push([ok]() { lib.log("GET: OK", LogLevel::Commands); callEv(&lib, ok); @@ -126,7 +124,7 @@ void locoSetFunc(uint16_t addr, uint32_t funcMask, uint32_t funcState, LibStdCal } void locoAcquire(uint16_t addr, TrkAcquiredCallback acquired, LibStdCallback) { - lib.log("PUT: Loco "+QString::number(addr)+" Acquire", LogLevel::Commands); + lib.log("PUT: Loco " + QString::number(addr) + " Acquire", LogLevel::Commands); lib.hist.push([addr, acquired]() { LocoInfo info; info.addr = addr; @@ -137,13 +135,14 @@ void locoAcquire(uint16_t addr, TrkAcquiredCallback acquired, LibStdCallback) { } void locoRelease(uint16_t addr, LibStdCallback ok) { - lib.log("PUT: Loco "+QString::number(addr)+" Release", LogLevel::Commands); + lib.log("PUT: Loco " + QString::number(addr) + " Release", LogLevel::Commands); callEv(&lib, ok); } void pomWriteCv(uint16_t addr, uint16_t cv, uint8_t value, LibStdCallback ok, LibStdCallback) { - lib.log("PUT: Loco "+QString::number(addr)+" POM CV "+QString::number(cv)+ - ", val="+QString::number(value), LogLevel::Commands); + lib.log("PUT: Loco " + QString::number(addr) + " POM CV " + QString::number(cv) + + ", val=" + QString::number(value), + LogLevel::Commands); lib.hist.push([ok]() { lib.log("GET: OK", LogLevel::Commands); callEv(&lib, ok); diff --git a/lib-api.h b/lib-api.h index 90c253f..c020425 100644 --- a/lib-api.h +++ b/lib-api.h @@ -14,7 +14,7 @@ constexpr std::array API_SUPPORTED_VERSIONS { extern "C" { -using LibCallbackFunc = void CALL_CONV (*) (void *sender, void *data); +using LibCallbackFunc = void CALL_CONV (*)(void *sender, void *data); struct LibStdCallback { LibCallbackFunc func; @@ -42,21 +42,21 @@ SIM_SHARED_EXPORT bool CALL_CONV connected(); SIM_SHARED_EXPORT int CALL_CONV trackStatus(); SIM_SHARED_EXPORT void CALL_CONV setTrackStatus(unsigned int trkStatus, LibStdCallback ok, - LibStdCallback err); + LibStdCallback err); SIM_SHARED_EXPORT void CALL_CONV emergencyStop(LibStdCallback ok, LibStdCallback err); SIM_SHARED_EXPORT void CALL_CONV locoEmergencyStop(uint16_t addr, LibStdCallback ok, - LibStdCallback err); + LibStdCallback err); SIM_SHARED_EXPORT void CALL_CONV locoSetSpeed(uint16_t addr, int speed, bool dir, LibStdCallback ok, - LibStdCallback err); + LibStdCallback err); SIM_SHARED_EXPORT void CALL_CONV locoSetFunc(uint16_t addr, uint32_t funcMask, uint32_t funcState, - LibStdCallback ok, LibStdCallback err); + LibStdCallback ok, LibStdCallback err); SIM_SHARED_EXPORT void CALL_CONV locoAcquire(uint16_t addr, TrkAcquiredCallback, - LibStdCallback err); + LibStdCallback err); SIM_SHARED_EXPORT void CALL_CONV locoRelease(uint16_t addr, LibStdCallback ok); SIM_SHARED_EXPORT void CALL_CONV pomWriteCv(uint16_t addr, uint16_t cv, uint8_t value, - LibStdCallback ok, LibStdCallback err); + LibStdCallback ok, LibStdCallback err); SIM_SHARED_EXPORT void CALL_CONV bindBeforeOpen(TrkStdNotifyEvent f, void *data); SIM_SHARED_EXPORT void CALL_CONV bindAfterOpen(TrkStdNotifyEvent f, void *data); @@ -65,7 +65,6 @@ SIM_SHARED_EXPORT void CALL_CONV bindAfterClose(TrkStdNotifyEvent f, void *data) SIM_SHARED_EXPORT void CALL_CONV bindOnTrackStatusChange(TrkStatusChangedEv f, void *data); SIM_SHARED_EXPORT void CALL_CONV bindOnLog(TrkLogEv f, void *data); SIM_SHARED_EXPORT void CALL_CONV bindOnLocoStolen(TrkLocoEv f, void *data); - } } // namespace TrkSim diff --git a/lib-main.h b/lib-main.h index 8aa71d4..97cd15e 100644 --- a/lib-main.h +++ b/lib-main.h @@ -1,11 +1,11 @@ #ifndef LIB_MAIN_H #define LIB_MAIN_H -#include -#include -#include #include #include +#include +#include +#include #include "lib-common-defs.h" #include "lib-events.h" @@ -33,9 +33,6 @@ class LibMain : public QObject { private slots: void m_hist_timer_tick(); - -private: - }; ///////////////////////////////////////////////////////////////////////////////