LP-315 Fix False/True enums

f5soh · f5soh · commit 544254ea0ec2 · 2017-10-30T23:17:44.000+01:00
diff --git a/ground/gcs/src/share/vehicletemplates/multirotor/RiseRXC270-Multirotor-QuadrocopterX-0a7da81a12c.optmpl b/ground/gcs/src/share/vehicletemplates/multirotor/RiseRXC270-Multirotor-QuadrocopterX-0a7da81a12c.optmpl
@@ -236,7 +236,7 @@
                     "values": [
                         {
                             "name": "0",
-                            "value": "FALSE"
+                            "value": "False"
                         }
                     ]
                 },
@@ -346,27 +346,27 @@
                     "values": [
                         {
                             "name": "0",
-                            "value": "FALSE"
+                            "value": "False"
                         },
                         {
                             "name": "1",
-                            "value": "FALSE"
+                            "value": "False"
                         },
                         {
                             "name": "2",
-                            "value": "FALSE"
+                            "value": "False"
                         },
                         {
                             "name": "3",
-                            "value": "FALSE"
+                            "value": "False"
                         },
                         {
                             "name": "4",
-                            "value": "FALSE"
+                            "value": "False"
                         },
                         {
                             "name": "5",
-                            "value": "FALSE"
+                            "value": "False"
                         }
                     ]
                 },
@@ -399,7 +399,7 @@
                     "values": [
                         {
                             "name": "0",
-                            "value": "TRUE"
+                            "value": "True"
                         }
                     ]
                 },
@@ -684,7 +684,7 @@
                     "values": [
                         {
                             "name": "0",
-                            "value": "TRUE"
+                            "value": "True"
                         }
                     ]
                 },
@@ -695,7 +695,7 @@
                     "values": [
                         {
                             "name": "0",
-                            "value": "FALSE"
+                            "value": "False"
                         }
                     ]
                 },
@@ -1009,7 +1009,7 @@
                     "values": [
                         {
                             "name": "0",
-                            "value": "TRUE"
+                            "value": "True"
                         }
                     ]
                 },
@@ -1020,7 +1020,7 @@
                     "values": [
                         {
                             "name": "0",
-                            "value": "FALSE"
+                            "value": "False"
                         }
                     ]
                 },
@@ -1334,7 +1334,7 @@
                     "values": [
                         {
                             "name": "0",
-                            "value": "TRUE"
+                            "value": "True"
                         }
                     ]
                 },
@@ -1345,7 +1345,7 @@
                     "values": [
                         {
                             "name": "0",
-                            "value": "FALSE"
+                            "value": "False"
                         }
                     ]
                 },
diff --git a/ground/gcs/src/share/vehicletemplates/multirotor/RiseRXS255-Multirotor-QuadrocopterX-9a0f677f56e.optmpl b/ground/gcs/src/share/vehicletemplates/multirotor/RiseRXS255-Multirotor-QuadrocopterX-9a0f677f56e.optmpl
@@ -236,7 +236,7 @@
                     "values": [
                         {
                             "name": "0",
-                            "value": "FALSE"
+                            "value": "False"
                         }
                     ]
                 },
@@ -346,27 +346,27 @@
                     "values": [
                         {
                             "name": "0",
-                            "value": "FALSE"
+                            "value": "False"
                         },
                         {
                             "name": "1",
-                            "value": "FALSE"
+                            "value": "False"
                         },
                         {
                             "name": "2",
-                            "value": "FALSE"
+                            "value": "False"
                         },
                         {
                             "name": "3",
-                            "value": "FALSE"
+                            "value": "False"
                         },
                         {
                             "name": "4",
-                            "value": "FALSE"
+                            "value": "False"
                         },
                         {
                             "name": "5",
-                            "value": "FALSE"
+                            "value": "False"
                         }
                     ]
                 },
@@ -399,7 +399,7 @@
                     "values": [
                         {
                             "name": "0",
-                            "value": "TRUE"
+                            "value": "True"
                         }
                     ]
                 },
@@ -684,7 +684,7 @@
                     "values": [
                         {
                             "name": "0",
-                            "value": "FALSE"
+                            "value": "False"
                         }
                     ]
                 },
@@ -695,7 +695,7 @@
                     "values": [
                         {
                             "name": "0",
-                            "value": "TRUE"
+                            "value": "True"
                         }
                     ]
                 },
@@ -1009,7 +1009,7 @@
                     "values": [
                         {
                             "name": "0",
-                            "value": "FALSE"
+                            "value": "False"
                         }
                     ]
                 },
@@ -1020,7 +1020,7 @@
                     "values": [
                         {
                             "name": "0",
-                            "value": "TRUE"
+                            "value": "True"
                         }
                     ]
                 },
@@ -1334,7 +1334,7 @@
                     "values": [
                         {
                             "name": "0",
-                            "value": "TRUE"
+                            "value": "True"
                         }
                     ]
                 },
@@ -1345,7 +1345,7 @@
                     "values": [
                         {
                             "name": "0",
-                            "value": "FALSE"
+                            "value": "False"
                         }
                     ]
                 },

Original file line number	Diff line number	Diff line change
`@@ -236,7 +236,7 @@`
`236`	`236`	`"values": [`
`237`	`237`	`{`
`238`	`238`	`"name": "0",`
`239`		`- "value": "FALSE"`
	`239`	`+ "value": "False"`
`240`	`240`	`}`
`241`	`241`	`]`
`242`	`242`	`},`
`@@ -346,27 +346,27 @@`
`346`	`346`	`"values": [`
`347`	`347`	`{`
`348`	`348`	`"name": "0",`
`349`		`- "value": "FALSE"`
	`349`	`+ "value": "False"`
`350`	`350`	`},`
`351`	`351`	`{`
`352`	`352`	`"name": "1",`
`353`		`- "value": "FALSE"`
	`353`	`+ "value": "False"`
`354`	`354`	`},`
`355`	`355`	`{`
`356`	`356`	`"name": "2",`
`357`		`- "value": "FALSE"`
	`357`	`+ "value": "False"`
`358`	`358`	`},`
`359`	`359`	`{`
`360`	`360`	`"name": "3",`
`361`		`- "value": "FALSE"`
	`361`	`+ "value": "False"`
`362`	`362`	`},`
`363`	`363`	`{`
`364`	`364`	`"name": "4",`
`365`		`- "value": "FALSE"`
	`365`	`+ "value": "False"`
`366`	`366`	`},`
`367`	`367`	`{`
`368`	`368`	`"name": "5",`
`369`		`- "value": "FALSE"`
	`369`	`+ "value": "False"`
`370`	`370`	`}`
`371`	`371`	`]`
`372`	`372`	`},`
`@@ -399,7 +399,7 @@`
`399`	`399`	`"values": [`
`400`	`400`	`{`
`401`	`401`	`"name": "0",`
`402`		`- "value": "TRUE"`
	`402`	`+ "value": "True"`
`403`	`403`	`}`
`404`	`404`	`]`
`405`	`405`	`},`
`@@ -684,7 +684,7 @@`
`684`	`684`	`"values": [`
`685`	`685`	`{`
`686`	`686`	`"name": "0",`
`687`		`- "value": "TRUE"`
	`687`	`+ "value": "True"`
`688`	`688`	`}`
`689`	`689`	`]`
`690`	`690`	`},`
`@@ -695,7 +695,7 @@`
`695`	`695`	`"values": [`
`696`	`696`	`{`
`697`	`697`	`"name": "0",`
`698`		`- "value": "FALSE"`
	`698`	`+ "value": "False"`
`699`	`699`	`}`
`700`	`700`	`]`
`701`	`701`	`},`
`@@ -1009,7 +1009,7 @@`
`1009`	`1009`	`"values": [`
`1010`	`1010`	`{`
`1011`	`1011`	`"name": "0",`
`1012`		`- "value": "TRUE"`
	`1012`	`+ "value": "True"`
`1013`	`1013`	`}`
`1014`	`1014`	`]`
`1015`	`1015`	`},`
`@@ -1020,7 +1020,7 @@`
`1020`	`1020`	`"values": [`
`1021`	`1021`	`{`
`1022`	`1022`	`"name": "0",`
`1023`		`- "value": "FALSE"`
	`1023`	`+ "value": "False"`
`1024`	`1024`	`}`
`1025`	`1025`	`]`
`1026`	`1026`	`},`
`@@ -1334,7 +1334,7 @@`
`1334`	`1334`	`"values": [`
`1335`	`1335`	`{`
`1336`	`1336`	`"name": "0",`
`1337`		`- "value": "TRUE"`
	`1337`	`+ "value": "True"`
`1338`	`1338`	`}`
`1339`	`1339`	`]`
`1340`	`1340`	`},`
`@@ -1345,7 +1345,7 @@`
`1345`	`1345`	`"values": [`
`1346`	`1346`	`{`
`1347`	`1347`	`"name": "0",`
`1348`		`- "value": "FALSE"`
	`1348`	`+ "value": "False"`
`1349`	`1349`	`}`
`1350`	`1350`	`]`
`1351`	`1351`	`},`