Erik Frojdh
|
f8c90b6da6
|
gui cmake
|
2018-02-09 15:27:25 +01:00 |
|
|
|
895f8ccf81
|
Merge branch '3.0.1' into developer
|
2018-02-08 14:51:20 +01:00 |
|
Erik Frojdh
|
23c5a73285
|
Merge branch '3.0.1' into condatest
|
2018-02-08 10:36:06 +01:00 |
|
|
|
897cbac27d
|
merge from 3.0.1 for server binaries (adcphase,server dates, temp control, settings file
|
2018-02-07 11:02:36 +01:00 |
|
|
|
ecf1e9fac1
|
bugfix: returning pointer to local variable, char* to string in function definition
|
2018-02-07 10:14:52 +01:00 |
|
Erik Frojdh
|
eb57e3a1d3
|
gui install
|
2018-01-24 10:17:24 +01:00 |
|
Dhanya Maliakal
|
d6bdbf8524
|
Merge branch '3.0.1' into developer
|
2017-12-11 13:51:20 +01:00 |
|
Dhanya Maliakal
|
bb3e5351b4
|
solving warnings from latest linux
|
2017-12-11 13:51:11 +01:00 |
|
Dhanya Maliakal
|
24c305ec59
|
solved conflicts from merge of version being used to binary
|
2017-12-06 19:07:06 +01:00 |
|
Dhanya Maliakal
|
bf9905ad2a
|
possible to use binary --version or -v to get the branch and versionid
|
2017-12-06 19:05:35 +01:00 |
|
Dhanya Maliakal
|
c4a242e10a
|
changed all variables from svn to git, included --version for receiver binary
|
2017-12-06 10:29:57 +01:00 |
|
Dhanya Maliakal
|
2f3dc8d109
|
Merge branch '3.0.1' into developer
|
2017-12-06 08:44:21 +01:00 |
|
Dhanya Maliakal
|
7436d6c8d3
|
updaterev
|
2017-12-06 08:44:07 +01:00 |
|
Dhanya Maliakal
|
7e932bf84b
|
Merge branch '3.0.1' into developer
|
2017-12-05 16:04:26 +01:00 |
|
Dhanya Maliakal
|
b498043ea6
|
remember old read freq if not 0 in gui
|
2017-12-05 16:04:10 +01:00 |
|
Dhanya Maliakal
|
98e09b29d5
|
merge conflict solved -1 in adc in gui
|
2017-12-05 15:39:02 +01:00 |
|
Dhanya Maliakal
|
7aaf95a565
|
-1 in getadc fixed in gui as well
|
2017-12-05 15:37:34 +01:00 |
|
Dhanya Maliakal
|
385e6714cc
|
merge conflict from 3.0.1 to restream stop from recieveR
|
2017-11-30 19:05:19 +01:00 |
|
Dhanya Maliakal
|
baee38802b
|
wait state between acquistion finished and ready for next acquire in gui, check if acquiringflag is set then reset it
|
2017-11-30 16:20:26 +01:00 |
|
Dhanya Maliakal
|
1c606df752
|
using file index from zmq
|
2017-11-28 14:45:01 +01:00 |
|
Dhanya Maliakal
|
addf964901
|
Merge branch '3.0.1' into developer
|
2017-11-28 09:37:09 +01:00 |
|
Dhanya Maliakal
|
d5c310a2db
|
only call register call back which already enables streaming in client and receiveR
|
2017-11-28 09:36:14 +01:00 |
|
Dhanya Maliakal
|
e29371ca8d
|
makng the zmq work without external flag
|
2017-11-27 17:06:11 +01:00 |
|
Dhanya Maliakal
|
375b1c9485
|
not required to restart client datastreaming due to connect everytime for acquire
|
2017-11-27 15:40:36 +01:00 |
|
Dhanya Maliakal
|
f0431bd873
|
Merge branch '3.0.1' into developer
|
2017-11-23 18:24:33 +01:00 |
|
Dhanya Maliakal
|
9f733c1dfb
|
Merge branch '3.0.1' into zmqchange
|
2017-11-23 18:22:26 +01:00 |
|
Dhanya Maliakal
|
d40a2e0efa
|
receiver read freq should save value in shm even if no receiver present
|
2017-11-23 18:21:29 +01:00 |
|
Dhanya Maliakal
|
d23c9d52ed
|
somewhere
|
2017-11-23 14:53:33 +01:00 |
|
Dhanya Maliakal
|
39a20e1616
|
comment
|
2017-11-22 11:34:55 +01:00 |
|
Dhanya Maliakal
|
4159e83fd6
|
making gui work temporarily for jctb
|
2017-11-22 09:27:01 +01:00 |
|
Dhanya Maliakal
|
7f58b77dfb
|
Merge branch '3.0.1' into developer
|
2017-11-21 15:12:32 +01:00 |
|
Dhanya Maliakal
|
fd4dd5b1e9
|
removed printout
|
2017-11-21 15:12:05 +01:00 |
|
Dhanya Maliakal
|
9c55cb4974
|
removed merge conflicts from bug fix of zmq buffering while acquire from command line
|
2017-11-21 14:57:52 +01:00 |
|
Dhanya Maliakal
|
49ba893d7e
|
zmq buffering when acquire form command line, stopping sockets when command line acquire or receiver start, restarting sockets at change of port numbers and a refresh button for the same
|
2017-11-21 13:38:31 +01:00 |
|
Dhanya Maliakal
|
70e4c6e2a2
|
zmq separated for client and rx, ports and ip included in expert advanced mode
|
2017-11-17 17:37:00 +01:00 |
|
Dhanya Maliakal
|
28e2ebf75a
|
merge conflict resolved from 3.0.1
|
2017-11-17 09:40:42 +01:00 |
|
Dhanya Maliakal
|
d7137e0c75
|
fixed segmentation fault issue of xputsn the right way, fixed warnings
|
2017-11-17 09:26:05 +01:00 |
|
Dhanya Maliakal
|
2569ffbf10
|
fixed warnings, back to int warning in debugstream due to 64 bit
|
2017-11-17 08:53:05 +01:00 |
|
Dhanya Maliakal
|
c1e735c1b4
|
fixed a few warnings
|
2017-11-17 08:46:04 +01:00 |
|
Dhanya Maliakal
|
bbcf75bc09
|
separating zmqport, enabling in client and receiver works
|
2017-11-16 15:00:59 +01:00 |
|
Dhanya Maliakal
|
065b4a8e0f
|
including zmq port change in gui
|
2017-11-16 13:50:30 +01:00 |
|
Dhanya Maliakal
|
0e8d2de253
|
somewhere
|
2017-11-16 09:12:49 +01:00 |
|
Dhanya Maliakal
|
eb4ab306c7
|
in between separating datastreaming in client and receiver
|
2017-11-15 17:16:37 +01:00 |
|
Dhanya Maliakal
|
8872f86e31
|
Merge branch '3.0.1' into developer
|
2017-11-13 15:32:47 +01:00 |
|
Dhanya Maliakal
|
52a9303a5e
|
removed compression from gui in expert mode
|
2017-11-13 15:32:24 +01:00 |
|
Dhanya Maliakal
|
409519a3db
|
fixed the double plot due to unzooming in gui
|
2017-11-13 15:25:49 +01:00 |
|
Dhanya Maliakal
|
7ba90f98fc
|
including dynamic range in gui call back
|
2017-11-02 11:02:22 +01:00 |
|
Dhanya Maliakal
|
9d4c14b724
|
gap pixels should now work for 4 bit mode and a bug fix in decoding for 4 bit mode
|
2017-10-31 12:38:42 +01:00 |
|
Dhanya Maliakal
|
6812961836
|
temp in between, trying to get 4 bitmode to work without gap pixels
|
2017-10-26 11:09:55 +02:00 |
|
|
|
0fe43c75f2
|
merge branch developer into gappixels, added .project into gitignore
|
2017-10-12 15:08:32 +02:00 |
|
