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

Fix macOS compile errors

pull/4/head
Paul Hollinsky 2018-09-26 18:16:05 -04:00
parent bab9e0f020
commit 8060b07eee
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
communication/message/callback/include/messagecallback.h
View File

@ -4,6 +4,7 @@
#include "communication/message/include/message.h" #include "communication/message/include/message.h"
#include "communication/message/filter/include/messagefilter.h" #include "communication/message/filter/include/messagefilter.h"
#include <memory> #include <memory>
#include <functional>
namespace icsneo { namespace icsneo {

6
device/include/idevicesettings.h
View File

@ -277,16 +277,16 @@ typedef struct _UART_SETTINGS
uint16_t stop_bits; uint16_t stop_bits;
uint8_t flow_control; /* 0- off, 1 - Simple CTS RTS */ uint8_t flow_control; /* 0- off, 1 - Simple CTS RTS */
uint8_t reserved_1; uint8_t reserved_1;
union { union abcd {
uint32_t bOptions; uint32_t bOptions;
struct sOptions struct _sOptions
{ {
unsigned invert_tx : 1; unsigned invert_tx : 1;
unsigned invert_rx : 1; unsigned invert_rx : 1;
unsigned half_duplex : 1; unsigned half_duplex : 1;
unsigned reserved_bits : 13; unsigned reserved_bits : 13;
unsigned reserved_bits2 : 16; unsigned reserved_bits2 : 16;
}; } sOptions;
}; };
} UART_SETTINGS; } UART_SETTINGS;
#define UART_SETTINGS_SIZE 16 #define UART_SETTINGS_SIZE 16