Fix analog to volts convertion.

PDMRotator/RotatorClass.h

@@ -1,14 +1,14 @@
 /*
 * PDM NexDome Rotation kit firmware. NOT compatible with original NexDome ASCOM driver.
 *
-* Copyright © 2018 Patrick Meloy
+* Copyright � 2018 Patrick Meloy
 * Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation
-*  files (the “Software”), to deal in the Software without restriction, including without limitation the rights to use, copy,
+*  files (the �Software�), to deal in the Software without restriction, including without limitation the rights to use, copy,
 *  modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software
 *  is furnished to do so, subject to the following conditions:
 *  The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
 *
-*  THE SOFTWARE IS PROVIDED “AS IS”, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
+*  THE SOFTWARE IS PROVIDED �AS IS�, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
 *  OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
 *  BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF
 *  OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
@@ -185,6 +185,7 @@ class RotatorClass
 	int			_moveDirection;
 
 	// Power values
+	float		adcConvert;
 	int			_volts;
 	int			_cutOffVolts;
 	int			ReadVolts();
@@ -205,6 +206,7 @@ class RotatorClass
 
 RotatorClass::RotatorClass()
 {
+	adcConvert = 3.0 * (5.0 / 1023.0) * 100;
 	LoadFromEEProm();
 	pinMode(HOME_PIN, INPUT_PULLUP);
 	pinMode(STEP_PIN, OUTPUT);
@@ -295,13 +297,12 @@ void RotatorClass::SetDefaultConfig()
 
 int	RotatorClass::ReadVolts()
 {
+	int adc;
 	float calc;
 
-	calc = analogRead(VOLTAGE_MONITOR_PIN);
-	calc = calc / 2;
-	calc = calc * 3;
-	_volts = (int)calc;
-	return (int)calc;
+	adc = analogRead(VOLTAGE_MONITOR_PIN);
+	calc = adc * adcConvert;
+	return int(calc);
 }
 void RotatorClass::SetLowVoltageCutoff(int lowVolts)
 {

PDMShutter/PDMShutterClass.h

@@ -149,6 +149,7 @@ class ShutterClass
 //	uint8_t			_openedPin;
 //	uint8_t			_enablePin;
 
+	float				adcConvert;
 	uint16_t		_volts;
 	uint64_t		_batteryCheckInterval = 120000;
 	uint16_t		_cutoffVolts = 1220;
@@ -161,7 +162,7 @@ class ShutterClass
 //	uint8_t			_stepMode;
 
 
-	float		MeasureVoltage();
+	int		MeasureVoltage();
 	void		DefaultEEProm();
 };
 
@@ -173,6 +174,7 @@ class ShutterClass
 
 ShutterClass::ShutterClass()
 {
+	adcConvert = 3.0 * (5.0 / 1023.0) * 100;
 	ReadEEProm();
 	//_openedPin = OPENED_PIN;
 	//_closedPin = CLOSED_PIN;
@@ -284,16 +286,16 @@ void		ShutterClass::DoButtons()
 		lastButtonPressed = whichButtonPressed = 0;
 	}
 }
-float		ShutterClass::MeasureVoltage()
+
+int  ShutterClass::MeasureVoltage()
 {
-	int volts, adc;
+	int adc;
 	float calc;
 
 	adc = analogRead(VOLTAGE_MONITOR_PIN);
 	DBPrintln("ADC returns " + String(adc));
-	calc = adc * 3.0 * (5.0 / 1023.0);
-	_volts = volts = calc * 100;
-	return volts;
+	calc = adc * adcConvert;
+	return int(calc);
 }
 
 // Helper functions
@@ -360,7 +362,7 @@ String		ShutterClass::GetVoltString()
 }
 
 // Setters
-void		ShutterClass::EnableOutputs(bool newState) 
+void		ShutterClass::EnableOutputs(bool newState)
 {
 	if (newState == false)
 	{
@@ -503,7 +505,7 @@ void		ShutterClass::Run()
 	if (nextBatteryCheck < millis() && isConfiguringWireless == false)
 	{
 		DBPrintln("Measuring Battery");
-		MeasureVoltage();
+		_volts = MeasureVoltage();
 		Wireless.println("K" + GetVoltString());
 		if (firstBatteryCheck == true)
 		{