Commit Graph

142 Commits

Author SHA1 Message Date
Douglas Clowes
a43461b200 Reworked AsyncQueue sendCommand processing
Squashed commit of the following:

commit 42fb7d3cde591d40060cc740ccbc47f1ae7a5a50
Author: Douglas Clowes <dcl@ansto.gov.au>
Date:   Tue Aug 26 13:31:11 2014 +1000

    Get the MODBUS_AP working

commit da785c1434a04c4186d4174eb2dfbaefc850c8e7
Author: Douglas Clowes <dcl@ansto.gov.au>
Date:   Mon Aug 25 18:01:50 2014 +1000

    Bring Modbus protocol closer to Huber, Knauer and Omron

commit ef06ed7b6911cb49b35c19fe73e55f7c57cfd049
Author: Douglas Clowes <dcl@ansto.gov.au>
Date:   Mon Aug 25 18:01:18 2014 +1000

    Make Huber, Knauer and Omron protocols more aligned (diffable)

commit 3ef1bb06b3f865502ad7dffc4bf5dba4814d9334
Author: Douglas Clowes <dcl@ansto.gov.au>
Date:   Fri Aug 22 17:47:50 2014 +1000

    Get the Huber and Knauer protocols to be more alike

commit 2c9932e83f6735e894278648afdcadece654d43b
Author: Douglas Clowes <dcl@ansto.gov.au>
Date:   Fri Aug 22 17:12:31 2014 +1000

    Clean up the Knauer dual-mode protocol and refactor

commit 333300b19b0e61916e261300ac6ae2b6bab5df09
Author: Douglas Clowes <dcl@ansto.gov.au>
Date:   Thu Aug 21 15:38:39 2014 +1000

    Get the Knauer dual-mode protocol working(-ish)

commit b1f9d82f1b9eb8a1ff54694adc3482984b0d3d72
Author: Douglas Clowes <dcl@ansto.gov.au>
Date:   Thu Aug 21 15:37:44 2014 +1000

    Make private functions static (and not duplicated)

commit 0b077414eef9e4351956a2b971d7751cced0d3cd
Author: Douglas Clowes <dcl@ansto.gov.au>
Date:   Thu Aug 21 12:46:10 2014 +1000

    Knauer moving toward dual protocol

commit 13199bea38a1595ce06923e83474b738b10db94d
Author: Douglas Clowes <dcl@ansto.gov.au>
Date:   Thu Aug 21 12:42:48 2014 +1000

    Restructure default sendCommand processing in asyncqueue

commit 99a8ea3174ca0636503b0ce0cdb6016790315558
Author: Douglas Clowes <dcl@ansto.gov.au>
Date:   Thu Aug 21 09:48:50 2014 +1000

    Add a Modbus Protocol handler derived from sct_tcpmodbus

commit 3adf49fb7c8402c8260a0bb20729d551ac88537b
Author: Douglas Clowes <dcl@ansto.gov.au>
Date:   Thu Aug 21 09:43:54 2014 +1000

    Leave the free of private data to the asyncqueue mechanism
2014-08-27 16:52:13 +10:00
Douglas Clowes
acec319ee3 Zeroing rotary encoder motor steps fix 2014-07-15 18:52:05 +10:00
Douglas Clowes
22b34395c1 SICS-761 Zero the motor step counter for rotary encoders. 2014-07-15 18:48:38 +10:00
Douglas Clowes
cd80f567fe Only do the rotary_bits if the previous counts is valid
This saves decrementing it the first time through because it is in
the fourth quadrant and the initial value (zero) is in the first.
2014-07-10 13:14:27 +10:00
Douglas Clowes
81554ee0d7 Adjust motor oscillation and SetRadCol command
Count full cycles on motor oscillate
Add logging on motor oscillate
Add "motor oscillate start high/low" options
Remove SetRadCol offset because it is not needed
2014-07-03 12:12:52 +10:00
Douglas Clowes
881fce1feb SICS-750 Restrict sensitive motor commands to debug+manager or initialization 2014-06-19 16:35:47 +10:00
Douglas Clowes
1a1f00c49a motor verbose/debug, position_names, hard<->soft and refactor
Make debug mode and verbose mode separate modes

Implement position names in the "posit" code as alternate to numbers

Refactor to use hard/soft conversion functions
2014-05-30 17:32:47 +10:00
Douglas Clowes
c7a2d05832 Add posit2soft to get soft position from position 2014-05-30 17:19:36 +10:00
Douglas Clowes
4f7fe09f35 Implement a turn counter for wrap-around rotary encoders 2014-05-20 12:26:44 +10:00
Douglas Clowes
4c65f82116 Remove superfluous trailing white space from C files 2014-05-16 17:23:44 +10:00
Douglas Clowes
abafa6a2e6 Change obsoleted eStatus logging to eLog or eValue 2014-05-16 15:39:58 +10:00
Douglas Clowes
4820912bdc Legacy_fsm cut/paste typo 2014-05-06 17:20:43 +10:00
Douglas Clowes
988cb87371 Fix typo 2014-03-21 11:49:27 +11:00
Douglas Clowes
acf9d75941 Change display of values for posit_count, motorhome, and legacy_fsm
For hdb and writeTree issues
2014-03-19 16:59:33 +11:00
Douglas Clowes
ef236ecb1b Refinements to motion reporting for motors 2014-03-13 16:00:24 +11:00
Douglas Clowes
0536c16843 Add motion reporting for driver run and ascillate commands 2014-03-13 12:15:58 +11:00
Douglas Clowes
5eec1a9cd5 Impliment motor "oscillate" and "status" commands and prefix "driver run" 2014-03-11 17:17:57 +11:00
Douglas Clowes
0a012cabc3 Fix possible buffer overruns 2014-03-03 17:04:31 +11:00
Ferdi Franceschini
f6ae3c62f7 SICS-719: Acknowledge errors when in protocol 2 or 3 2014-01-31 09:15:06 +11:00
Douglas Clowes
4069e71748 Add motor tracking on/off/clear/stats/save commands 2013-08-07 12:22:12 +10:00
Douglas Clowes
0ffc87e3d7 Allow motor poll rates to be adjusted without an absolute encoder 2013-08-06 11:39:40 +10:00
Douglas Clowes
59e5539d5e Make the old motor FSM into a Legacy_FSM and default to the new FSM 2013-08-02 10:47:48 +10:00
Douglas Clowes
88f788e9cc Add motor creep_factor and creep_substep and remove obsolete code 2013-08-02 09:59:50 +10:00
Douglas Clowes
ea0a9759e1 Add run, halt, error action commands 2013-08-02 09:55:59 +10:00
Douglas Clowes
2a7d0a0699 Add stepCount and moveTime to motor data 2013-08-02 09:55:59 +10:00
Douglas Clowes
627b840c38 Add min and max position on a motor move and output 2013-08-02 09:55:58 +10:00
Douglas Clowes
23f53b8a4c Break down the motor states further to make them even simpler 2013-08-02 09:55:58 +10:00
Douglas Clowes
4d933a6399 Make motor creep "single-step" one tenth steps-per-count 2013-08-02 09:55:58 +10:00
Douglas Clowes
e9a884fa30 Add some motor statistics and regression to calculate steps per unit 2013-08-02 09:55:58 +10:00
Douglas Clowes
1d18fbf646 Rework the motor end-of-motion tests when creeping 2013-08-02 09:55:57 +10:00
Douglas Clowes
1a64c0a4a9 Separate motor states for move, backlash and creep 2013-08-02 09:55:57 +10:00
Douglas Clowes
6c220b4b55 Move the motor status handling out of line to reduce clutter and promote reuse 2013-08-02 09:55:57 +10:00
Douglas Clowes
6e5c0730e3 Improve debug printing 2013-08-02 09:55:56 +10:00
Douglas Clowes
6187cb3d15 Remove some obsolete and inactive code 2013-08-02 09:55:56 +10:00
Douglas Clowes
746f43ccb8 Change some variable names for the sake of consistency 2013-08-02 09:55:56 +10:00
Douglas Clowes
eeb74517a8 Add some braces, add and improve comments to make code clearer, no functional changes 2013-08-02 09:55:56 +10:00
Douglas Clowes
ca779ddc36 revert the one-shot change 2013-08-02 09:55:55 +10:00
Douglas Clowes
7c0dfe437a SICS-632 Allocate a copy of the connection, for motor tracing, and free it at the end. 2013-07-08 15:53:59 +10:00
Douglas Clowes
a44cd3464d Add a disconnected state to the motor state machine, rename Unknown to Init 2013-07-08 15:53:54 +10:00
Douglas Clowes
4bc06cea76 SICS-501 Special one-shot move after changing direction for backlash 2013-07-08 15:53:46 +10:00
Douglas Clowes
b76cee0525 Add sending the motor name in config information to the fake motor 2013-07-01 13:38:22 +10:00
Ferdi Franceschini
357170a735 SICS-616 Removed obsolete setpos command from motor driver. 2013-05-31 09:55:10 +10:00
Douglas Clowes
7e0e068ee2 differentiate forward/reverse limit switches in 'crashed' log message 2013-05-31 09:35:52 +10:00
Ferdi Franceschini
0954c3bceb Fixed compile error, ‘struct __MoDriv’ has no m ember named ‘errMsg’ 2013-05-31 08:06:38 +10:00
Douglas Clowes
4a363d0e95 SICS-614 reallocate errMsg buffer each time it's used 2013-05-28 16:22:44 +10:00
Douglas Clowes
ba128520da Add motor runtime to motor stopped log message 2013-02-15 09:49:39 +11:00
Douglas Clowes
eb1d042440 set driver_status to HWIdle on HALT in motor Idle state 2013-02-06 10:27:00 +11:00
Douglas Clowes
fd064f3df9 revise logging and state trace
r3790 | dcl | 2012-11-13 13:38:25 +1100 (Tue, 13 Nov 2012) | 1 line
2012-11-15 17:41:39 +11:00
Douglas Clowes
a9fc20abee make poll rates configurable by adding motorPollSlow, motorPollFast and airPollTimer parameters
r3682 | dcl | 2012-07-26 15:48:38 +1000 (Thu, 26 Jul 2012) | 1 line
2012-11-15 17:35:00 +11:00
Douglas Clowes
5118d7b23e Add TCP address:port to displayed parameters for use in simulation
r3655 | dcl | 2012-07-19 14:57:03 +1000 (Thu, 19 Jul 2012) | 1 line
2012-11-15 17:33:50 +11:00