sven/libicsneo
1
0
Fork 0
mirror of https://github.com/intrepidcs/libicsneo.git synced 2026-08-05 01:18:36 +02:00
Code Issues Projects Releases Wiki Activity

Add error system

Browse Source
This commit is contained in:
Paul Hollinsky
2018-10-26 20:53:30 -04:00
parent a331a2afa8
commit 3a42372dcd
19 changed files with 691 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files
device/device.cpp
+9 -21
View File
@@ -122,13 +122,15 @@ void Device::enforcePollingMessageLimit() {
while(pollingContainer.size_approx() > pollingMessageLimit) {
std::shared_ptr<Message> throwAway;
pollingContainer.try_dequeue(throwAway);
// TODO Flag an error for the user!
err(APIError::PollingMessageOverflow);
}
}
bool Device::open() {
if(!com)
if(!com) {
err(APIError::Unknown);
return false;
}
if(!com->open())
return false;
@@ -141,13 +143,13 @@ bool Device::open() {
break;
}
if(!serial) {
std::cout << "Failed to get serial number in " << i << " tries" << std::endl;
err(APIError::NoSerialNumber);
return false;
}
std::string currentSerial = getNeoDevice().serial;
if(currentSerial != serial->deviceSerial) {
std::cout << "Found device had serial " << getNeoDevice().serial << " but connected device has serial " << serial->deviceSerial.c_str() << "!" << std::endl;
err(APIError::IncorrectSerialNumber);
return false;
}
@@ -166,8 +168,10 @@ bool Device::open() {
}
bool Device::close() {
if(!com)
if(!com) {
err(APIError::Unknown);
return false;
}
if(internalHandlerCallbackID)
com->removeMessageCallback(internalHandlerCallbackID);
@@ -213,22 +217,6 @@ bool Device::transmit(std::vector<std::shared_ptr<Message>> messages) {
return true;
}
template<typename Transport, typename Settings>
void Device::initialize() {
auto transport = makeTransport<Transport>();
setupTransport(transport.get());
auto packetizer = makePacketizer();
setupPacketizer(packetizer.get());
auto encoder = makeEncoder(packetizer);
setupEncoder(encoder.get());
auto decoder = makeDecoder();
setupDecoder(decoder.get());
com = makeCommunication(std::move(transport), packetizer, std::move(encoder), std::move(decoder));
setupCommunication(com.get());
settings = makeSettings<Settings>(com);
setupSettings(settings.get());
}
void Device::handleInternalMessage(std::shared_ptr<Message> message) {
switch(message->network.getNetID()) {
case Network::NetID::Reset_Status: