Move VOR2 and ADF

Scott Vincent · Scott Vincent · commit 99c8238c1a9a · 2023-07-27T07:14:35.000+01:00
diff --git a/instrument-panel/instruments/adf.cpp b/instrument-panel/instruments/adf.cpp
@@ -165,8 +165,8 @@ void adf::addVars()
 
 void adf::addKnobs()
 {
-    // BCM GPIO 24 and 25
-    adfCardKnob = globals.hardwareKnobs->add(24, 25, -1, -1, 0);
+    // BCM GPIO 19 and 26
+    adfCardKnob = globals.hardwareKnobs->add(19, 26, -1, -1, 0);
 }
 
 void adf::updateKnobs()
diff --git a/instrument-panel/instruments/vor2.cpp b/instrument-panel/instruments/vor2.cpp
@@ -218,8 +218,8 @@ void vor2::addVars()
 
 void vor2::addKnobs()
 {
-    // BCM GPIO 19 and 26
-    obsKnob = globals.hardwareKnobs->add(19, 26, -1, -1, 0);
+    // BCM GPIO 24 and 25
+    obsKnob = globals.hardwareKnobs->add(24, 25, -1, -1, 0);
 }
 
 void vor2::updateKnobs()
diff --git a/instrument-panel/settings/instrument-panel.json b/instrument-panel/settings/instrument-panel.json
@@ -56,9 +56,9 @@
   },
   "VOR2": {
     "Enabled": true,
-    "Position X": 1227,
-    "Position Y": 674,
-    "Size": 276
+    "Position X": 1552,
+    "Position Y": 672,
+    "Size": 274
   },
   "RPM": {
     "Enabled": true,
@@ -68,8 +68,8 @@
   },
   "ADF": {
     "Enabled": true,
-    "Position X": 1555,
-    "Position Y": 677,
+    "Position X": 1230,
+    "Position Y": 680,
     "Size": 266
   },
   "Trim Flaps": {

Original file line number	Diff line number	Diff line change
`@@ -165,8 +165,8 @@ void adf::addVars()`
`165`	`165`
`166`	`166`	`void adf::addKnobs()`
`167`	`167`	`{`
`168`		`- // BCM GPIO 24 and 25`
`169`		`- adfCardKnob = globals.hardwareKnobs->add(24, 25, -1, -1, 0);`
	`168`	`+ // BCM GPIO 19 and 26`
	`169`	`+ adfCardKnob = globals.hardwareKnobs->add(19, 26, -1, -1, 0);`
`170`	`170`	`}`
`171`	`171`
`172`	`172`	`void adf::updateKnobs()`
Original file line number	Diff line number	Diff line change
`@@ -218,8 +218,8 @@ void vor2::addVars()`
`218`	`218`
`219`	`219`	`void vor2::addKnobs()`
`220`	`220`	`{`
`221`		`- // BCM GPIO 19 and 26`
`222`		`- obsKnob = globals.hardwareKnobs->add(19, 26, -1, -1, 0);`
	`221`	`+ // BCM GPIO 24 and 25`
	`222`	`+ obsKnob = globals.hardwareKnobs->add(24, 25, -1, -1, 0);`
`223`	`223`	`}`
`224`	`224`
`225`	`225`	`void vor2::updateKnobs()`