linse/sics
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
4,093 Commits 1 Branch 0 Tags
0238d062debc40a3392d396e2f7a3554cabbec70
Commit Graph

4093 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
koennecke 0238d062de Merge branch 'master' into multicounter 2015-08-04 10:35:05 +02:00
koennecke 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
koennecke 950cddc8e5 Moved Tcl clock and date function into the main SICS kernel directory 2015-07-07 12:31:21 +02:00
koennecke 7f8d532748 Merge branch 'master' of ssh://gitorious.psi.ch/sinqdev/sics 2015-07-06 09:11:25 +02:00
koennecke a3605ea96b MultiCounterSec revised now passes self test 2015-06-30 15:03:06 +02:00
koennecke 7643c51d74 Fix for multicountersec coordination issues implemented 2015-06-26 11:32:05 +02:00
zolliker dc2f0f29c8 - added hvali command (does not throw an error when geterror is defined) 2015-06-23 10:51:19 +02:00
koennecke 766c8bbb73 Interrupt handling in motorsec.c did not work, fixed 2015-06-16 11:01:51 +02:00
zolliker cb0f4c0b99 - added checksum algorithm binprot.c 
- minor fix in ascon.c
 2015-06-11 16:13:01 +02:00
koennecke 6c40d4c06c Merge branch 'moreremo' of ssh://gitorious.psi.ch/sinqdev/sics into develop 2015-06-05 08:35:21 +02:00
koennecke 5428016125 Merge branch 'develop' of ssh://gitorious.psi.ch/sinqdev/sics into develop 2015-06-05 08:35:01 +02:00
koennecke 5ad786b3b4 Small adaptions to output for TRICS ccl files 2015-06-05 08:29:49 +02:00
koennecke 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
koennecke 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
koennecke 6f0e2e01df Merge branch 'develop' into moreremo 
Conflicts:
	conman.c
 2015-05-12 08:41:06 +02:00
koennecke 9517a6d14e Switched remoteobject to use a single connection with ACT 2015-05-12 08:36:38 +02:00
koennecke e73743a97c Another protocol ID which escaped 2015-05-11 14:47:19 +02:00
koennecke 4865902a97 Merge branch 'develop' into moreremo 2015-05-11 11:44:06 +02:00
koennecke bb7eb497de Refactored protocol code to use defined IDs rather then raw integers 2015-05-11 09:30:44 +02:00
koennecke 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
koennecke f82d6a83b0 Merge branch 'develop' of ssh://gitorious.psi.ch/sinqdev/sics into develop 2015-05-04 08:07:07 +02:00
koennecke 7d535abd73 Fixed a core dump in monitor mode in countersec.c 2015-05-04 08:04:54 +02:00
koennecke aef2a36b60 Now, I fiddling with the message writitng code, I get all remote object 
messages but in the wrong order. They are sent in the right order, though.
Have to chnage the code to use one connection asynchronously for everything only.
 2015-05-04 08:02:37 +02:00
koennecke 5d0e05d77b Merge branch 'develop' into moreremo 2015-04-30 09:26:44 +02:00
koennecke b770b8c004 stptok playing up 2015-04-30 09:26:22 +02:00
koennecke e497e2daf3 Fixed minor typos and compilation issues 2015-04-30 09:25:36 +02:00
zolliker 55750450a5 Merge branch 'develop' of ssh://gitorious.psi.ch/sinqdev/sics into develop 2015-04-28 16:24:39 +02:00
zolliker fb7741178d - remob.c: forward errors to sics correctly 
- minor, more cosmetic fixes
 2015-04-28 16:17:32 +02:00
koennecke e8df6158ea - Fixed a bug relating to the control variable in countserse.c It was used 
to control the counter and internally to maintain count progress. This has
  now been fixed.
- Due to improper state handling multi counter failed when called both from
  the count task and the sttus testing. This is now resolved.
 2015-04-27 14:46:39 +02:00
koennecke b60ce746d4 Merge commit 'refs/merge-requests/1' of ssh://gitorious.psi.ch/sinqdev/sics into merge-requests/1 
First merge with ANSTO which compiles

Conflicts:
	SICSmain.c
	asynnet.c
	confvirtualmot.c
	counter.c
	devexec.c
	drive.c
	exebuf.c
	hipadaba.c
	interface.h
	make_gen
	motor.c
	nserver.c
	nwatch.c
	ofac.c
	protocol.c
	sicshipadaba.c
 2015-04-23 17:00:33 +02:00
koennecke b7eaa538ed - Rewrote the write part of remoteobject 
- With transactionID > 10^6, now termination messages are sent by contextdo
  and tasks
- This still has bugs
 2015-04-23 15:52:05 +02:00
Ferdi Franceschini 10d29d597c Cleaned up ANSTO code to merge with sinqdev.sics 
This is our new RELEASE-4_0 branch which was taken from ansto/93d9a7c
Conflicts:
	.gitignore
	SICSmain.c
	asynnet.c
	confvirtualmot.c
	counter.c
	devexec.c
	drive.c
	event.h
	exebuf.c
	exeman.c
	histmem.c
	interface.h
	motor.c
	motorlist.c
	motorsec.c
	multicounter.c
	napi.c
	napi.h
	napi4.c
	network.c
	nwatch.c
	nxscript.c
	nxxml.c
	nxxml.h
	ofac.c
	reflist.c
	scan.c
	sicshipadaba.c
	sicsobj.c
	site_ansto/docs/Copyright.txt
	site_ansto/instrument/lyrebird/config/tasmad/sicscommon/nxsupport.tcl
	site_ansto/instrument/lyrebird/config/tasmad/taspub_sics/tasscript.tcl
	statusfile.c
	tasdrive.c
	tasub.c
	tasub.h
	tasublib.c
	tasublib.h
 2015-04-23 20:49:26 +10:00
koennecke b8fbe22fc0 Merge branch 'master' into moreremo 2015-04-22 09:15:03 +02:00
koennecke 04906f672a Enhanced simindex to capture all data for fourcircle.tcl Another change 
to remove capture
 2015-04-20 11:21:41 +02:00
koennecke 005c35402a - Added additional cnvrt files from sicspsi 
- Removed unused sycamore protocol from the code base
 2015-04-20 09:29:07 +02:00
koennecke e577d9c313 - Removed defunct capture command 
- Moved some protocolls from sicspsi to kernel as discussed at ANSTO
 2015-04-20 09:08:34 +02:00
koennecke c2f08097da Nxdict attribute writing failed at "0,1,0" style strings, FIXED 2015-04-17 11:44:50 +02:00
Douglas Clowes c650788a2c Merge branch 'RELEASE-3_1' into RELEASE-3_2 2015-04-17 14:05:39 +10:00
Douglas Clowes 49a8bdc96c Merge branch 'Quokka' into RELEASE-3_1 2015-04-17 14:05:23 +10:00
Douglas Clowes c09781fed7 Change gumtree_time_estimate from float to text 2015-04-17 14:04:17 +10:00
Douglas Clowes 4bb05ed67e Merge branch 'RELEASE-3_1' into RELEASE-3_2 
Conflicts:
	sics/site_ansto/instrument/reflectometer/platypus_configuration.tcl
 2015-04-17 13:54:48 +10:00
Douglas Clowes 21c96297f3 Merge branch 'Wombat' into RELEASE-3_1 2015-04-17 13:17:45 +10:00
Douglas Clowes f2568b681d Pullback from Wombat 2015-04-17 2015-04-17 13:12:42 +10:00
Douglas Clowes 2925bdedc5 Merge branch 'Platypus' into RELEASE-3_1 2015-04-17 12:52:59 +10:00
Douglas Clowes 843a9f46be Pullback changes from Platypus 2015-04-17 12:52:17 +10:00
Douglas Clowes 1a93e494d9 Add a test setup for Pelican 2015-04-17 12:38:19 +10:00
Douglas Clowes 94663632e4 Merge branch 'Quokka' into RELEASE-3_1 
Conflicts:
	sics/site_ansto/instrument/config/environment/sct_hiden_xcs.tcl
	sics/site_ansto/instrument/config/environment/temperature/sct_julabo_lh45_gen.tcl
	sics/site_ansto/instrument/config/environment/temperature/sct_oxford_mercury.tcl
	sics/site_ansto/instrument/sans/quokka_configuration.tcl
	sics/site_ansto/instrument/util/gen_sct.py
 2015-04-17 12:27:57 +10:00
Douglas Clowes 1f9dd8da95 Pullback from Quokka 2015-04-17 2015-04-17 12:15:01 +10:00
Douglas Clowes 49a43f4d9b Merge branch 'Taipan_R31' into RELEASE-3_1 2015-04-17 11:50:03 +10:00
Douglas Clowes d07a0418b6 Add Taipan euler_config 2015-04-17 11:49:10 +10:00