Resolve Linux build issues and warnings
parent
ae5646dd78
commit
4426334f3f
|
|
@ -58,6 +58,7 @@ add_library(icsneocpp
|
|||
api/icsneocpp/icsneocpp.cpp
|
||||
${SRC_FILES}
|
||||
)
|
||||
set_property(TARGET icsneocpp PROPERTY POSITION_INDEPENDENT_CODE ON)
|
||||
|
||||
add_library(icsneoc SHARED api/icsneoc/icsneoc.cpp)
|
||||
target_link_libraries(icsneoc icsneocpp)
|
||||
|
|
|
|||
|
|
@ -10,6 +10,7 @@
|
|||
|
||||
#include "communication/include/network.h"
|
||||
#include <map>
|
||||
#include <algorithm>
|
||||
|
||||
using namespace icsneo;
|
||||
|
||||
|
|
@ -112,10 +113,10 @@ int icsneoGetMessages(void* hObject, icsSpyMessage* pMsg, int* pNumberOfMessages
|
|||
for(size_t i = 0; i < messageCount; i++) {
|
||||
icsSpyMessage& oldmsg = pMsg[i];
|
||||
neomessage_t& newmsg = messages[i];
|
||||
oldmsg.NumberBytesData = (uint8_t)min(newmsg.length, 255);
|
||||
oldmsg.NumberBytesData = (uint8_t)std::min(newmsg.length, (size_t)255);
|
||||
oldmsg.NumberBytesHeader = 4;
|
||||
oldmsg.ExtraDataPtr = (void*)newmsg.data;
|
||||
memcpy(oldmsg.Data, newmsg.data, min(newmsg.length, 8));
|
||||
memcpy(oldmsg.Data, newmsg.data, std::min(newmsg.length, (size_t)8));
|
||||
oldmsg.ArbIDOrHeader = *(uint32_t*)newmsg.header;
|
||||
oldmsg.ExtraDataPtrEnabled = newmsg.length > 8;
|
||||
oldmsg.NetworkID = newmsg.netid;
|
||||
|
|
|
|||
|
|
@ -102,6 +102,7 @@ typedef struct {
|
|||
uint8_t type;
|
||||
uint8_t reserved[9];
|
||||
} neomessage_t;
|
||||
// Any time you add another neomessage_*_t type, make sure to add it to the static_asserts below!
|
||||
|
||||
typedef struct {
|
||||
neomessage_statusbitfield_t status;
|
||||
|
|
@ -113,13 +114,14 @@ typedef struct {
|
|||
uint8_t type;
|
||||
char reserved[9];
|
||||
} neomessage_can_t;
|
||||
static_assert(sizeof(neomessage_can_t) == sizeof(neomessage_t), "All types of neomessage_t must be the same size!");
|
||||
|
||||
#pragma pack(pop)
|
||||
|
||||
#ifdef __cplusplus
|
||||
#include "communication/message/include/message.h"
|
||||
|
||||
static_assert(sizeof(neomessage_can_t) == sizeof(neomessage_t), "All types of neomessage_t must be the same size!");
|
||||
|
||||
namespace icsneo {
|
||||
|
||||
neomessage_t CreateNeoMessage(const Message& message);
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@ neomessage_t icsneo::CreateNeoMessage(const Message& message) {
|
|||
// This function is not responsible for storing the message!
|
||||
// Keep the shared_ptr around for the lifetime of the data access
|
||||
const auto type = message.network.getType();
|
||||
neomessage_t neomsg = { 0 }; // Clear out the memory
|
||||
neomessage_t neomsg = {}; // Clear out the memory
|
||||
neomsg.netid = (uint32_t)message.network.getNetID();
|
||||
neomsg.type = (uint8_t)type;
|
||||
neomsg.length = message.data.size();
|
||||
|
|
|
|||
|
|
@ -45,7 +45,9 @@ uint16_t IDeviceSettings::CalculateGSChecksum(const std::vector<uint8_t>& settin
|
|||
bool IDeviceSettings::refresh(bool ignoreChecksum) {
|
||||
std::vector<uint8_t> rxSettings;
|
||||
bool ret = com->getSettingsSync(rxSettings);
|
||||
if(ret) {
|
||||
if(!ret)
|
||||
return false;
|
||||
|
||||
if(rxSettings.size() < 6) // We need to at least have the header of GLOBAL_SETTINGS
|
||||
return false;
|
||||
|
||||
|
|
@ -81,7 +83,6 @@ bool IDeviceSettings::refresh(bool ignoreChecksum) {
|
|||
}
|
||||
|
||||
return settingsLoaded;
|
||||
}
|
||||
}
|
||||
|
||||
bool IDeviceSettings::apply(bool temporary) {
|
||||
|
|
|
|||
Loading…
Reference in New Issue