Commit Graph

30 Commits

Author SHA1 Message Date
66466c1c0f This is the first working version of the new logging system. Some work
in fine tuning still needs to be done. But is reasonably OK now.
2016-02-11 13:40:31 +01:00
95988f331c Merge branch 'develop' of ssh://gitorious.psi.ch/sinqdev/sics into develop
Conflicts:
	fourmess.c
2016-01-29 08:53:00 +01:00
5e597e2d10 Merge branch 'maverick' into develop
Compile under OSX
2016-01-26 09:48:11 +01:00
Douglas Clowes
0db57b9bae Reference count async queue transactions
so we can put them of task message queues
2015-07-29 17:47:15 +10:00
Douglas Clowes
2b73a7eaca Remove extra include (<rs232controller.h>) 2015-01-07 11:05:58 +11:00
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
ee40adceb2 Add asyncqueue 'transact' command and list the protocol 2014-08-27 16:52:13 +10:00
Douglas Clowes
6054eeeae9 Restructure free_command to afford protocol module more control
This allows the protocol module first cleanup opportunity on Txn
2014-08-21 17:24:18 +10:00
Douglas Clowes
99dea317f0 Refactor free of command/transaction code to function 2014-08-21 09:42:19 +10:00
Douglas Clowes
5fa021ce88 Move some definitions and add something private
definitions from asyncqueue to asyncprotocol to reduce dependency loops
add protocol-private data structure and killer routine
2014-08-20 13:34:15 +10:00
Douglas Clowes
08f29ef255 Move "Timeout trace" in asyncqueue trace logging 2014-08-06 10:43:02 +10:00
Douglas Clowes
72fcb82a65 Add "Timeout trace" to asyncqueue trace logging 2014-08-06 10:04:45 +10:00
Douglas Clowes
8849dc90c5 SICS-760 Add NOREPLY mechanism in aqadapter and asyncqueue
This removes the expectation of a reply when sending is suffixed
with "{0}" or "@@NOREPLY@@" or, for asyncqueue, a custom string.
2014-07-15 18:48:38 +10:00
Douglas Clowes
0a5ff0360d Add trace and list commands to AsyncQueue 2014-06-13 14:57:48 +10:00
Mark Könnecke
bc31c6cd1e Changes to make SICS compile on OSX Maverick with clang 2014-03-14 09:48:14 +01:00
Douglas Clowes
77bb495fe2 Purge the asyncqueue command queue periodically while disconnected 2013-08-01 17:13:52 +10:00
Douglas Clowes
dcfd6edfbe Clear the network timer on firing in TimedReconnect 2013-07-08 15:54:35 +10:00
Douglas Clowes
e4b528426d Make Timer handling more robust and easier to use 2013-07-08 15:54:31 +10:00
Douglas Clowes
784372503c refactor TimedReconnect and AQ_Reconnect to make more the same 2013-07-08 15:54:26 +10:00
Douglas Clowes
aaeaff692e purge asyncqueue on disconnect 2013-07-08 15:54:20 +10:00
Douglas Clowes
1ac674099d Fix connection failure logic in AsyncQueue, return if not reconnected 2013-06-17 12:05:29 +10:00
Douglas Clowes
d6f72482b3 change state to connected before notify callback for connect 2013-06-17 12:05:29 +10:00
Douglas Clowes
ecf64f40cc Add some TODO messages and change the reconnect backoff limits 2013-06-17 12:05:29 +10:00
Douglas Clowes
1cf8cc81a1 Add a function to AsyncQueue to tell if we are connected 2013-06-14 14:40:03 +10:00
Douglas Clowes
8e245ba4be turn read interest back on once connect completes 2013-05-24 13:04:58 +10:00
Douglas Clowes
e91fdd1808 progressive patching 2012-11-28 11:03:51 +11:00
koennecke
91d4af0541 - Adapted indenation to new agreed upon system
- Added support for second generation scriptcontext based counter
2009-02-13 09:00:03 +00:00
koennecke
361ee9ebea - Reworked the connection object and the IO system
- Reworked the support for TRICS
- Added a second generation motor
2009-02-03 08:05:39 +00:00
koennecke
22b0e8ec83 *** empty log message *** 2007-11-27 13:36:15 +00:00
koennecke
08c5e037a0 - Added asynchronous IO code from ANSTO
- Added new ACT protocol
- Extended sicshdbadapter to cover counters and status to put the status
 into Hipadaba
- Fixes to napi5.c
- Exe now supports hdbrun which allows to write output for a buffer into
 hdb node.
2007-06-22 11:44:46 +00:00