🐛 Field Control Getter Return Value (#627)

* Field Control State Getter * Fixed merge issues * Removed left over testing code * change macros to enum/functions * fix return value issue * fixed version --------- Co-authored-by: noam987 <[email protected]> Co-authored-by: noam987 <[email protected]>
purduesigbots · Jan 22, 2024 · 3bd9d77 · 3bd9d77
1 parent 9778296
commit 3bd9d77
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/src/devices/controller.c b/src/devices/controller.c
@@ -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();
 }
diff --git a/version b/version
@@ -1 +1 @@
-4.0.6
+4.0.6