b1cda3f579
First incarnation of the logging code
2016-02-03 10:43:36 +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
a630a30294
Some things about make_gen
2016-01-26 11:50:32 +01:00
2593b44633
Merge branch 'maverick' into develop
...
Everything up to dat
2016-01-26 11:34:17 +01:00
1149227685
Merge branch 'master' into maverick
2016-01-26 10:56:19 +01:00
5e597e2d10
Merge branch 'maverick' into develop
...
Compile under OSX
2016-01-26 09:48:11 +01:00
f85c983651
Merge branch 'multicounter' into develop
2016-01-15 15:19:50 +01:00
4464373385
Merge branch 'master' into develop
2016-01-15 15:17:43 +01:00
a37aae2361
Merge branch 'ANSTO_MERGE_2' of ssh://gitorious.psi.ch/~hauser_n/sinqdev/ansto-sics into develop
...
Conflicts:
conman.c
drive.c
2016-01-15 15:17:17 +01:00
da542ad2ce
Merge branch 'master' of ssh://gitorious.psi.ch/sinqdev/sics
2015-12-07 14:39:18 +01:00
0d58ba2ef7
Some bug fixes:
...
- 0.0 rather then -777.77 for a missing value in four circle
- No error output in TAS
2015-12-07 14:38:11 +01:00
73d6c5f5fb
put a space after the POL column (bug fix)
2015-11-03 08:29:14 +01:00
8394e52393
Fixed comment in countersec.c
2015-09-08 08:30:11 +02:00
cdce9cc2c9
Merge branch 'master' into develop
2015-08-05 11:11:24 +02:00
0238d062de
Merge branch 'master' into multicounter
2015-08-04 10:35:05 +02:00
64d44c2824
Assorted bug fixes
...
- If SctProcessNode ran into a timeout, its action data wa sdeleted. If data came
later, this caused SICS to crash. This is now fixed
- sget leaked connections under certain circumstances
- Cosmetic fix to hipadaba.c
- yet another chnage to the TRICS file format in fourmess.c, now it prints magnetic field
instead of the proton count
2015-07-30 13:57:55 +02:00
Douglas Clowes
eff54a5fd9
Implement task priorities and message queues
2015-07-29 17:47:46 +10: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
7ccbf7e0bd
Change LLDstringDelete to LLDdeleteString
2015-07-29 17:46:34 +10:00
Douglas Clowes
f0021db2ff
Fix some weird code in strrepc of task.c
...
So little code, so many faults:
* It calls strchr from the beginning each time
(it could use ++ptr as the start)
* If cFrom and cTo are the same it loops forever
* if int is 32bits && ptr is 64bits it may break
(many are, and the cast truncates the pointer)
* if sizeof(char) > 1 it breaks badly
2015-07-24 13:50:26 +10:00
Douglas Clowes
8a91653f13
Fix bad memory handling in traceCommand
2015-07-24 12:36:28 +10:00
Douglas Clowes
4f411f66ca
Fix a memory leak in background task
2015-07-24 12:31:43 +10:00
Douglas Clowes
d89851dc6a
Fix a spelling error s/sucessfully/successfully/
2015-07-24 12:29:52 +10:00
950cddc8e5
Moved Tcl clock and date function into the main SICS kernel directory
2015-07-07 12:31:21 +02:00
ef8b2a2eed
Merge branch 'develop' of ssh://gitorious.psi.ch/sinqdev/sics into develop
2015-07-06 09:14:58 +02:00
7f8d532748
Merge branch 'master' of ssh://gitorious.psi.ch/sinqdev/sics
2015-07-06 09:11:25 +02:00
Douglas Clowes
e0d400cdbb
Fix argv index in MakeDrive for mv command name
2015-07-03 09:12:30 +10:00
Douglas Clowes
8a4192dc41
Fix the TaskDescription format for the start time
2015-07-03 09:11:17 +10:00
a3605ea96b
MultiCounterSec revised now passes self test
2015-06-30 15:03:06 +02:00
7643c51d74
Fix for multicountersec coordination issues implemented
2015-06-26 11:32:05 +02:00
a3d76cafd9
Merge branch 'develop' of ssh://gitorious.psi.ch/sinqdev/sics into develop
2015-06-23 10:54:46 +02:00
dc2f0f29c8
- added hvali command (does not throw an error when geterror is defined)
2015-06-23 10:51:19 +02:00
08e1e58c42
Added gregories patch to fitcenter.
...
Implements a valerr on the peak command
2015-06-16 11:02:36 +02:00
766c8bbb73
Interrupt handling in motorsec.c did not work, fixed
2015-06-16 11:01:51 +02:00
410c142ecd
Merge branch 'develop' of ssh://gitorious.psi.ch/sinqdev/sics into develop
2015-06-11 16:26:57 +02:00
b02a574199
- added checksum algorithm binprot.c
...
- minor fix in ascon.c
2015-06-11 16:22:42 +02:00
cb0f4c0b99
- added checksum algorithm binprot.c
...
- minor fix in ascon.c
2015-06-11 16:13:01 +02:00
6c40d4c06c
Merge branch 'moreremo' of ssh://gitorious.psi.ch/sinqdev/sics into develop
2015-06-05 08:35:21 +02:00
5428016125
Merge branch 'develop' of ssh://gitorious.psi.ch/sinqdev/sics into develop
2015-06-05 08:35:01 +02:00
5ad786b3b4
Small adaptions to output for TRICS ccl files
2015-06-05 08:29:49 +02:00
69d44bc495
Fixed bad -9999.9 after error message when geterror was set on a root level
...
SICSOBJ node
2015-06-05 08:28:03 +02:00
c60e9920c5
First working verion of remote object
...
Fixed two bugs along the way:
- asynnet: ANETReadPtr now sets length to 0 if ther eis no data
- motorsec: if the motor does not start the status is set to error
2015-05-20 08:55:49 +02:00
6f0e2e01df
Merge branch 'develop' into moreremo
...
Conflicts:
conman.c
2015-05-12 08:41:06 +02:00
9517a6d14e
Switched remoteobject to use a single connection with ACT
2015-05-12 08:36:38 +02:00
e73743a97c
Another protocol ID which escaped
2015-05-11 14:47:19 +02:00
4865902a97
Merge branch 'develop' into moreremo
2015-05-11 11:44:06 +02:00
bb7eb497de
Refactored protocol code to use defined IDs rather then raw integers
2015-05-11 09:30:44 +02:00
0bcd3b06f6
Fixed a critical bug which prevented gumtree SE from working. No ACt was sent
...
after removing the sycamore protocol
2015-05-08 13:43:49 +02:00
f82d6a83b0
Merge branch 'develop' of ssh://gitorious.psi.ch/sinqdev/sics into develop
2015-05-04 08:07:07 +02:00
7d535abd73
Fixed a core dump in monitor mode in countersec.c
2015-05-04 08:04:54 +02:00
