Team2890/allwpilib
4
0
Fork 0
mirror of https://github.com/wpilibsuite/allwpilib synced 2026-06-26 01:51:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

[ntcore] Use int for options instead of double

Browse Source 
Periodic time is stored in milliseconds.
This commit is contained in:
Peter Johnson
2022-12-05 21:56:04 -08:00
parent f3e666b7bb
commit b0e4053087
16 changed files with 67 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
ntcore/src/main/native/include/ntcore_c.h
View File

@@ -288,10 +288,11 @@ struct NT_PubSubOption {
/**
* Option value. 1 (true) or 0 (false) for immediate and logging options,
* time between updates, in seconds, for periodic option. For local/remote
* option, 1=local only, 2=remote only, 0 or 3=both local and remote.
* time between updates, in milliseconds, for periodic option. For
* local/remote option, 1=local only, 2=remote only, 0 or 3=both local and
* remote.
*/
double value;
unsigned int value;
};
/**

23
ntcore/src/main/native/include/ntcore_cpp.h
View File

@@ -262,7 +262,7 @@ class Event {
/** NetworkTables publish/subscribe option. */
class PubSubOption {
public:
constexpr PubSubOption(NT_PubSubOptionType type, double value)
constexpr PubSubOption(NT_PubSubOptionType type, unsigned int value)
: type{type}, value{value} {}
/**
@@ -276,7 +276,8 @@ class PubSubOption {
* @return option
*/
static constexpr PubSubOption Periodic(double time) {
return PubSubOption{NT_PUBSUB_PERIODIC, time};
return PubSubOption{NT_PUBSUB_PERIODIC,
static_cast<unsigned int>(time * 1000)};
}
/**
@@ -287,7 +288,7 @@ class PubSubOption {
* @return option
*/
static constexpr PubSubOption SendAll(bool enabled) {
return PubSubOption{NT_PUBSUB_SENDALL, enabled ? 1.0 : 0.0};
return PubSubOption{NT_PUBSUB_SENDALL, enabled ? 1u : 0u};
}
/**
@@ -298,7 +299,7 @@ class PubSubOption {
* @return option
*/
static constexpr PubSubOption TopicsOnly(bool enabled) {
return PubSubOption{NT_PUBSUB_TOPICSONLY, enabled ? 1.0 : 0.0};
return PubSubOption{NT_PUBSUB_TOPICSONLY, enabled ? 1u : 0u};
}
/**
@@ -309,7 +310,7 @@ class PubSubOption {
* @return option
*/
static constexpr PubSubOption KeepDuplicates(bool enabled) {
return PubSubOption{NT_PUBSUB_KEEPDUPLICATES, enabled ? 1.0 : 0.0};
return PubSubOption{NT_PUBSUB_KEEPDUPLICATES, enabled ? 1u : 0u};
}
/**
@@ -320,8 +321,8 @@ class PubSubOption {
* @param depth number of entries to save for polling.
* @return option
*/
static constexpr PubSubOption PollStorage(int depth) {
return PubSubOption{NT_PUBSUB_POLLSTORAGE, static_cast<double>(depth)};
static constexpr PubSubOption PollStorage(unsigned int depth) {
return PubSubOption{NT_PUBSUB_POLLSTORAGE, depth};
}
/**
@@ -332,7 +333,7 @@ class PubSubOption {
* @return option
*/
static constexpr PubSubOption LocalOnly() {
return PubSubOption{NT_PUBSUB_LOCALREMOTE, 1.0};
return PubSubOption{NT_PUBSUB_LOCALREMOTE, 1u};
}
/**
@@ -343,7 +344,7 @@ class PubSubOption {
* @return option
*/
static constexpr PubSubOption RemoteOnly() {
return PubSubOption{NT_PUBSUB_LOCALREMOTE, 2.0};
return PubSubOption{NT_PUBSUB_LOCALREMOTE, 2u};
}
/**
@@ -354,11 +355,11 @@ class PubSubOption {
* @return option
*/
static constexpr PubSubOption AllUpdates() {
return PubSubOption{NT_PUBSUB_LOCALREMOTE, 0.0};
return PubSubOption{NT_PUBSUB_LOCALREMOTE, 0u};
}
NT_PubSubOptionType type;
double value;
unsigned int value;
};
/**