From 13e9ef646bd313c4ef6fe22b8044433f0e37c8a3 Mon Sep 17 00:00:00 2001
From: Yu Liu <22801773+yuliu2016@users.noreply.github.com>
Date: Mon, 2 Mar 2020 19:34:47 -0500
Subject: [PATCH] Super Scouting: Rename defence zones (#47)

---
 app/build.gradle.kts               |  2 +-
 app/src/main/assets/Boardfile.json | 22 +++++++++++-----------
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index 60bf4bc..ebd9a93 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -17,7 +17,7 @@ android {
         minSdkVersion(21)
         targetSdkVersion(28)
         versionCode = 1
-        versionName = "2020.1.1"
+        versionName = "2020.1.3"
         resConfigs("en", "hdpi")
 
         // Read the TBA key from local properties
diff --git a/app/src/main/assets/Boardfile.json b/app/src/main/assets/Boardfile.json
index 7fbd858..9b635c7 100644
--- a/app/src/main/assets/Boardfile.json
+++ b/app/src/main/assets/Boardfile.json
@@ -1,6 +1,6 @@
 {
   "year": 2020,
-  "revision": 6,
+  "revision": 7,
   "robot_scout": {
     "screens": [
       {
@@ -69,7 +69,7 @@
             },
             {
               "name": "resisting",
-              "type": "Switch"
+              "type": "Button"
             }
           ],
           [
@@ -202,17 +202,17 @@
           ],
           [
             {
-              "name": "A1_defends_cross_field",
+              "name": "A1_defends_loading_area",
               "type": "Switch",
               "is_lite": true
             },
             {
-              "name": "A1_defends_mid_field",
+              "name": "A1_defends_rendezvous",
               "type": "Switch",
               "is_lite": true
             },
             {
-              "name": "A1_defends_close_field",
+              "name": "A1_defends_shooting_area",
               "type": "Switch",
               "is_lite": true
             }
@@ -281,17 +281,17 @@
           ],
           [
             {
-              "name": "A2_defends_cross_field",
+              "name": "A2_defends_loading_area",
               "type": "Switch",
               "is_lite": true
             },
             {
-              "name": "A2_defends_mid_field",
+              "name": "A2_defends_rendezvous",
               "type": "Switch",
               "is_lite": true
             },
             {
-              "name": "A2_defends_close_field",
+              "name": "A2_defends_shooting_area",
               "type": "Switch",
               "is_lite": true
             }
@@ -360,17 +360,17 @@
           ],
           [
             {
-              "name": "A3_defends_cross_field",
+              "name": "A3_defends_loading_area",
               "type": "Switch",
               "is_lite": true
             },
             {
-              "name": "A3_defends_mid_field",
+              "name": "A3_defends_rendezvous",
               "type": "Switch",
               "is_lite": true
             },
             {
-              "name": "A3_defends_close_field",
+              "name": "A3_defends_shooting_area",
               "type": "Switch",
               "is_lite": true
             }