sven
/
libicsneo
mirror of https://github.com/intrepidcs/libicsneo.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Transmit and receiving messages now fails properly when the device is closed. Device closes when serial number initialization fails after open.

checksum-failure-logging
EricLiu2000 2019-06-12 17:25:50 -04:00
parent 519e64fb17
commit 8a6073a9cf
1 changed files with 43 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
device/device.cpp
View File

@ -104,6 +104,25 @@ std::vector<std::shared_ptr<Message>> Device::getMessages() {
} }
bool Device::getMessages(std::vector<std::shared_ptr<Message>>& container, size_t limit, std::chrono::milliseconds timeout) { bool Device::getMessages(std::vector<std::shared_ptr<Message>>& container, size_t limit, std::chrono::milliseconds timeout) {
// not open
if(!isOpen()) {
err(APIError::DeviceCurrentlyClosed);
return false;
}
// not online
if(!isOnline()) {
err(APIError::DeviceCurrentlyOffline);
return false;
}
// not currently polling, throw error
if(messagePollingCallbackID == 0) {
err(APIError::DeviceNotPolling);
return false;
}
// A limit of zero indicates no limit // A limit of zero indicates no limit
if(limit == 0) if(limit == 0)
limit = (size_t)-1; limit = (size_t)-1;
@ -183,6 +202,8 @@ bool Device::close() {
if(internalHandlerCallbackID) if(internalHandlerCallbackID)
com->removeMessageCallback(internalHandlerCallbackID); com->removeMessageCallback(internalHandlerCallbackID);
internalHandlerCallbackID = 0;
goOffline(); goOffline();
return com->close(); return com->close();
} }
@ -210,8 +231,29 @@ bool Device::goOffline() {
} }
bool Device::transmit(std::shared_ptr<Message> message) { bool Device::transmit(std::shared_ptr<Message> message) {
if(!isSupportedTXNetwork(message->network))
// not open
if(!isOpen()) {
err(APIError::DeviceCurrentlyClosed);
return false; return false;
}
// not online
if(!isOnline()) {
err(APIError::DeviceCurrentlyOffline);
return false;
}
// not currently polling, throw error
if(messagePollingCallbackID == 0) {
err(APIError::DeviceNotPolling);
return false;
}
if(!isSupportedTXNetwork(message->network)) {
err(APIError::UnsupportedTXNetwork);
return false;
}
std::vector<uint8_t> packet; std::vector<uint8_t> packet;
if(!com->encoder->encode(packet, message)) if(!com->encoder->encode(packet, message))