I messed up the merge, so pushing it over to another repo so I don't lose it. Will tidy up and remove later

Dependencies:   BufferedSerial FatFileSystemCpp mbed

Revision:
81:aee60dcce61b
Parent:
80:0b7f1b85b626
diff -r 0b7f1b85b626 -r aee60dcce61b FIZ_readers/FIZDigiPowerActive.cpp
--- a/FIZ_readers/FIZDigiPowerActive.cpp	Tue Aug 30 09:33:44 2022 +0000
+++ b/FIZ_readers/FIZDigiPowerActive.cpp	Wed Aug 31 15:46:41 2022 +0000
@@ -199,14 +199,29 @@
         return;
     }
 //    pc.puts("FIZ good\r\n");
-    uint16_t iris_Position =  getAbsoluteIris(((uint16_t)inputBuffer[2])<<8 | inputBuffer[3]); //((uint16_t)inputBuffer[2])<<8 | inputBuffer[3];
-    uint16_t zoom_Position = getAbsoluteZoom(((uint16_t)inputBuffer[4])<<8 | inputBuffer[5]); //((uint16_t)inputBuffer[4])<<8 | inputBuffer[5];
-    uint32_t focus_Position = getAbsoluteFocus(((uint32_t)inputBuffer[6])<<8 | inputBuffer[7]); //((uint32_t)inputBuffer[6])<<8 | inputBuffer[7];
+    uint16_t iris_Position =  ((uint16_t)inputBuffer[2])<<8 | inputBuffer[3];
+    uint16_t zoom_Position = ((uint16_t)inputBuffer[4])<<8 | inputBuffer[5];
+    uint32_t focus_Position = ((uint32_t)inputBuffer[6])<<8 | inputBuffer[7];
 
-// MAY NEED TO SCALE THESE
-    _focus = (uint32_t)(focus_Position * UserSettings.focus_scale) + UserSettings.focus_offset;
-    _iris = (uint16_t) (iris_Position * UserSettings.iris_scale) + UserSettings.iris_offset;
-    _zoom = (uint16_t) (zoom_Position * UserSettings.zoom_scale) + UserSettings.zoom_offset;
+    if (UserSettings.absolute_focus) {
+        _focus = getAbsoluteFocus(focus_Position);
+    } else {
+        _focus = (uint32_t)(focus_Position * UserSettings.focus_scale) + UserSettings.focus_offset;
+    }
+    if (UserSettings.absolute_iris) {
+        _iris = getAbsoluteIris(iris_Position);
+    } else {
+        _iris = (uint16_t) (iris_Position * UserSettings.iris_scale) + UserSettings.iris_offset;
+    }
+    if (UserSettings.absolute_zoom) {
+        _zoom = getAbsoluteZoom(zoom_Position);
+    } else {
+        _zoom = (uint16_t) (zoom_Position * UserSettings.zoom_scale) + UserSettings.zoom_offset;
+    }
+// // MAY NEED TO SCALE THESE
+//     _focus = (uint32_t)(focus_Position * UserSettings.focus_scale) + UserSettings.focus_offset;
+//     _iris = (uint16_t) (iris_Position * UserSettings.iris_scale) + UserSettings.iris_offset;
+//     _zoom = (uint16_t) (zoom_Position * UserSettings.zoom_scale) + UserSettings.zoom_offset;
 
     newData = true;
 }