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.

Sign up for GitHub

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

🐛 Field Control Getter Return Value #627

Merged
merged 10 commits into from
Jan 22, 2024
Merged

🐛 Field Control Getter Return Value #627

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
b704ad1
Field Control State Getter
CChheerryyll Oct 12, 2023
e8fae37
Merge branch 'develop-pros-4' into pros4/feature/fieldControlGetters
CChheerryyll Oct 12, 2023
9356cfe
Fixed merge issues
noam987 Oct 16, 2023
9865033
Removed left over testing code
noam987 Oct 17, 2023
fb2687a
Merge branch 'develop-pros-4' into pros4/feature/fieldControlGetters
noam987 Oct 24, 2023
779e186
change macros to enum/functions
CChheerryyll Oct 26, 2023
4bcd4d8
Merge branch 'pros4/feature/fieldControlGetters' of github.com:purdue…
CChheerryyll Oct 26, 2023
8c26fcc
fix return value issue
CChheerryyll Jan 18, 2024
af72ad8
Merge remote-tracking branch 'origin/develop-pros-4' into pros4/featu…
CChheerryyll Jan 19, 2024
55929f9
fixed version
CChheerryyll Jan 19, 2024
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
4 changes: 2 additions & 2 deletions src/devices/controller.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -197,9 +197,9 @@ uint8_t competition_is_autonomous() {
}

uint8_t competition_is_field() {
return (competition_get_status() & COMPETITION_SYSTEM) != 0;
return ( (competition_get_status() & COMPETITION_SYSTEM) != 0 ) && competition_is_connected();
}

uint8_t competition_is_switch() {
return (competition_get_status() & COMPETITION_SYSTEM) == 0;
return ( (competition_get_status() & COMPETITION_SYSTEM) == 0) && competition_is_connected();
}
2 changes: 1 addition & 1 deletion version
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
4.0.6
4.0.6