Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Record "remote log" events #446

Open
wants to merge 76 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
76 commits
Select commit Hold shift + click to select a range
feab701
Alert Pusher (#437)
je-foster Sep 15, 2023
64d045e
Tests run again (#438)
je-foster Oct 5, 2023
ad0920f
Simplify lint rules file.
jgfoster Feb 7, 2024
6c445b8
Lint issues.
jgfoster Mar 2, 2024
a493aea
AlertPusherTest now passes.
jgfoster Mar 13, 2024
7ecd31f
DataLoggerTest now passes.
jgfoster Mar 13, 2024
a8852f7
PHProbeTest.cpp now passes.
jgfoster Mar 13, 2024
99876b9
SDTest.cpp now passes, along with all others!
jgfoster Mar 13, 2024
15dfd99
The stdev seems to be different on my local runs from that on the Git…
jgfoster Mar 13, 2024
01bf586
WIP on defer network when bubbler is on.
jgfoster Mar 13, 2024
c60084a
Disable Arduino-CI tests (for now).
jgfoster Mar 14, 2024
8268ece
Start on event log.
jgfoster Mar 15, 2024
6a177c2
Newline at end of file.
jgfoster Apr 24, 2024
d29cbf4
Formatting.
jgfoster Apr 24, 2024
0362ef6
Merge branch 'main' into event_log
jgfoster Jun 18, 2024
2e19029
Rename event log to remote log.
jgfoster Jun 18, 2024
5895b60
Change formatting.
jgfoster Jun 18, 2024
60f356e
Merge branch 'remote_log' into alerts
jgfoster Jun 18, 2024
2df4fb9
Edits to get things to compile.
jgfoster Jun 18, 2024
25672bf
More formatting (Arduino CI tests are disabled).
jgfoster Jun 18, 2024
a8e9d20
More formatting changes.
jgfoster Jun 18, 2024
8273a9b
Merge branch 'main' into alerts
jgfoster Jun 19, 2024
a5ce38b
Merge branch 'main' into alerts
jgfoster Jun 20, 2024
ac7a1d4
Merge branch 'main' into alerts
jgfoster Jul 24, 2024
9697b3a
Formatting.
jgfoster Jul 24, 2024
9c13e16
More formatting.
jgfoster Jul 24, 2024
ae545b2
Revert code removed from PHProbe.cpp.
jgfoster Jul 24, 2024
29283b7
Change code order to match main.
jgfoster Jul 24, 2024
9967a97
Update ThermalProbeTest.cpp from main.
jgfoster Jul 24, 2024
6565091
Move PORT from Ethernet_TC.h to AlertPusher.cpp.
jgfoster Jul 24, 2024
646c13e
Bump versions.
jgfoster Aug 14, 2024
9fd6dcf
Merge branch 'main' into alerts
jgfoster Aug 14, 2024
08d5fbf
Update libraries; add `flutter.js.map` files to avoid client errors.
jgfoster Oct 10, 2024
697c9bb
Merge branch 'main' into alerts
jgfoster Oct 11, 2024
9b12ad7
Merge main into alerts.
jgfoster Dec 24, 2024
b90b205
Change for deprecated Flutter function.
jgfoster Dec 26, 2024
224bb29
Consolidate all the setup into the `instance()` method.
jgfoster Dec 26, 2024
b038540
Merge branch 'december' into alerts.
jgfoster Dec 26, 2024
2409e71
Update Flutter version.
jgfoster Dec 26, 2024
3e77338
Add debugging to JSONBuilderTest.cpp to see how far it gets.
jgfoster Dec 26, 2024
a633812
Further debugging of JSONBuilderTest. Don't expect float to be exactl…
jgfoster Dec 26, 2024
25d2a02
Show test class in some tests.
jgfoster Dec 26, 2024
4a786cd
Merge branch 'december' into alerts; fix SDTest.cpp and PHProbeTest.cpp.
jgfoster Dec 26, 2024
9f72038
Fix formatting.
jgfoster Dec 26, 2024
2cec546
More formatting.
jgfoster Dec 26, 2024
71cf1f6
Work on RemoteLogPusherTest (it passed, but others fail now).
jgfoster Dec 27, 2024
fd6791c
SDTest and PushingBoxTest now pass.
jgfoster Dec 27, 2024
8fb7f2b
All tests pass locally.
jgfoster Dec 27, 2024
be0bd3e
Enable device controller test.
jgfoster Dec 27, 2024
2a134cd
Fix codacy issue (it found a bug!).
jgfoster Dec 27, 2024
9636fd3
Fix Codacy issue (bug).
jgfoster Dec 27, 2024
6066097
Switch default to hide loop delay for easier testing.
jgfoster Dec 27, 2024
981577b
Formatting.
jgfoster Dec 27, 2024
94b3618
Merge from december updates.
jgfoster Dec 27, 2024
059a719
Merge branch 'main' into alerts. Test failures in:
jgfoster Jan 8, 2025
1a313e3
Tests now pass.
jgfoster Jan 9, 2025
026e8b3
Update Makefile to make it easier to compare with main.
jgfoster Jan 9, 2025
dbf044b
Refactor Makefile.
jgfoster Jan 14, 2025
6c43f5d
Use PHControl::instance()->loop()
jgfoster Jan 14, 2025
ecaccea
Add files for RemoteLogPusher.
jgfoster Jan 14, 2025
eb74837
Continuing small changes.
jgfoster Jan 14, 2025
5784649
Most of the way back with tests passing.
jgfoster Jan 14, 2025
93f53a8
Merge branches 'main' and 'january' into alerts
jgfoster Jan 14, 2025
89b957a
- Update Makefile to match alerts.
jgfoster Jan 14, 2025
e4cce23
Use tabs instead of spaces in Makefile.
jgfoster Jan 14, 2025
9a3751e
A few more things from the alerts branch.
jgfoster Jan 14, 2025
1510718
Update a few tests to match alerts.
jgfoster Jan 15, 2025
a391002
Upgrade libraries.
jgfoster Jan 15, 2025
4a3c413
Merge main into january.
jgfoster Jan 15, 2025
f9b258d
Bring alerts branch closer to january branch.
jgfoster Jan 15, 2025
1fdafdb
- Add RemoteLogPusher code.
jgfoster Jan 15, 2025
64de97d
Import changes from january branch to alerts branch.
jgfoster Jan 15, 2025
1829722
Restore some commented-out test code.
jgfoster Jan 15, 2025
108e0ce
All tests pass with RemoteLogPusher!
jgfoster Jan 15, 2025
7100abb
Merge branch 'january' into alerts
jgfoster Jan 15, 2025
fd6af7f
Codacy issues.
jgfoster Jan 15, 2025
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 0 additions & 6 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -109,9 +109,6 @@ GPP_TEST=g++ $(FLAGS) -L$(BIN) $(INCLUDE)
$(BIN)/PHCalibrationWarningTest.cpp.bin: $(BIN)/libarduino.so $(TEST)/PHCalibrationWarningTest.cpp $(HEADERS)
$(GPP_TEST) -o $(BIN)/PHCalibrationWarningTest.cpp.bin $(TEST)/PHCalibrationWarningTest.cpp -larduino

$(BIN)/RemoteLogPusherTest.cpp.bin: $(BIN)/libarduino.so $(TEST)/RemoteLogPusherTest.cpp $(HEADERS)
$(GPP_TEST) -o $(BIN)/RemoteLogPusherTest.cpp.bin $(TEST)/RemoteLogPusherTest.cpp -larduino

$(BIN)/BlinkTest.cpp.bin: $(BIN)/libarduino.so $(TEST)/BlinkTest.cpp $(HEADERS)
$(GPP_TEST) -o $(BIN)/BlinkTest.cpp.bin $(TEST)/BlinkTest.cpp -larduino

Expand Down Expand Up @@ -431,9 +428,6 @@ $(BIN)/TC_util.o: $(SRC)/model/TC_util.cpp $(HEADERS)
$(BIN)/TankController.o: $(SRC)/TankController.cpp $(HEADERS)
g++ -c $(FLAGS) $(INCLUDE) -o $(BIN)/TankController.o $(SRC)/TankController.cpp

$(BIN)/RemoteLogPusher.o: $(SRC)/model/RemoteLogPusher.cpp $(HEADERS)
g++ -c $(FLAGS) $(INCLUDE) -o $(BIN)/RemoteLogPusher.o $(SRC)/model/RemoteLogPusher.cpp

$(BIN)/DataLogger.o: $(SRC)/model/DataLogger.cpp $(HEADERS)
g++ -c $(FLAGS) $(INCLUDE) -o $(BIN)/DataLogger.o $(SRC)/model/DataLogger.cpp

Expand Down
2 changes: 1 addition & 1 deletion extras/device_client/lib/model/version.dart
Original file line number Diff line number Diff line change
@@ -1 +1 @@
const String gitVersion = 'v24.10.2-14-gf3+';
const String gitVersion = 'v24.10.2-82-g71+';
26 changes: 13 additions & 13 deletions extras/device_client/pubspec.lock
Original file line number Diff line number Diff line change
Expand Up @@ -313,10 +313,10 @@ packages:
dependency: "direct main"
description:
name: http_parser
sha256: "76d306a1c3afb33fe82e2bbacad62a61f409b5634c915fceb0d799de1a913360"
sha256: "178d74305e7866013777bab2c3d8726205dc5a4dd935297175b19a23a2e66571"
url: "https://pub.dev"
source: hosted
version: "4.1.1"
version: "4.1.2"
io:
dependency: transitive
description:
Expand Down Expand Up @@ -545,26 +545,26 @@ packages:
dependency: transitive
description:
name: pubspec_parse
sha256: "81876843eb50dc2e1e5b151792c9a985c5ed2536914115ed04e9c8528f6647b0"
sha256: "0560ba233314abbed0a48a2956f7f022cce7c3e1e73df540277da7544cad4082"
url: "https://pub.dev"
source: hosted
version: "1.4.0"
version: "1.5.0"
shared_preferences:
dependency: "direct main"
description:
name: shared_preferences
sha256: "3c7e73920c694a436afaf65ab60ce3453d91f84208d761fbd83fc21182134d93"
sha256: a752ce92ea7540fc35a0d19722816e04d0e72828a4200e83a98cf1a1eb524c9a
url: "https://pub.dev"
source: hosted
version: "2.3.4"
version: "2.3.5"
shared_preferences_android:
dependency: transitive
description:
name: shared_preferences_android
sha256: "02a7d8a9ef346c9af715811b01fbd8e27845ad2c41148eefd31321471b41863d"
sha256: bf808be89fe9dc467475e982c1db6c2faf3d2acf54d526cd5ec37d86c99dbd84
url: "https://pub.dev"
source: hosted
version: "2.4.0"
version: "2.4.1"
shared_preferences_foundation:
dependency: transitive
description:
Expand Down Expand Up @@ -774,18 +774,18 @@ packages:
dependency: transitive
description:
name: url_launcher_web
sha256: "772638d3b34c779ede05ba3d38af34657a05ac55b06279ea6edd409e323dca8e"
sha256: "3ba963161bd0fe395917ba881d320b9c4f6dd3c4a233da62ab18a5025c85f1e9"
url: "https://pub.dev"
source: hosted
version: "2.3.3"
version: "2.4.0"
url_launcher_windows:
dependency: transitive
description:
name: url_launcher_windows
sha256: "44cf3aabcedde30f2dba119a9dea3b0f2672fbe6fa96e85536251d678216b3c4"
sha256: "3284b6d2ac454cf34f114e1d3319866fdd1e19cdc329999057e44ffe936cfa77"
url: "https://pub.dev"
source: hosted
version: "3.1.3"
version: "3.1.4"
vector_math:
dependency: transitive
description:
Expand Down Expand Up @@ -860,4 +860,4 @@ packages:
version: "3.1.3"
sdks:
dart: ">=3.6.0 <4.0.0"
flutter: ">=3.24.0"
flutter: ">=3.27.0"
16 changes: 8 additions & 8 deletions extras/log_file_client/pubspec.lock
Original file line number Diff line number Diff line change
Expand Up @@ -244,18 +244,18 @@ packages:
dependency: transitive
description:
name: http_parser
sha256: "76d306a1c3afb33fe82e2bbacad62a61f409b5634c915fceb0d799de1a913360"
sha256: "178d74305e7866013777bab2c3d8726205dc5a4dd935297175b19a23a2e66571"
url: "https://pub.dev"
source: hosted
version: "4.1.1"
version: "4.1.2"
intl:
dependency: transitive
description:
name: intl
sha256: d6f56758b7d3014a48af9701c085700aac781a92a87a62b1333b46d8879661cf
sha256: "00f33b908655e606b86d2ade4710a231b802eec6f11e87e4ea3783fd72077a50"
url: "https://pub.dev"
source: hosted
version: "0.19.0"
version: "0.20.1"
io:
dependency: transitive
description:
Expand Down Expand Up @@ -497,18 +497,18 @@ packages:
dependency: "direct main"
description:
name: syncfusion_flutter_charts
sha256: abf7a054f0bc5ccbed2102adf3ed05b3ee220b602f18aefe01a232605d4a5987
sha256: "117823c9e2ffcb7fb9868c73263df88751e3bb1f3d81f617cbaf63112f530e9c"
url: "https://pub.dev"
source: hosted
version: "28.1.35"
version: "28.1.39"
syncfusion_flutter_core:
dependency: transitive
description:
name: syncfusion_flutter_core
sha256: f6d1e8c08361aed6fb7f7b6f327cbd190464e1c717c6152d59866b2f0bb90ffd
sha256: "794870919ca73e29c6cb25392a097cdfe58da4d6f3f3d3eccc529ecf52f78752"
url: "https://pub.dev"
source: hosted
version: "28.1.35"
version: "28.1.39"
term_glyph:
dependency: transitive
description:
Expand Down
8 changes: 4 additions & 4 deletions extras/log_file_server/pubspec.lock
Original file line number Diff line number Diff line change
Expand Up @@ -130,10 +130,10 @@ packages:
dependency: transitive
description:
name: http_parser
sha256: "76d306a1c3afb33fe82e2bbacad62a61f409b5634c915fceb0d799de1a913360"
sha256: "178d74305e7866013777bab2c3d8726205dc5a4dd935297175b19a23a2e66571"
url: "https://pub.dev"
source: hosted
version: "4.1.1"
version: "4.1.2"
io:
dependency: transitive
description:
Expand Down Expand Up @@ -314,10 +314,10 @@ packages:
dependency: transitive
description:
name: stream_channel
sha256: "4ac0537115a24d772c408a2520ecd0abb99bca2ea9c4e634ccbdbfae64fe17ec"
sha256: "969e04c80b8bcdf826f8f16579c7b14d780458bd97f56d107d3950fdbeef059d"
url: "https://pub.dev"
source: hosted
version: "2.1.3"
version: "2.1.4"
string_scanner:
dependency: transitive
description:
Expand Down
8 changes: 4 additions & 4 deletions extras/reverse_proxy/pubspec.lock
Original file line number Diff line number Diff line change
Expand Up @@ -122,10 +122,10 @@ packages:
dependency: transitive
description:
name: http_parser
sha256: "76d306a1c3afb33fe82e2bbacad62a61f409b5634c915fceb0d799de1a913360"
sha256: "178d74305e7866013777bab2c3d8726205dc5a4dd935297175b19a23a2e66571"
url: "https://pub.dev"
source: hosted
version: "4.1.1"
version: "4.1.2"
io:
dependency: transitive
description:
Expand Down Expand Up @@ -306,10 +306,10 @@ packages:
dependency: transitive
description:
name: stream_channel
sha256: "4ac0537115a24d772c408a2520ecd0abb99bca2ea9c4e634ccbdbfae64fe17ec"
sha256: "969e04c80b8bcdf826f8f16579c7b14d780458bd97f56d107d3950fdbeef059d"
url: "https://pub.dev"
source: hosted
version: "2.1.3"
version: "2.1.4"
string_scanner:
dependency: transitive
description:
Expand Down
2 changes: 1 addition & 1 deletion src/Version.h
Original file line number Diff line number Diff line change
@@ -1 +1 @@
#define VERSION "v24.10.2-14-gf3+"
#define VERSION "v24.10.2-82-g71+"
Loading
Loading