Team2890/allwpilib
4
0
Fork 0
mirror of https://github.com/wpilibsuite/allwpilib synced 2026-06-20 00:51:42 +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/test/native/cpp/LocalStorageTest.cpp
View File

@@ -27,7 +27,7 @@ namespace nt {
::testing::Matcher<const PubSubOptions&> IsPubSubOptions(
const PubSubOptions& good) {
return AllOf(Field("periodic", &PubSubOptions::periodic, good.periodic),
return AllOf(Field("periodic", &PubSubOptions::periodicMs, good.periodicMs),
Field("pollStorageSize", &PubSubOptions::pollStorageSize,
good.pollStorageSize),
Field("logging", &PubSubOptions::sendAll, good.sendAll),

2
ntcore/src/test/native/cpp/PubSubOptionsMatcher.cpp
View File

@@ -11,7 +11,7 @@ namespace nt {
bool PubSubOptionsMatcher::MatchAndExplain(
const PubSubOptions& val, ::testing::MatchResultListener* listener) const {
bool match = true;
if (val.periodic != good.periodic) {
if (val.periodicMs != good.periodicMs) {
*listener << "periodic mismatch ";
match = false;
}

2
ntcore/src/test/native/cpp/TestPrinters.cpp
View File

@@ -161,7 +161,7 @@ void PrintTo(const Value& value, std::ostream* os) {
}
void PrintTo(const PubSubOptions& options, std::ostream* os) {
*os << "PubSubOptions{periodic=" << options.periodic
*os << "PubSubOptions{periodicMs=" << options.periodicMs
<< ", pollStorageSize=" << options.pollStorageSize
<< ", logging=" << options.sendAll
<< ", keepDuplicates=" << options.keepDuplicates << '}';

4
ntcore/src/test/native/cpp/net/WireEncoderTest.cpp
View File

@@ -86,7 +86,7 @@ TEST_F(WireEncoderTextTest, SubscribeSendAll) {
TEST_F(WireEncoderTextTest, SubscribePeriodic) {
PubSubOptions options;
options.periodic = 0.5;
options.periodicMs = 500u;
net::WireEncodeSubscribe(os, 5, std::span<const std::string_view>{{"a", "b"}},
options);
ASSERT_EQ(os.str(),
@@ -98,7 +98,7 @@ TEST_F(WireEncoderTextTest, SubscribePeriodic) {
TEST_F(WireEncoderTextTest, SubscribeAllOptions) {
PubSubOptions options;
options.sendAll = true;
options.periodic = 0.5;
options.periodicMs = 500u;
net::WireEncodeSubscribe(os, 5, std::span<const std::string_view>{{"a", "b"}},
options);
ASSERT_EQ(os.str(),