mirror of
https://github.com/intrepidcs/libicsneo.git
synced 2026-08-05 01:18:36 +02:00
Merge branch 'master' into v0.3.0-dev
This commit is contained in:
@@ -5,6 +5,7 @@
|
||||
|
||||
#include "icsneo/communication/message/main51message.h"
|
||||
#include "icsneo/communication/command.h"
|
||||
#include "icsneo/platform/optional.h"
|
||||
#include <string>
|
||||
|
||||
namespace icsneo {
|
||||
@@ -28,8 +29,8 @@ public:
|
||||
bool cmTooBig;
|
||||
bool hidUsbState;
|
||||
bool fpgaUsbState;
|
||||
uint16_t busVoltage;
|
||||
uint16_t deviceTemperature;
|
||||
icsneo::optional<uint16_t> busVoltage;
|
||||
icsneo::optional<uint16_t> deviceTemperature;
|
||||
};
|
||||
|
||||
}
|
||||
|
||||
@@ -5,6 +5,7 @@
|
||||
#include "icsneo/platform/tchar.h"
|
||||
|
||||
#include <stdint.h>
|
||||
#include <stddef.h>
|
||||
typedef uint8_t byte; // Typedef helper for the following include
|
||||
#include "icsneo/icsnVC40.h" // Definitions for structs
|
||||
|
||||
@@ -166,4 +167,4 @@ extern int LegacyDLLExport icsneoDisableBitSmash(void* hObject, unsigned int res
|
||||
} // extern "C"
|
||||
#endif
|
||||
|
||||
#endif
|
||||
#endif
|
||||
|
||||
Reference in New Issue
Block a user