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

Show connection details #43

Merged
merged 34 commits into from
Jun 26, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
34 commits
Select commit Hold shift + click to select a range
f912d59
changed table format
Renfrew100 May 4, 2021
4ba14fd
Merge branch 'master' of https://github.com/uorocketry/RocketGroundSt…
sebastiengrd May 29, 2021
3d6fdce
Renamed DataHandler to DataHolder
sebastiengrd Jun 5, 2021
d0300bb
Added DataProcess class and moved some functions
sebastiengrd Jun 5, 2021
3a05531
Move logging to data processor
ajayyy Jun 6, 2021
00a5770
Store both data tables
ajayyy Jun 10, 2021
b52de54
Move table rendering to data processor and split out config loading
ajayyy Jun 10, 2021
a6fe955
Fix mispelling
ajayyy Jun 10, 2021
4d24e0b
Move chart updating out of Main into DataChart
ajayyy Jun 10, 2021
7e60729
Attempt to solve test issues on GitHub actions using interface
ajayyy Jun 10, 2021
12e2402
Switch to abstract class for config
ajayyy Jun 10, 2021
e93b1c8
Add unit test for data processor
ajayyy Jun 10, 2021
cab375c
Remove old todo comment
ajayyy Jun 10, 2021
3eafaca
Add ability to parse RSSI data and display it
ajayyy Jun 18, 2021
1c7a35b
Switch main config to private
ajayyy Jun 18, 2021
7a51799
Fix tests
ajayyy Jun 18, 2021
f91baf8
Show latest connection info no matter what if latest enabled
ajayyy Jun 19, 2021
380405a
Support older Java versions
ajayyy Jun 19, 2021
1f44034
More support for old java versions
ajayyy Jun 19, 2021
36f6166
Fix null pointer
ajayyy Jun 19, 2021
41eb698
Make Google earth and webview use new config
ajayyy Jun 19, 2021
f6d2aa4
Make the scrollbar scroll through both received data and RSSI
ajayyy Jun 19, 2021
906f3f1
Allow starting with just RSSI
ajayyy Jun 19, 2021
96a3605
Fix checks if index in range
ajayyy Jun 19, 2021
e93ecc0
potential cases for tests ... progress
Renfrew100 Jun 19, 2021
3f95b21
Merge branch 'table-format' of https://github.com/uorocketry/RocketGr…
Renfrew100 Jun 19, 2021
bc0ad49
Remove extra files added in e93ecc01a5f3d560f2d8dedcc7244d768f4661d1
ajayyy Jun 19, 2021
14dbd8d
Fix state button colours
ajayyy Jun 19, 2021
77445a1
Fix log not appending
ajayyy Jun 19, 2021
80e7334
Move temperature higher
ajayyy Jun 19, 2021
39d1707
changed regex pattern to match the RSSI message we recieve from the r…
sebastiengrd Jun 19, 2021
04ca059
Merge branch 'table-format' of https://github.com/uorocketry/RocketGr…
sebastiengrd Jun 19, 2021
528ac8e
Use new config class in Window
ajayyy Jun 26, 2021
d12b18d
Don't treat all coordinates as formatted coordinates
ajayyy Jun 26, 2021
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
3 changes: 2 additions & 1 deletion build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,9 @@ dependencies {
implementation 'org.json:json:20210307'
implementation 'org.knowm.xchart:xchart:3.6.1'
implementation 'org.java-websocket:Java-WebSocket:1.5.1'
implementation 'org.jetbrains:annotations:19.0.0'

testImplementation 'org.junit.jupiter:junit-jupiter:5.4.2'
testImplementation 'org.junit.jupiter:junit-jupiter:5.4.2'
}

test {
Expand Down
8 changes: 5 additions & 3 deletions data-example/config-hotfireTest.json
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,11 @@
"Abort Burn",
"Max States"
],
"timestampIndex": 0,
"stateIndex": 1,
"seperator": ","
"indexes": {
"timestamp": 0,
"state": 1
},
"separator": ","
}
],
"stateEvents": [
Expand Down
8 changes: 4 additions & 4 deletions data-example/config-octoberSky.json
Original file line number Diff line number Diff line change
Expand Up @@ -37,14 +37,14 @@
"Ground",
"Max States"
],
"coordinateIndexes": {
"indexes": {
"timestamp": 1,
"state": 19,
"altitude": 10,
"latitude": 8,
"longitude": 9
},
"timestampIndex": 1,
"stateIndex": 19,
"seperator": ","
"separator": ","
}
]
}
Loading