Sam Moore [Mon, 23 Sep 2013 16:28:35 +0000 (00:28 +0800)]
Merge branch 'master' of https://github.com/szmoore/MCTX3420
There's always a merge.
Sam Moore [Mon, 23 Sep 2013 16:28:35 +0000 (00:28 +0800)]
Merge branch 'master' of https://github.com/szmoore/MCTX3420
There's always a merge.
Jeremy Tan [Mon, 23 Sep 2013 07:47:32 +0000 (00:47 -0700)]
Merge pull request #41 from jtanx/master
Update gui
Jeremy Tan [Mon, 23 Sep 2013 07:47:32 +0000 (00:47 -0700)]
Merge pull request #41 from jtanx/master
Update gui
Jeremy Tan [Mon, 23 Sep 2013 07:46:33 +0000 (15:46 +0800)]
Update gui
Jeremy Tan [Mon, 23 Sep 2013 07:46:33 +0000 (15:46 +0800)]
Update gui
James Rosher [Mon, 23 Sep 2013 06:41:07 +0000 (14:41 +0800)]
Added my gui version
James Rosher [Mon, 23 Sep 2013 06:41:07 +0000 (14:41 +0800)]
Added my gui version
Sam Moore [Sun, 22 Sep 2013 17:00:07 +0000 (01:00 +0800)]
Automatic commit of irc logs
Sam Moore [Sun, 22 Sep 2013 17:00:07 +0000 (01:00 +0800)]
Automatic commit of irc logs
Jeremy Tan [Sun, 22 Sep 2013 13:50:17 +0000 (21:50 +0800)]
Work on test gui
Jeremy Tan [Sun, 22 Sep 2013 13:50:17 +0000 (21:50 +0800)]
Work on test gui
Jeremy Tan [Sun, 22 Sep 2013 07:37:57 +0000 (15:37 +0800)]
IE8 fix (class is keyword and IE8 is not happy)
Jeremy Tan [Sun, 22 Sep 2013 07:37:57 +0000 (15:37 +0800)]
IE8 fix (class is keyword and IE8 is not happy)
Jeremy Tan [Sun, 22 Sep 2013 06:19:30 +0000 (14:19 +0800)]
Add graphs. Currently eats 100% of my cpu...
Jeremy Tan [Sun, 22 Sep 2013 06:19:30 +0000 (14:19 +0800)]
Add graphs. Currently eats 100% of my cpu...
Sam Moore [Sun, 22 Sep 2013 04:04:49 +0000 (12:04 +0800)]
Merge branch 'master' of github:/szmoore/MCTX3420
Sam Moore [Sun, 22 Sep 2013 04:04:49 +0000 (12:04 +0800)]
Merge branch 'master' of github:/szmoore/MCTX3420
Sam Moore [Sun, 22 Sep 2013 04:03:38 +0000 (12:03 +0800)]
Fix ADC sampling
- Fixed ADC_Read function
- The path to the ADC data files is generally different (hooray)
- Modified run.sh to work it out and pass to the program
- run.sh also loads kernel modules, etc
Sam Moore [Sun, 22 Sep 2013 04:03:38 +0000 (12:03 +0800)]
Fix ADC sampling
- Fixed ADC_Read function
- The path to the ADC data files is generally different (hooray)
- Modified run.sh to work it out and pass to the program
- run.sh also loads kernel modules, etc
Jeremy Tan [Sun, 22 Sep 2013 00:50:03 +0000 (17:50 -0700)]
Merge pull request #40 from jtanx/master
Various updates
Jeremy Tan [Sun, 22 Sep 2013 00:50:03 +0000 (17:50 -0700)]
Merge pull request #40 from jtanx/master
Various updates
Jeremy Tan [Sun, 22 Sep 2013 00:43:17 +0000 (08:43 +0800)]
Merge branch 'master' of https://github.com/szmoore/MCTX3420.git
Jeremy Tan [Sun, 22 Sep 2013 00:43:17 +0000 (08:43 +0800)]
Merge branch 'master' of https://github.com/szmoore/MCTX3420.git
Jeremy Tan [Sun, 22 Sep 2013 00:42:13 +0000 (08:42 +0800)]
Update nginx/rsyslog config to add specific log for LOGWARN or above
Jeremy Tan [Sun, 22 Sep 2013 00:42:13 +0000 (08:42 +0800)]
Update nginx/rsyslog config to add specific log for LOGWARN or above
Jeremy Tan [Sun, 22 Sep 2013 00:39:26 +0000 (08:39 +0800)]
Update test gui stuff
Jeremy Tan [Sun, 22 Sep 2013 00:39:26 +0000 (08:39 +0800)]
Update test gui stuff
Sam Moore [Sat, 21 Sep 2013 17:26:51 +0000 (01:26 +0800)]
Merge branch 'fix_hardwarecode'
Wait... it's letting me merge with no complains???
Sam Moore [Sat, 21 Sep 2013 17:26:51 +0000 (01:26 +0800)]
Merge branch 'fix_hardwarecode'
Wait... it's letting me merge with no complains???
Sam Moore [Sat, 21 Sep 2013 17:25:22 +0000 (01:25 +0800)]
Get BBB pin control working
Thank god it finally works.
Sam Moore [Sat, 21 Sep 2013 17:25:22 +0000 (01:25 +0800)]
Get BBB pin control working
Thank god it finally works.
Sam Moore [Sat, 21 Sep 2013 17:00:06 +0000 (01:00 +0800)]
Automatic commit of irc logs
Sam Moore [Sat, 21 Sep 2013 17:00:06 +0000 (01:00 +0800)]
Automatic commit of irc logs
Sam Moore [Sat, 21 Sep 2013 09:59:30 +0000 (17:59 +0800)]
Add filename and line number to Log/Fatal functions
Discovered the __FILE__ and __LINE__ preprocessor defines which seem useful.
Sam Moore [Sat, 21 Sep 2013 09:59:30 +0000 (17:59 +0800)]
Add filename and line number to Log/Fatal functions
Discovered the __FILE__ and __LINE__ preprocessor defines which seem useful.
Jeremy Tan [Sat, 21 Sep 2013 08:28:31 +0000 (16:28 +0800)]
Image: Fix function type, try to ensure image is not cached, add buffer releases.
Jeremy Tan [Sat, 21 Sep 2013 08:28:31 +0000 (16:28 +0800)]
Image: Fix function type, try to ensure image is not cached, add buffer releases.
Jeremy Tan [Sat, 21 Sep 2013 08:27:35 +0000 (16:27 +0800)]
Change control code - some bugfixes, plus stop threads in paused state
Jeremy Tan [Sat, 21 Sep 2013 08:27:35 +0000 (16:27 +0800)]
Change control code - some bugfixes, plus stop threads in paused state
Sam Moore [Fri, 20 Sep 2013 17:00:05 +0000 (01:00 +0800)]
Automatic commit of irc logs
Sam Moore [Fri, 20 Sep 2013 17:00:05 +0000 (01:00 +0800)]
Automatic commit of irc logs
Sam Moore [Fri, 20 Sep 2013 05:22:52 +0000 (13:22 +0800)]
Make code compile
Still needs work; GPIO1_28 (60) doesn't appear to be triggered by the actuator.
Sam Moore [Fri, 20 Sep 2013 05:22:52 +0000 (13:22 +0800)]
Make code compile
Still needs work; GPIO1_28 (60) doesn't appear to be triggered by the actuator.
Sam Moore [Thu, 19 Sep 2013 17:00:05 +0000 (01:00 +0800)]
Automatic commit of irc logs
Sam Moore [Thu, 19 Sep 2013 17:00:05 +0000 (01:00 +0800)]
Automatic commit of irc logs
Jeremy Tan [Thu, 19 Sep 2013 06:09:17 +0000 (14:09 +0800)]
Add test gui
Jeremy Tan [Thu, 19 Sep 2013 06:09:17 +0000 (14:09 +0800)]
Add test gui
Sam Moore [Wed, 18 Sep 2013 17:00:07 +0000 (01:00 +0800)]
Automatic commit of irc logs
Sam Moore [Wed, 18 Sep 2013 17:00:07 +0000 (01:00 +0800)]
Automatic commit of irc logs
Justin Kruger [Wed, 18 Sep 2013 12:37:25 +0000 (20:37 +0800)]
Added Beaglebone code to sensors.c & actuators.c
So I've probably broken something here with my half-remembered CITS1002
code, but hopefully it works. I have added real analog/digital sensor
tests to sensors.c and real digital/pwm actuators to actuators.c. These
reference GPIO.c and pwm.c for functions.
Justin Kruger [Wed, 18 Sep 2013 12:37:25 +0000 (20:37 +0800)]
Added Beaglebone code to sensors.c & actuators.c
So I've probably broken something here with my half-remembered CITS1002
code, but hopefully it works. I have added real analog/digital sensor
tests to sensors.c and real digital/pwm actuators to actuators.c. These
reference GPIO.c and pwm.c for functions.
Jeremy Tan [Wed, 18 Sep 2013 01:08:08 +0000 (18:08 -0700)]
Merge pull request #37 from jtanx/master
Update control code
Todo: Must add issues outlined and reconsider use of syslog
Jeremy Tan [Wed, 18 Sep 2013 01:08:08 +0000 (18:08 -0700)]
Merge pull request #37 from jtanx/master
Update control code
Todo: Must add issues outlined and reconsider use of syslog
Jeremy Tan [Wed, 18 Sep 2013 01:04:17 +0000 (09:04 +0800)]
Change actuator code to turn on/off all leds
Jeremy Tan [Wed, 18 Sep 2013 01:04:17 +0000 (09:04 +0800)]
Change actuator code to turn on/off all leds
Sam Moore [Tue, 17 Sep 2013 17:00:06 +0000 (01:00 +0800)]
Automatic commit of irc logs
Sam Moore [Tue, 17 Sep 2013 17:00:06 +0000 (01:00 +0800)]
Automatic commit of irc logs
Jeremy Tan [Tue, 17 Sep 2013 07:57:21 +0000 (15:57 +0800)]
Merge branch 'master' of https://github.com/szmoore/MCTX3420.git
Conflicts:
server/actuator.c
Jeremy Tan [Tue, 17 Sep 2013 07:57:21 +0000 (15:57 +0800)]
Merge branch 'master' of https://github.com/szmoore/MCTX3420.git
Conflicts:
server/actuator.c
Sam Moore [Tue, 17 Sep 2013 03:09:11 +0000 (11:09 +0800)]
Notes from meeting
Sam Moore [Tue, 17 Sep 2013 03:09:11 +0000 (11:09 +0800)]
Notes from meeting
Sam Moore [Mon, 16 Sep 2013 17:00:09 +0000 (01:00 +0800)]
Automatic commit of irc logs
Sam Moore [Mon, 16 Sep 2013 17:00:09 +0000 (01:00 +0800)]
Automatic commit of irc logs
Debian User [Mon, 16 Sep 2013 06:38:32 +0000 (06:38 +0000)]
Remove crap
Debian User [Mon, 16 Sep 2013 06:38:32 +0000 (06:38 +0000)]
Remove crap
Debian User [Mon, 16 Sep 2013 06:31:18 +0000 (06:31 +0000)]
Make it work on the BBB
Debian User [Mon, 16 Sep 2013 06:31:18 +0000 (06:31 +0000)]
Make it work on the BBB
Sam Moore [Mon, 16 Sep 2013 04:08:24 +0000 (21:08 -0700)]
Merge pull request #36 from justinjessada/master
Cleaned up Beaglebone sensors/actuators/PWM code
Sam Moore [Sun, 15 Sep 2013 17:00:07 +0000 (01:00 +0800)]
Automatic commit of irc logs
Jeremy Tan [Sun, 15 Sep 2013 14:01:50 +0000 (22:01 +0800)]
Amend syslog config (remove need to chmod)
Jeremy Tan [Sun, 15 Sep 2013 13:47:32 +0000 (21:47 +0800)]
Switch to syslog for logging messages.
Updated nginx and rsyslog config files are provided to
allow access to the log file from the web server, under
the location /api/log.
This WILL break nginx if you relied on symlinks to the
config file.
Jeremy Tan [Sun, 15 Sep 2013 08:05:31 +0000 (16:05 +0800)]
Minor mods to control code
Jeremy Tan [Sun, 15 Sep 2013 06:45:35 +0000 (14:45 +0800)]
Updated control stuff
Sam Moore [Sun, 15 Sep 2013 05:25:17 +0000 (13:25 +0800)]
Merge branch 'master' of github:szmoore/MCTX3420 into intertest
Sam Moore [Sun, 15 Sep 2013 05:23:54 +0000 (13:23 +0800)]
Add "image" module
- Use OpenCV to take image from webcam
- Use FastCGI and write image back to client
- Works!
- Currently has a memory leak, but that can be easily fixed
- ~50 FPS (on my laptop though, really need to start using the BBB for things)
Sam Moore [Sat, 14 Sep 2013 17:00:07 +0000 (01:00 +0800)]
Automatic commit of irc logs
Sam Moore [Sat, 14 Sep 2013 14:58:58 +0000 (22:58 +0800)]
Interferometer Test Program
Really ugly, concentrating on proof of concept, will clean up before merging into master branch.
Jeremy Tan [Sat, 14 Sep 2013 07:44:33 +0000 (15:44 +0800)]
Add semi working control code
Jeremy Tan [Sat, 14 Sep 2013 06:15:10 +0000 (14:15 +0800)]
Change times to be relative to this experiment
Jeremy Tan [Sat, 14 Sep 2013 06:03:27 +0000 (14:03 +0800)]
Partial implementation of higher level control functions
Jeremy Tan [Sat, 14 Sep 2013 03:19:49 +0000 (11:19 +0800)]
Manual merge of semi-updated control code
Jeremy Tan [Sat, 14 Sep 2013 03:04:12 +0000 (11:04 +0800)]
Merge branch 'master' of https://github.com/szmoore/MCTX3420.git
Conflicts:
server/control.c
Jeremy Tan [Sat, 14 Sep 2013 01:54:14 +0000 (09:54 +0800)]
Use FCGI_INT_T instead of FCGI_LONG_T as appropriate
The difference will matter on platforms where sizeof(long) != sizeof(int)
Sam Moore [Fri, 13 Sep 2013 17:00:13 +0000 (01:00 +0800)]
Automatic commit of irc logs
Justin Kruger [Fri, 13 Sep 2013 14:56:40 +0000 (22:56 +0800)]
Cleaned up Beaglebone sensors/actuators/PWM code
Moved some tasks into separate methods
Sam Moore [Fri, 13 Sep 2013 13:47:02 +0000 (21:47 +0800)]
Merge branch 'master' of github:szmoore/MCTX3420
Conflicts:
server/data.c
server/sensor.c
It's pretty scary how much got automatically merged.
Almost as if git is sentient.
Sam Moore [Fri, 13 Sep 2013 13:42:00 +0000 (21:42 +0800)]
Add Actuator related code
Made generalised Data_Handler function to reduce copy-paste.
(So you can query an Actuator for what values it has been set to).
Still a lot of copy-paste going on though.
Also added a few reports while I'm at it.
I suspect I will have to merge this with stuff other people did?
Jeremy Tan [Fri, 13 Sep 2013 10:25:44 +0000 (18:25 +0800)]
Merge branch 'master' of https://github.com/szmoore/MCTX3420.git
Callum [Fri, 13 Sep 2013 08:22:05 +0000 (01:22 -0700)]
Merge pull request #35 from Callum-/master
Modified stream to encode image to buffer
Callum [Fri, 13 Sep 2013 08:18:13 +0000 (16:18 +0800)]
Modified stream to encode image to buffer
Callum [Fri, 13 Sep 2013 07:07:59 +0000 (00:07 -0700)]
Merge pull request #34 from Callum-/master
made threshold structure and fixed checkdata
Callum [Fri, 13 Sep 2013 07:03:54 +0000 (15:03 +0800)]
made threshold structure and fixed checkdata
Jeremy Tan [Fri, 13 Sep 2013 06:36:57 +0000 (14:36 +0800)]
Merge branch 'master' of https://github.com/szmoore/MCTX3420.git
Jeremy Tan [Fri, 13 Sep 2013 06:35:26 +0000 (14:35 +0800)]
Code cleanup and partial modification to control code
Callum [Fri, 13 Sep 2013 06:19:16 +0000 (23:19 -0700)]
Merge pull request #31 from Callum-/master
included analog and digital fail test sensors
Callum [Fri, 13 Sep 2013 06:14:20 +0000 (14:14 +0800)]
Modified sanity check
Jeremy Tan [Fri, 13 Sep 2013 05:45:13 +0000 (22:45 -0700)]
Merge pull request #33 from jtanx/master
Some bugfixes for sensor/data code + add FCGI_INT_T
Callum [Fri, 13 Sep 2013 04:37:04 +0000 (12:37 +0800)]
Merge remote-tracking branch 'upstream/master'
Conflicts:
server/sensor.c
server/sensor.h
Jeremy Tan [Fri, 13 Sep 2013 03:04:52 +0000 (11:04 +0800)]
Some bugfixes for sensor/data code + add FCGI_INT_T
Note: PrintByTime/Points have exclusive ends now.
UCC git Repository :: git.ucc.asn.au