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

Merge remote-tracking branch 'github/master' into pcap

Browse Source
This commit is contained in:
Paul Hollinsky
2019-05-06 13:27:28 -04:00
parent bead22bc36 7cf0ec5f4f
commit ea8e6e6316
13 changed files with 101 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/icsneo/device/device.h
+1
View File
@@ -29,6 +29,7 @@ public:
static uint32_t SerialStringToNum(const std::string& serial);
static bool SerialStringIsNumeric(const std::string& serial);
uint16_t getTimestampResolution() const;
DeviceType getType() const { return DeviceType(data.type); }
uint16_t getProductId() const { return productId; }
std::string getSerial() const { return data.serial; }
include/icsneo/device/radgalaxy/radgalaxy.h
+1 -1
View File
@@ -99,7 +99,7 @@ protected:
virtual void setupDecoder(Decoder& decoder) override {
Device::setupDecoder(decoder);
decoder.timestampMultiplier = 10; // Timestamps are in 10ns increments instead of the usual 25ns
decoder.timestampResolution = 10; // Timestamps are in 10ns increments instead of the usual 25ns
}
virtual void setupSupportedRXNetworks(std::vector<Network>& rxNetworks) override {
include/icsneo/device/radstar2/radstar2.h
+1 -1
View File
@@ -41,7 +41,7 @@ protected:
virtual void setupDecoder(Decoder& decoder) override {
Device::setupDecoder(decoder);
decoder.timestampMultiplier = 10; // Timestamps are in 10ns increments instead of the usual 25ns
decoder.timestampResolution = 10; // Timestamps are in 10ns increments instead of the usual 25ns
}
virtual void setupSupportedRXNetworks(std::vector<Network>& rxNetworks) override {
include/icsneo/device/radsupermoon/radsupermoon.h
+1 -1
View File
@@ -23,7 +23,7 @@ public:
protected:
virtual void setupDecoder(Decoder& decoder) override {
decoder.timestampMultiplier = 10; // Timestamps are in 10ns increments instead of the usual 25ns
decoder.timestampResolution = 10; // Timestamps are in 10ns increments instead of the usual 25ns
}
private: