ctdo
/
psychose
16
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
139 Commits 3 Branches 0 Tags 575 KiB
Commit Graph

139 Commits

Author SHA1 Message Date
Lucas Pleß 9c0c7a0fdc added fensterkram teil 1 2014-11-20 15:35:46 +01:00
Lucas Pleß 27914e6a19 and fixed the temperature typo everywhere else (hopefully) 2014-11-19 03:21:14 +01:00
Lucas Pleß 33b8ee0ec7 changed temperature from int to float, since the arduino is sending now floats, fixed the typo 2014-11-19 03:18:26 +01:00
Lucas Pleß e116bb2447 added EKG code, since i changed the protocol 2014-11-19 03:14:48 +01:00
Lucas Pleß e9830ca276 removed snmp and status functions 
added hearts and breath display
added extra control window
made the main window for external display w/o borders
 2014-11-19 03:12:08 +01:00
Lucas Pleß 065006acdb changed ehealth temperature to float output 2014-10-28 19:52:32 +01:00
Lucas Pleß 1b99af1219 Merge branch 'master' of repos.ctdo.de:psychose 2014-10-28 19:33:52 +01:00
Lucas Pleß 1c2b262680 added Snmp client thread (untested) 2014-10-27 22:04:11 +01:00
Stefan Kögl 28036e6205 new version 2014-06-07 11:03:20 +02:00
Stefan Kögl f2963a938d polished 2014-05-29 10:22:04 +02:00
Stefan Kögl 80d6aea666 much rewrite, very kane :) 2014-05-26 23:25:36 +02:00
Stefan Kögl 05745e3c52 consolidate mjpeg streaming server using qtnetwork into a reusable class 2014-05-25 15:53:50 +02:00
Stefan Kögl f3477757c2 intermediate commit 2014-05-25 15:52:40 +02:00
Stefan Kögl b123160470 added icons and cleaned up code 2014-05-11 12:45:43 +02:00
Stefan Kögl 620c7bc3c3 Merge branch 'master' of repos.ctdo.de:psychose 2014-05-10 14:52:39 +02:00
Stefan Kögl d7f3a7daea changed from ffmpeg grabbing to internal grabbing and added a async http server 2014-05-10 14:52:21 +02:00
Lucas Pleß 805330fa27 version bump to 1.1 to bypass problems on our current setup 2014-05-03 11:48:49 +02:00
Lucas Pleß 0fd969766d Merge branch 'master' of repos.ctdo.de:psychose 2014-05-03 11:46:27 +02:00
Lucas Pleß 52e6847fc2 changed snmp timing to 100ms timeout 
added control to fake pulse heartrate
disabled snmp check on display mode
 2014-05-03 11:46:11 +02:00
Stefan Kögl 28cc9798e7 small changes to texter and ekgplotter 2014-05-02 13:53:42 +02:00
Stefan Kögl ca1d492198 justified text and small improvements 2014-04-29 09:54:58 +02:00
Stefan Kögl 0d2372df12 added per actor sensor scripts, improved grabber performance, started saving server configs and cleaned up the repo 2014-04-28 07:20:28 +02:00
Stefan Kögl 12138a9f57 Merge branch 'master' of repos.ctdo.de:psychose 
Conflicts:
	ekgplotter/ekgplotter/main.py
 2014-04-27 15:48:32 +02:00
Stefan Kögl a064715e38 removed unsued code 2014-04-27 15:45:58 +02:00
Stefan Kögl 720b7c00a9 more stable frame rate 2014-04-27 15:45:00 +02:00
Stefan Kögl dac236ca12 more stable frame rate 2014-04-27 15:44:38 +02:00
Lucas Pleß ac48b496fb Merge branch 'master' of repos.ctdo.de:psychose 2014-04-24 20:22:54 +02:00
Lucas Pleß cf756d4cf7 fixed bug where ekg does not show "no data" and fixed bug where snmp was not closed correctly 2014-04-24 20:22:41 +02:00
Stefan Kögl eaaddd80f2 minor ekplotter update 2014-04-24 14:20:10 +02:00
Stefan Kögl 97d9e8282e Merge branch 'master' of repos.ctdo.de:psychose 2014-04-24 10:50:16 +02:00
Stefan Kögl 8f57a6d36a fade animation 2014-04-24 10:49:54 +02:00
Stefan Kögl 40ffb2e43d cleaned up ekgplotter 2014-04-24 09:34:37 +02:00
Stefan Kögl f3a8e8c4dd cleaned up dump_grabber 2014-04-24 09:33:43 +02:00
Stefan Kögl 2837ab9389 more init scripts 2014-04-24 09:32:16 +02:00
Lucas Pleß 3c2cb48eed changed offline lines to "no data" 2014-04-23 22:35:04 +02:00
Stefan Kögl dcd8e49f85 better 2014-04-23 19:19:05 +02:00
Stefan Kögl f5352f247a reduced cpu load 2014-04-23 18:35:15 +02:00
Stefan Kögl 28e0cc3bc1 reduced cpu load from 104% with ffmpeg x11grab, ffserver and konsole to 32% with my implementation - yeah 2014-04-23 18:16:47 +02:00
Stefan Kögl 7ac50d1e79 done with this 2014-04-23 17:58:50 +02:00
Stefan Kögl 7e93c46547 fixed layout and colors 2014-04-23 17:46:14 +02:00
Stefan Kögl 2effe315a7 implemented dump_grabber 2014-04-23 16:31:19 +02:00
Stefan Kögl fce69b46ee added better chaosc init script to repo 2014-04-23 14:14:02 +02:00
Lucas Pleß bcdd2e4013 added stats display 2014-04-23 12:53:48 +02:00
Stefan Kögl 007ec565e1 finished animation feature, rearranged buttons and cleaned up the code 2014-04-22 11:10:08 +02:00
Stefan Kögl 0086d0fd8f Merge branch 'master' of repos.ctdo.de:psychose 2014-04-20 11:37:45 +02:00
Stefan Kögl 54d3526d2a sync commit for laptop 2014-04-20 11:37:22 +02:00
Lucas Pleß a53cf435de added stats display, removed border from actor display 2014-04-18 03:06:41 +02:00
Lucas Pleß a6a3666c15 moved code into package, added complete maven support for intellij UI Designer and JAR packaging 2014-04-17 19:03:45 +02:00
Lucas Pleß 3086c96bac Merge branch 'master' of repos.ctdo.de:psychose 2014-04-17 17:27:25 +02:00
Lucas Pleß f396266715 added airflow/breath 2014-04-17 17:27:19 +02:00