From b256886a5cb9f2ae3ebda70a2045b19ed9f4233e Mon Sep 17 00:00:00 2001 From: Stanislaw Halik Date: Sun, 3 Dec 2017 22:23:08 +0100 Subject: api: add status check for modules --- proto-iokit-foohid/iokitprotocol.cpp | 17 +++++++++++++++-- proto-iokit-foohid/iokitprotocol.h | 2 +- 2 files changed, 16 insertions(+), 3 deletions(-) (limited to 'proto-iokit-foohid') diff --git a/proto-iokit-foohid/iokitprotocol.cpp b/proto-iokit-foohid/iokitprotocol.cpp index 4af6ad5b..693ce31e 100644 --- a/proto-iokit-foohid/iokitprotocol.cpp +++ b/proto-iokit-foohid/iokitprotocol.cpp @@ -20,9 +20,22 @@ IOKitProtocol::IOKitProtocol() qWarning("%s\n", qPrintable(joystick->errorMessage())); } -bool IOKitProtocol::correct() +module_status IOKitProtocol::check_status() { - return joystick && !joystick->hasError(); + if (!joystick) + return QCoreApplication::translate("foohid", "Load failure"); + + if (joystick->hasError()) + { + QString msg = joystick->errorMessage(); + + if (msg.isEmpty()) + msg = QCoreApplication::translate("foohid", "Unknown error"); + + return error(msg); + } + + return status_ok(); } static uint8_t valueToStick(FooHIDJoystick *stick, double min, double value, double max) diff --git a/proto-iokit-foohid/iokitprotocol.h b/proto-iokit-foohid/iokitprotocol.h index f3f4089f..4c5b13a4 100644 --- a/proto-iokit-foohid/iokitprotocol.h +++ b/proto-iokit-foohid/iokitprotocol.h @@ -18,7 +18,7 @@ class IOKitProtocol : public IProtocol public: IOKitProtocol(); - bool correct() final; + module_status check_status() override; void pose(const double *headpose) final; QString game_name() final; -- cgit v1.2.3