linse/sics
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
1,026 Commits 1 Branch 0 Tags
445a3323702a1e3770ece594a0b5e956fdd4e652
Commit Graph

900 Commits

Author SHA1 Message Date
Douglas Clowes
445a332370 Set Motor status to HWBusy in State_Unknown 
Discard outstanding message response on entering State_Unknown (timing window)
Don't break if it times out while waiting
Defer various faults until motor has stopped
Rename absenc to absencoder in list command (if has encoder)
Modify absenc to report integer encoder value
Allow manager to set various sensitive values in motor debug mode
Make motor "reset" command wait until motor reinitialised (timing window)

r2520 | dcl | 2008-05-12 11:05:35 +1000 (Mon, 12 May 2008) | 9 lines
 2012-11-15 13:36:53 +11:00
Douglas Clowes
2a469d6b89 Dan's changes for small sample Z stage (temporary) 
r2510 | dcl | 2008-05-08 16:50:32 +1000 (Thu, 08 May 2008) | 2 lines
 2012-11-15 13:36:49 +11:00
Douglas Clowes
3076fccac3 change speeds add focussing motors 
r2509 | dcl | 2008-05-08 16:50:04 +1000 (Thu, 08 May 2008) | 2 lines
 2012-11-15 13:36:45 +11:00
Douglas Clowes
b5d157c67a incorporate Dan's change to resolver code 
r2508 | dcl | 2008-05-08 16:48:32 +1000 (Thu, 08 May 2008) | 2 lines
 2012-11-15 13:36:41 +11:00
Douglas Clowes
f7d9d06484 implement motor "trace_switches" command 
r2507 | dcl | 2008-05-08 16:47:34 +1000 (Thu, 08 May 2008) | 2 lines
 2012-11-15 13:36:37 +11:00
Douglas Clowes
c7794c4092 Speed up the idle slow poll timer to make it more responsive to changes in position while idle. 
r2506 | dcl | 2008-05-07 10:19:26 +1000 (Wed, 07 May 2008) | 2 lines
 2012-11-15 13:36:33 +11:00
Douglas Clowes
a143b9905e Change state transition on limit switch event to ensure that motor is stopped before turning it off. 
r2505 | dcl | 2008-05-07 10:14:28 +1000 (Wed, 07 May 2008) | 2 lines
 2012-11-15 13:36:29 +11:00
Douglas Clowes
0e4be397d5 Rework to make more like updated Echidna and Wombat programs 
r2495 | dcl | 2008-04-30 11:57:55 +1000 (Wed, 30 Apr 2008) | 2 lines
 2012-11-15 13:36:25 +11:00
Douglas Clowes
fe682b39ac Change over to Quokka SIS PLC address 
r2494 | dcl | 2008-04-30 11:57:08 +1000 (Wed, 30 Apr 2008) | 2 lines
 2012-11-15 13:36:21 +11:00
Douglas Clowes
8ced552998 Change comments 
r2493 | dcl | 2008-04-30 11:56:22 +1000 (Wed, 30 Apr 2008) | 2 lines
 2012-11-15 13:36:17 +11:00
Douglas Clowes
d5db9de5a6 Change over to Platypus SIS PLC address 
r2492 | dcl | 2008-04-30 11:55:37 +1000 (Wed, 30 Apr 2008) | 2 lines
 2012-11-15 13:36:13 +11:00
Douglas Clowes
c44ad5a097 Remove serialsinq 
r2487 | dcl | 2008-04-24 12:12:47 +1000 (Thu, 24 Apr 2008) | 2 lines
 2012-11-15 13:36:09 +11:00
Douglas Clowes
0937bc2ba2 Handle simulated PLC 
r2486 | dcl | 2008-04-24 12:11:51 +1000 (Thu, 24 Apr 2008) | 2 lines
 2012-11-15 13:36:06 +11:00
Douglas Clowes
1eda12ffb6 Change sphi home position after running it off the end of the screw with Nan and broken limit switch. 
r2485 | dcl | 2008-04-24 12:11:01 +1000 (Thu, 24 Apr 2008) | 2 lines
 2012-11-15 13:36:02 +11:00
Douglas Clowes
a9d493382f Fix Chopper IP address 
r2484 | dcl | 2008-04-24 12:10:00 +1000 (Thu, 24 Apr 2008) | 2 lines
 2012-11-15 13:35:58 +11:00
Douglas Clowes
b8711e9bc4 Motor Off Delay is in milliSeconds 
r2483 | dcl | 2008-04-24 12:09:25 +1000 (Thu, 24 Apr 2008) | 2 lines
 2012-11-15 13:35:54 +11:00
Douglas Clowes
355cd532cf Improved logging for motion characterisation of motors. 
Reject NaN and Infinity in run command.
Change error message for both limit switches active.
Check status of BG command in case it failed.

r2482 | dcl | 2008-04-24 12:08:03 +1000 (Thu, 24 Apr 2008) | 5 lines
 2012-11-15 13:35:50 +11:00
Douglas Clowes
fd0ab1a3b5 Update to version on controller - adjust comments 
r2457 | dcl | 2008-04-16 10:57:40 +1000 (Wed, 16 Apr 2008) | 2 lines
 2012-11-15 13:35:42 +11:00
Douglas Clowes
1c86cbc665 Update to version on controller - remove comment text on end of line 
r2456 | dcl | 2008-04-16 10:57:21 +1000 (Wed, 16 Apr 2008) | 2 lines
 2012-11-15 13:35:39 +11:00
Douglas Clowes
bdf5e24cc0 Remove extraconfig 
r2453 | dcl | 2008-04-14 13:53:40 +1000 (Mon, 14 Apr 2008) | 2 lines
 2012-11-15 13:35:35 +11:00
Douglas Clowes
6009f273c8 Add two theta virtual motor 
r2452 | dcl | 2008-04-14 13:53:18 +1000 (Mon, 14 Apr 2008) | 2 lines
 2012-11-15 13:35:31 +11:00
Douglas Clowes
4562daf398 Implement changes made on instrument during commissioning 
r2451 | dcl | 2008-04-14 13:51:07 +1000 (Mon, 14 Apr 2008) | 2 lines
 2012-11-15 13:35:27 +11:00
Douglas Clowes
76e63de5a3 adjustments to timings 
r2433 | dcl | 2008-04-14 10:30:07 +1000 (Mon, 14 Apr 2008) | 2 lines
 2012-11-15 13:35:23 +11:00
Douglas Clowes
4b17ca99da Bring into line with changes made on Echidna and Wombat 
r2432 | dcl | 2008-04-14 10:28:07 +1000 (Mon, 14 Apr 2008) | 2 lines
 2012-11-15 13:35:19 +11:00
Douglas Clowes
03394dcc9e tweak sz configuration 
r2431 | dcl | 2008-04-14 09:51:48 +1000 (Mon, 14 Apr 2008) | 2 lines
 2012-11-15 13:35:15 +11:00
Douglas Clowes
7220f040ef wait for motion to complete before turning air and motor off (was crashing thread 0) 
r2430 | dcl | 2008-04-14 09:50:38 +1000 (Mon, 14 Apr 2008) | 2 lines
 2012-11-15 13:35:11 +11:00
Douglas Clowes
d34b441f14 fix signed mismatch compiler diagnostic 
r2427 | dcl | 2008-04-14 09:46:32 +1000 (Mon, 14 Apr 2008) | 2 lines
 2012-11-15 13:35:00 +11:00
Douglas Clowes
b12fff759a add -Wextra -std=gnu99 -Wno-unused compiler flags 
r2425 | dcl | 2008-04-14 09:42:15 +1000 (Mon, 14 Apr 2008) | 2 lines
 2012-11-15 13:34:52 +11:00
Douglas Clowes
20eeefae96 remove unused code 
r2424 | dcl | 2008-04-14 09:39:26 +1000 (Mon, 14 Apr 2008) | 2 lines
 2012-11-15 13:34:48 +11:00
Douglas Clowes
a0c6945bb6 implement settle timer on creep positioning 
detect position overrun error and stop runaway motor
implement deferred fault reporting until after motor stopped
save and report timer period in debug output (DMC_SetTimer)
handle leading '-' on numeric galil response
more comment documentation
remove unused variables

r2423 | dcl | 2008-04-14 09:38:41 +1000 (Mon, 14 Apr 2008) | 8 lines
 2012-11-15 13:34:44 +11:00
Douglas Clowes
149d825a3a remove unused variables 
r2422 | dcl | 2008-04-14 09:23:13 +1000 (Mon, 14 Apr 2008) | 2 lines
 2012-11-15 13:34:40 +11:00
Douglas Clowes
6e49b1e6c1 dereference pointer 
r2421 | dcl | 2008-04-14 09:20:48 +1000 (Mon, 14 Apr 2008) | 2 lines
 2012-11-15 13:34:36 +11:00
Douglas Clowes
99409fa8c3 remove unused variable 
r2420 | dcl | 2008-04-14 09:20:01 +1000 (Mon, 14 Apr 2008) | 2 lines
 2012-11-15 13:34:33 +11:00
Douglas Clowes
38b588cc47 suppress sign mismatch compiler diagnostic 
r2419 | dcl | 2008-04-14 09:19:12 +1000 (Mon, 14 Apr 2008) | 2 lines
 2012-11-15 13:34:29 +11:00
Douglas Clowes
d2564a7838 suppress "not used" diagnostics, remove serialsinq 
r2418 | dcl | 2008-04-14 08:41:08 +1000 (Mon, 14 Apr 2008) | 2 lines
 2012-11-15 13:34:25 +11:00
Douglas Clowes
46d79274a5 fix missing pointer dereferences, change SerialError to getRS232Error 
r2417 | dcl | 2008-04-14 08:40:07 +1000 (Mon, 14 Apr 2008) | 2 lines
 2012-11-15 13:34:21 +11:00
Douglas Clowes
0427d9acea fix missing return, change SerialError to getRS232Error 
r2416 | dcl | 2008-04-14 08:39:00 +1000 (Mon, 14 Apr 2008) | 2 lines
 2012-11-15 13:34:17 +11:00
Douglas Clowes
519bf308fa fix missing return from ITC4_Config, change SerialError to getRS232Error, adjust Formatting 
r2415 | dcl | 2008-04-14 08:37:57 +1000 (Mon, 14 Apr 2008) | 2 lines
 2012-11-15 13:34:13 +11:00
Douglas Clowes
895e52bfe9 Remove unused variables and code 
r2414 | dcl | 2008-04-14 08:33:45 +1000 (Mon, 14 Apr 2008) | 2 lines
 2012-11-15 13:34:10 +11:00
Douglas Clowes
04568a34f2 Bugfixes from commissioning. Use _SCx, send STx and HLTx=1. Fix missing TRACE output. Change 'has_airpads' to 'protocol'. 
r2389 | dcl | 2008-03-10 08:19:23 +1100 (Mon, 10 Mar 2008) | 2 lines
 2012-11-15 13:33:51 +11:00
Douglas Clowes
106159ca58 Substantially modified controller software: mainly limit switches and deceleration. 
r2388 | dcl | 2008-03-07 16:12:47 +1100 (Fri, 07 Mar 2008) | 2 lines
 2012-11-15 13:33:47 +11:00
Douglas Clowes
2ea2923399 modify limits on som 
r2387 | dcl | 2008-03-07 16:11:52 +1100 (Fri, 07 Mar 2008) | 2 lines
 2012-11-15 13:33:43 +11:00
Douglas Clowes
b3d5464454 Interim iteration 
r2383 | dcl | 2008-03-05 15:25:32 +1100 (Wed, 05 Mar 2008) | 2 lines
 2012-11-15 13:33:39 +11:00
Douglas Clowes
02508cfcda Remove previous comment from end of line which kills thread0 
r2373 | dcl | 2008-02-27 09:47:54 +1100 (Wed, 27 Feb 2008) | 2 lines
 2012-11-15 13:33:35 +11:00
Douglas Clowes
c97b23fbcb Fix some typos and add deferred state/event trace reporting 
r2365 | dcl | 2008-02-21 14:59:25 +1100 (Thu, 21 Feb 2008) | 2 lines
 2012-11-15 13:33:28 +11:00
Ferdi Franceschini
f3d798689b Merge changes from release 2.0 branch 
r2364 | ffr | 2008-02-20 09:00:24 +1100 (Wed, 20 Feb 2008) | 2 lines
 2012-11-15 13:33:24 +11:00
Douglas Clowes
ed9f92c6ef rotary beam attenuator motor 
r2363 | dcl | 2008-02-19 15:27:19 +1100 (Tue, 19 Feb 2008) | 2 lines
 2012-11-15 13:33:20 +11:00
Mark Lesha
1cd243f1f4 Added uploading of server parameters srv_xxx in order to allow SICS to control various server features and access/release its control and configuration features. 
r2362 | mle | 2008-02-19 14:19:26 +1100 (Tue, 19 Feb 2008) | 2 lines
 2012-11-15 13:33:16 +11:00
Mark Lesha
0f2cde7ed9 Changed SICS username and password to 'SICS' to suit new histogram server. Port is still 8080. 
r2361 | mle | 2008-02-19 12:40:12 +1100 (Tue, 19 Feb 2008) | 2 lines
 2012-11-15 13:33:12 +11:00
Douglas Clowes
a095e0d6da Add 'encoderAxis' parameter so encoder can be on a different axis from the motor. 
r2360 | dcl | 2008-02-18 08:22:02 +1100 (Mon, 18 Feb 2008) | 2 lines
 2012-11-15 13:33:09 +11:00