Merge pull request #31 from team4099/2024-setup

2024 setup
team4099 · Feb 19, 2024 · dd2b8c8 · dd2b8c8
2 parents 34513e6 + 24ce9b6
commit dd2b8c8
Show file tree

Hide file tree

Showing 11 changed files with 7,107 additions and 1,831 deletions.
diff --git a/falconscoutcore/app.py b/falconscoutcore/app.py
@@ -41,8 +41,17 @@ def _convert_string_to_proper_type(value: str) -> Any:
     try:
         return literal_eval(value)
     except (ValueError, SyntaxError):
+<<<<<<< HEAD
         return value
 
+=======
+        if value == "false":
+            return False
+        elif value == "true":
+            return True
+
+        return value.replace(",", "").replace("'", "").split(":")[0]
+>>>>>>> 808c490 (changes to add parked to app)
 
 
 def _process_data(*data: list[str], status_message_col) -> None:
@@ -168,7 +177,6 @@ def scan_qrcode(qr_code_col) -> None:
             status_message_col=qr_code_col,
         )
 
-
 def write_dataval_errors(data_val_col) -> None:
     """Writes the data validation errors contained in `errors.json` into the column."""
     with (

diff --git a/falconscoutcore/config.json b/falconscoutcore/config.json
@@ -7,25 +7,25 @@
             "Alliance",
             "DriverStation",
             "TeamNumber",
-            "Preloaded",
-            "AutoGrid",
-            "AutoMissed",
-            "Mobile",
-            "AutoAttemptedCharge",
-            "AutoChargingState",
+            "AutoSpeaker",
+            "AutoAmp",
+            "AutoLeave",
+            "AutoCenterline",
             "AutoNotes",
-            "TeleopGrid",
-            "TeleopMissed",
+            "TeleopSpeaker",
+            "TeleopAmp",
+            "TeleopTrap",
             "TeleopNotes",
-            "EndgameAttemptedCharge",
-            "EndgameFinalCharge",
-            "FinalChargeTime",
+            "Parked",
+            "ClimbStatus",
+            "Harmonized",
+            "ClimbSpeed",
             "EndgameNotes",
-            "Disable",
-            "Tippy",
-            "DefenseTime",
-            "DefenseRating",
+            "Disabled",
             "DriverRating",
+            "DefenseTime",
+            "DefenseSkill",
+            "CounterDefenseSkill",
             "RatingNotes"
         ],
         "qualitative_data_labels": [

diff --git a/falconscoutcore/data/2024vaash_match_data.json b/falconscoutcore/data/2024vaash_match_data.json
@@ -0,0 +1 @@
+[]
diff --git a/falconscoutcore/data/2024vaash_qualitative_data.json b/falconscoutcore/data/2024vaash_qualitative_data.json