From e659de8146b4ed31dc4cd85f037b79fbe2f9c056 Mon Sep 17 00:00:00 2001 From: srswinde Date: Mon, 9 Dec 2019 14:46:46 -0700 Subject: [PATCH 1/2] Update allmotors.sms --- allmotors.sms | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/allmotors.sms b/allmotors.sms index 9ee4d40..c53f48c 100644 --- a/allmotors.sms +++ b/allmotors.sms @@ -991,7 +991,7 @@ C411 ' Release the solenoid ENDIF WAIT=1000 OR(9) - OS(7) OS(8) + OS(7) OS(8) ' turn sol sensor on WAIT=100 WHILE IN(6) == 1 WAIT=100 @@ -1002,6 +1002,7 @@ C411 ' Release the solenoid ' or when we move filter wheels (GOSUB400) AT:FWHEEL_UPPER=0 AT:FWHEEL_LOWER=0 + OR(7) OR(8) ' turn sol sensor off IF DEBUG PRINT("SOLENOID RELEASED", #13) ENDIF RETURN From 0d142a82bb177314d134588edcb58a83a8a8558d Mon Sep 17 00:00:00 2001 From: srswinde Date: Mon, 9 Dec 2019 14:56:05 -0700 Subject: [PATCH 2/2] Update gb_indi.c --- gb_indi.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/gb_indi.c b/gb_indi.c index 4462189..8197ef0 100644 --- a/gb_indi.c +++ b/gb_indi.c @@ -1447,7 +1447,7 @@ static int guiderTelem(int init_struct) } IDSetSwitch(&lfSP, NULL); - fwheel_lower_isOff =motor->words[0] & 2; + //fwheel_lower_isOff =motor->words[0] & 2; } else if( !strcmp( motor->name, "FWHEEL_UPPER" ) ) @@ -1474,7 +1474,7 @@ static int guiderTelem(int init_struct) } IDSetSwitch(&ufSP, NULL); - fwheel_upper_isOff = motor->words[0] & 2; + //fwheel_upper_isOff = motor->words[0] & 2; } else if( !strcmp( motor->name, "OFFSET_FWHEEL" ) ) @@ -1557,6 +1557,7 @@ static int guiderTelem(int init_struct) //solenoid sensor stays on due to bug in firmware //we shall fix it here until the firmware is fixed. + /* if(fwheel_lower_isOff && fwheel_upper_isOff) { if( solenoid_status == ON ) @@ -1571,7 +1572,7 @@ static int guiderTelem(int init_struct) { IDMessage(mydev, "FHWEELS ON"); solenoid_status = ON; - } + }*/ //fprintf(stderr, "in guiderTelem %s\n", allmotors[5].name ); return 1;