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
Diff: FIZ_readers/FIZDigiPowerActive.cpp
- Revision:
- 80:0b7f1b85b626
- Parent:
- 71:7305a35cee58
- Child:
- 81:aee60dcce61b
--- a/FIZ_readers/FIZDigiPowerActive.cpp Thu Aug 25 16:16:31 2022 +0000 +++ b/FIZ_readers/FIZDigiPowerActive.cpp Tue Aug 30 09:33:44 2022 +0000 @@ -199,9 +199,9 @@ return; } // pc.puts("FIZ good\r\n"); - uint16_t iris_Position = ((uint16_t)inputBuffer[2])<<8 | inputBuffer[3]; - uint16_t zoom_Position = ((uint16_t)inputBuffer[4])<<8 | inputBuffer[5]; - uint16_t focus_Position = ((uint16_t)inputBuffer[6])<<8 | inputBuffer[7]; + 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]; // MAY NEED TO SCALE THESE _focus = (uint32_t)(focus_Position * UserSettings.focus_scale) + UserSettings.focus_offset;