Team2890/allwpilib
4
0
Fork 0
mirror of https://github.com/wpilibsuite/allwpilib synced 2026-06-21 01:01:43 +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

2
ntcore/src/main/native/cpp/net/ClientImpl.cpp
View File

@@ -293,7 +293,7 @@ void CImpl::Publish(NT_Publisher pubHandle, NT_Topic topicHandle,
}
publisher->handle = pubHandle;
publisher->options = options;
publisher->periodMs = std::lround(options.periodic * 100) * 10;
publisher->periodMs = std::lround(options.periodicMs / 10.0) * 10;
if (publisher->periodMs < kMinPeriodMs) {
publisher->periodMs = kMinPeriodMs;
}

11
ntcore/src/main/native/cpp/net/ServerImpl.cpp
View File

@@ -367,7 +367,7 @@ struct SubscriberData {
topicNames{topicNames.begin(), topicNames.end()},
subuid{subuid},
options{options},
periodMs(std::lround(options.periodic * 100) * 10) {
periodMs(std::lround(options.periodicMs / 10.0) * 10) {
if (periodMs < kMinPeriodMs) {
periodMs = kMinPeriodMs;
}
@@ -377,7 +377,7 @@ struct SubscriberData {
const PubSubOptions& options_) {
topicNames = {topicNames_.begin(), topicNames_.end()};
options = options_;
periodMs = std::lround(options_.periodic * 100) * 10;
periodMs = std::lround(options_.periodicMs / 10.0) * 10;
if (periodMs < kMinPeriodMs) {
periodMs = kMinPeriodMs;
}
@@ -465,7 +465,8 @@ struct Writer : public mpack_writer_t {
static void WriteOptions(mpack_writer_t& w, const PubSubOptions& options) {
int size = (options.sendAll ? 1 : 0) + (options.topicsOnly ? 1 : 0) +
(options.periodic != 0.1 ? 1 : 0) + (options.prefixMatch ? 1 : 0);
(options.periodicMs != PubSubOptions::kDefaultPeriodicMs ? 1 : 0) +
(options.prefixMatch ? 1 : 0);
mpack_start_map(&w, size);
if (options.sendAll) {
mpack_write_str(&w, "all");
@@ -475,9 +476,9 @@ static void WriteOptions(mpack_writer_t& w, const PubSubOptions& options) {
mpack_write_str(&w, "topicsonly");
mpack_write_bool(&w, true);
}
if (options.periodic != 0.1) {
if (options.periodicMs != PubSubOptions::kDefaultPeriodicMs) {
mpack_write_str(&w, "periodic");
mpack_write_float(&w, options.periodic);
mpack_write_float(&w, options.periodicMs / 1000.0);
}
if (options.prefixMatch) {
mpack_write_str(&w, "prefix");

4
ntcore/src/main/native/cpp/net/WireDecoder.cpp
View File

@@ -238,10 +238,12 @@ static void WireDecodeTextImpl(std::string_view in, T& out,
// periodic
auto periodicIt = joptions->find("periodic");
if (periodicIt != joptions->end()) {
if (!GetNumber(periodicIt->second, &options.periodic)) {
double val;
if (!GetNumber(periodicIt->second, &val)) {
error = "periodic value must be a number";
goto err;
}
options.periodicMs = val * 1000;
}
// send all changes

4
ntcore/src/main/native/cpp/net/WireEncoder.cpp
View File

@@ -99,12 +99,12 @@ static void WireEncodeSubscribeImpl(wpi::raw_ostream& os, int64_t subuid,
os << "\"prefix\":true";
first = false;
}
if (options.periodic != 0.1) {
if (options.periodicMs != PubSubOptions::kDefaultPeriodicMs) {
if (!first) {
os << ',';
}
os << "\"periodic\":";
s.dump_float(options.periodic);
s.dump_float(options.periodicMs / 1000.0);
}
os << "},\"topics\":";
EncodePrefixes(os, topicNames, s);