Fixed issue #35

msproul · Jul 4, 2024 · e2c142c · e2c142c
1 parent 11d8bd6
commit e2c142c
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 13 deletions.
diff --git a/alpacapi_EditHistory.txt b/alpacapi_EditHistory.txt
@@ -1,4 +1,4 @@
-History Comments found =3535 in 523 files
+History Comments found =3536 in 523 files
 PDS_ReadNASAfiles.c:28   	//*	Jan 26,	1992	Reading of PDS files into Mac program from CD working
 PDS_ReadNASAfiles.c:29   	//*	Mar 14,	1992	Starting on more detailed interpretation of label (header)
 PDS_ReadNASAfiles.c:30   	//*	Mar 16,	1992	Changed number of displayed bytes from 836 to 800
@@ -3522,6 +3522,7 @@ alpacadriver_scripts.cpp:26	//*	Jun 30,	2024	<MLS> Created alpacadriver_scripts.
 alpacadriver.cpp:197     	//*	Jul  1,	2024	<MLS> Added http headers for js and css files
 alpacadriver.cpp:198     	//*	Jul  1,	2024	<MLS> Added Get_Readall() to base class
 alpacadriver.cpp:199     	//*	Jul  1,	2024	<MLS> Added details command to be compatible with AlpacaHub <PDR>
+domedriver_ror_rpi.cpp:32	//*	Jul  4,	2024	<MLS> github  Compile error #35, added kRelay_FlatScren
 cameradriver.cpp:222     	//*	Jan  1,	2119	<TODO> ----------------------------------------
 cameradriver.cpp:223     	//*	Jun 26,	2119	<TODO> Add support for sub frames
 cameradriver_png.cpp:33  	//*	Jan 31,	2120	<TODO> Add support for libpng
@@ -3534,19 +3535,19 @@ controller_camera.cpp:79 	//*	Feb  6,	2121	<TODO> Move downloading of images to
 cameradriver_QHY.cpp:52  	//*	Oct 10,	2122	<TODO> Add support for percentcompleted to QHY camera driver
 spectrodriver.cpp:34     	//*	May  7,	2123	<TODO> Add support for SlitID, SlitAngle, SlitWidth
 controller_dome.cpp:47   	//*	Jun 25,	2123	<ADD> Add slaved to DeviceState
-History Comments found   = 3535 in 523 files
-Total lines              = 246470
-Total comment Lines      = 40597 (16.5%)
-Total comments           = 45582 (18.5%)
-Total history comments   = 3535 (1.4%)
+History Comments found   = 3536 in 523 files
+Total lines              = 246483
+Total comment Lines      = 40603 (16.5%)
+Total comments           = 45588 (18.5%)
+Total history comments   = 3536 (1.4%)
 Total C files            = 69
 Total C++ files          = 197
 Total H files            = 255
-Preprocssor cnt          = 7893
-Total SLOC               = 156391
-Total SLOC-Logical       = 120869
+Preprocssor cnt          = 7894
+Total SLOC               = 156395
+Total SLOC-Logical       = 120875
 Programmer comment summary
-MLS             = 3125
+MLS             = 3126
 TODO            =   11
 DDB             =    1
 JMH             =    3

diff --git a/src/domedriver_ror_rpi.cpp b/src/domedriver_ror_rpi.cpp
@@ -29,6 +29,7 @@
 //*	Nov 24,	2023	<MLS> Fixed bug in RunThread_Loop() as per pull request #28
 //*	Nov 26,	2023	<SCV> Fixed Closing status bug RunThread_Loop() as per pull request #32
 //*	Nov 26,	2023	<MLS> Support for topens ROR driver appears to be complete
+//*	Jul  4,	2024	<MLS> github  Compile error #35, added kRelay_FlatScren
 //*****************************************************************************
 //*****************************************************************************
 //	After doing some experimenting with AlpacaPi,
@@ -94,6 +95,7 @@
 	#define		kRelay_RoofPower	1
 	#define		kRelay_RoofOpen		2
 	#define		kRelay_RoofClose	3
+	#define		kRelay_FlatScren	4
 
 	//*	this is the default value, it can be changed from the web setup interface
 	#define		kSwitchDelaySeconds	20

diff --git a/src/telescopedriver.cpp b/src/telescopedriver.cpp
@@ -282,7 +282,7 @@ int		iii;
 	for (iii=0; iii<3; iii++)
 	{
 		cTelescopeProp.AxisRates[iii].Minimum	=	0.0;
-		cTelescopeProp.AxisRates[iii].Maximum	=	4.0 + iii;	//*	the extra iii is for testing
+		cTelescopeProp.AxisRates[iii].Maximum	=	7.0 + iii;	//*	the extra iii is for testing
 	}
 
 	//*	there are a bunch of static settings that conform needs to be happy
@@ -3273,14 +3273,18 @@ bool					previousTrackingState;
 						alpacaErrCode			=	kASCOM_Err_InvalidValue;
 						reqData->httpRetCode	=	400;
 						GENERATE_ALPACAPI_ERRMSG(alpacaErrMsg, "Rate out of allowed range");
-		//				CONSOLE_DEBUG(alpacaErrMsg);
+						CONSOLE_DEBUG(alpacaErrMsg);
+						CONSOLE_DEBUG_W_STR("rateString\t=",	rateString);
+						CONSOLE_DEBUG_W_DBL("newRate   \t=",	newRate);
+						DumpRequestStructure(__FUNCTION__, reqData);
+						DumpTelescopeDriverStruct(&cTelescopeProp);
 					}
 				}
 				else
 				{
 					alpacaErrCode			=	kASCOM_Err_InvalidValue;
 					reqData->httpRetCode	=	400;
-					GENERATE_ALPACAPI_ERRMSG(alpacaErrMsg, "Rate out non-numeric");
+					GENERATE_ALPACAPI_ERRMSG(alpacaErrMsg, "Rate is non-numeric");
 	//				CONSOLE_DEBUG(alpacaErrMsg);
 				}
 			}
@@ -4498,6 +4502,13 @@ void	DumpTelescopeDriverStruct(TYPE_TelescopeProperties *telescopeDriver)
 	CONSOLE_DEBUG_W_BOOL("CanSync                    \t=",	telescopeDriver->CanSync);
 	CONSOLE_DEBUG_W_BOOL("CanSyncAltAz               \t=",	telescopeDriver->CanSyncAltAz);
 	CONSOLE_DEBUG_W_BOOL("CanUnpark                  \t=",	telescopeDriver->CanUnpark);
+
+	CONSOLE_DEBUG_W_DBL("AxisRates[0].Minimum        \t=",	telescopeDriver->AxisRates[0].Minimum);
+	CONSOLE_DEBUG_W_DBL("AxisRates[0].Maximum        \t=",	telescopeDriver->AxisRates[0].Maximum);
+
+	CONSOLE_DEBUG_W_DBL("AxisRates[1].Minimum        \t=",	telescopeDriver->AxisRates[1].Minimum);
+	CONSOLE_DEBUG_W_DBL("AxisRates[1].Maximum        \t=",	telescopeDriver->AxisRates[1].Maximum);
+
 }
 
 #ifdef _ENABLE_GLOBAL_GPS_