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.
Sam Moore [Thu, 12 Sep 2013 17:06:29 +0000 (01:06 +0800)]
Merge branch 'master' of github:szmoore/MCTX3420
Stupid irc logs
Sam Moore [Thu, 12 Sep 2013 17:04:48 +0000 (01:04 +0800)]
Fix errors in refactored code
NOTE to Jeremy: I was using 2 FILE* for read/writing
But that seems to cause irregular behaviour (fread fails a lot).
So I just made both the FILE* the same and put mutexes around all of Data_Save and Data_Read for now.
Sam Moore [Thu, 12 Sep 2013 17:00:09 +0000 (01:00 +0800)]
Automatic commit of irc logs
Sam Moore [Thu, 12 Sep 2013 15:50:44 +0000 (23:50 +0800)]
Merge branch 'refactor'
Conflicts:
server/sensor.c
server/sensor.h
Also made the resulting code compile.
BUT...
There are memory errors in the FCGI code :S
Sam Moore [Thu, 12 Sep 2013 15:39:23 +0000 (23:39 +0800)]
Refactor Sensor related code; introduce seperate functions for dealing with DataPoints
DataFile acts as wrapper around whatever stores DataPoints. Currently wraps a binary file.
Rewrote Sensor_Handler in anticipation of using new FCGI_ParseRequest function.
Hopefully I can merge this easily :S
Sam Moore [Thu, 12 Sep 2013 14:18:12 +0000 (07:18 -0700)]
Merge pull request #32 from jtanx/master
Add FCGI request parsing helper
Jeremy Tan [Thu, 12 Sep 2013 14:14:08 +0000 (22:14 +0800)]
Revert change made to timestamp placing in JSON responses
Jeremy Tan [Thu, 12 Sep 2013 14:06:26 +0000 (22:06 +0800)]
Add request parsing helper, add TIMEVAL_* macros, move timestamps to identify module
Callum [Thu, 12 Sep 2013 13:26:53 +0000 (21:26 +0800)]
included analog and digital fail test sensors
Sam Moore [Thu, 12 Sep 2013 05:16:47 +0000 (13:16 +0800)]
Get rid of OpenCV for now
(Won't fit on BBB SD card)
Sam Moore [Wed, 11 Sep 2013 17:00:07 +0000 (01:00 +0800)]
Automatic commit of irc logs
Sam Moore [Tue, 10 Sep 2013 17:00:07 +0000 (01:00 +0800)]
Automatic commit of irc logs
Sam Moore [Mon, 9 Sep 2013 17:00:07 +0000 (01:00 +0800)]
Automatic commit of irc logs
Jeremy Tan [Mon, 9 Sep 2013 06:32:39 +0000 (14:32 +0800)]
Merge branch 'master' of https://github.com/szmoore/MCTX3420.git
Conflicts:
server/sensor.c
Sam Moore [Mon, 9 Sep 2013 04:45:45 +0000 (12:45 +0800)]
Add relative times, allow "points" param to work with "start_time"
Eg: To get a single point at a given time: http://localhost/api/sensors?id=0&start_time=5&points=1
The binary search means it will either get the closest point before or after the specified time.
Should probably make it so that FindTime will always get the same index given the same input.
Otherwise problems might arise.
Need some more argument checking?
Sam Moore [Mon, 9 Sep 2013 03:22:55 +0000 (11:22 +0800)]
Improve Server API for transferring sensor data
- Specify format as JSON, TSV or CSV: http://localhost/api/sensors?id=0&format=tsv
- Default is JSON
- Currently lower case; make case insensitive?
- Specify number of points (most recent) to transfer: http://localhost/api/sensors?id=0&points=all
- Default is SENSOR_QUERYBUFSIZ (10)
- "all" - Will transfer *all* points
- Currently incompatable with the time seeking options (TODO: Make compatable?)
- Specify time range to return data points: http://localhost/api/sensors?id=0&start_time=5&end_time=6
- Default behaviour is to just return most recent X points; see above
- Currently no options for relative (eg: last 5s) time arguments (TODO: Include relative times?)\
Consider:
- Remove critical sections by using one FILE* for writing and one for reading
- A critical section is needed around every call to fseek, because the writing thread may write suddenly to the wrong position
- Will having 2 FILE* mean file can be written and read independently?
- Need to be sure that this is actually thread safe, otherwise it is more work for no reward
- Need to simplify Sensor_Handler
- Added some helper functions, but probably need more
- Need to do some testing of this API in a test GUI
Sam Moore [Mon, 9 Sep 2013 01:34:41 +0000 (18:34 -0700)]
Merge pull request #30 from Callum-/master
safety check
Sam Moore [Mon, 9 Sep 2013 01:34:02 +0000 (18:34 -0700)]
Merge pull request #28 from justinjessada/master
Added sensors, actuators, PWM code
Sam Moore [Sun, 8 Sep 2013 17:00:07 +0000 (01:00 +0800)]
Automatic commit of irc logs
Callum [Sun, 8 Sep 2013 11:45:06 +0000 (19:45 +0800)]
Simple safety check
Callum [Sun, 8 Sep 2013 11:43:41 +0000 (19:43 +0800)]
Added safety check mechanism (needs some work)
Callum [Sun, 8 Sep 2013 09:38:50 +0000 (02:38 -0700)]
Merge pull request #29 from Callum-/master
fixed memory leaks
Callum [Sun, 8 Sep 2013 09:36:43 +0000 (17:36 +0800)]
Fixed memory leaks
Callum [Sun, 8 Sep 2013 09:33:53 +0000 (17:33 +0800)]
Fixed memory leaks
Sam Moore [Sat, 7 Sep 2013 17:00:07 +0000 (01:00 +0800)]
Automatic commit of irc logs
Jeremy Tan [Sat, 7 Sep 2013 13:52:29 +0000 (21:52 +0800)]
Add experimental support for querying a sensor an arbitrary range of points
Justin Kruger [Sat, 7 Sep 2013 12:03:57 +0000 (20:03 +0800)]
Add sensors, actuators, PWM code
Kept in separate files currently, can test and write proper function
once Beaglebone arrives
Sam Moore [Fri, 6 Sep 2013 17:00:08 +0000 (01:00 +0800)]
Automatic commit of irc logs
Jeremy Tan [Fri, 6 Sep 2013 12:54:45 +0000 (20:54 +0800)]
Update unit tests
Jeremy Tan [Fri, 6 Sep 2013 12:09:55 +0000 (05:09 -0700)]
Merge pull request #27 from jtanx/master
Add further identification methods + some bugfixes
Jeremy Tan [Fri, 6 Sep 2013 12:01:02 +0000 (20:01 +0800)]
Revert change to dump loop condition
Jeremy Tan [Fri, 6 Sep 2013 11:40:47 +0000 (19:40 +0800)]
Add API version and change FCGI_RejectJSON
FCGI_RejectJSON now requires a description message.
Jeremy Tan [Fri, 6 Sep 2013 03:02:40 +0000 (11:02 +0800)]
Fix g_sensor_names (enum out of order) and add identification
Sam Moore [Thu, 5 Sep 2013 17:00:08 +0000 (01:00 +0800)]
Automatic commit of irc logs
Jeremy Tan [Thu, 5 Sep 2013 13:25:13 +0000 (06:25 -0700)]
Merge pull request #26 from jtanx/master
Fix segfault & sensors bounds check + some documentation refactoring + work on unit tests
Jeremy Tan [Thu, 5 Sep 2013 13:21:46 +0000 (21:21 +0800)]
Nicer version...
Jeremy Tan [Thu, 5 Sep 2013 13:18:38 +0000 (21:18 +0800)]
Merge branch 'master' of https://github.com/szmoore/MCTX3420.git
Jeremy Tan [Thu, 5 Sep 2013 13:18:32 +0000 (21:18 +0800)]
Change @purpose to @brief (Doxygen warning) and work on unit tests
Sam Moore [Wed, 4 Sep 2013 17:00:06 +0000 (01:00 +0800)]
Automatic commit of irc logs
Jeremy Tan [Wed, 4 Sep 2013 12:05:08 +0000 (20:05 +0800)]
Merge branch 'master' of https://github.com/szmoore/MCTX3420.git
Jeremy Tan [Wed, 4 Sep 2013 12:04:41 +0000 (20:04 +0800)]
Fix segfault and bounds checking on sensor queries
Sam Moore [Tue, 3 Sep 2013 17:00:08 +0000 (01:00 +0800)]
Automatic commit of irc logs
Sam Moore [Mon, 2 Sep 2013 17:00:06 +0000 (01:00 +0800)]
Automatic commit of irc logs
Sam Moore [Mon, 2 Sep 2013 11:51:40 +0000 (19:51 +0800)]
Add control to GUI
Jeremy Tan [Mon, 2 Sep 2013 05:18:21 +0000 (13:18 +0800)]
Merge branch 'master' of https://github.com/szmoore/MCTX3420.git
Jeremy Tan [Mon, 2 Sep 2013 05:17:56 +0000 (13:17 +0800)]
Add log message for any rejected requests
Jeremy Tan [Mon, 2 Sep 2013 03:24:27 +0000 (20:24 -0700)]
Merge pull request #25 from jtanx/master
Update makefile
Sam Moore [Mon, 2 Sep 2013 11:15:16 +0000 (19:15 +0800)]
Create web directory to put web stuff in
Jeremy Tan [Mon, 2 Sep 2013 03:22:52 +0000 (11:22 +0800)]
Merge branch 'master' of https://github.com/szmoore/MCTX3420.git
Jeremy Tan [Mon, 2 Sep 2013 03:22:34 +0000 (11:22 +0800)]
Fix makefile
Jeremy Tan [Mon, 2 Sep 2013 02:54:02 +0000 (19:54 -0700)]
Merge pull request #24 from jtanx/master
Add actuators code
Jeremy Tan [Mon, 2 Sep 2013 00:58:04 +0000 (08:58 +0800)]
Fix linkage issues
Jeremy Tan [Mon, 2 Sep 2013 00:45:52 +0000 (08:45 +0800)]
Merge branch 'master' of https://github.com/szmoore/MCTX3420.git
Jeremy Tan [Mon, 2 Sep 2013 00:45:28 +0000 (08:45 +0800)]
Update unit tests.
Todo: Fix unit tests for access control
Sam Moore [Sun, 1 Sep 2013 17:00:06 +0000 (01:00 +0800)]
Automatic commit of irc logs
Sam Moore [Mon, 2 Sep 2013 00:27:15 +0000 (08:27 +0800)]
Add basic jQuery & flot GUI
Needs a lot of work, but at least it exists.
Sam Moore [Sun, 1 Sep 2013 16:01:32 +0000 (09:01 -0700)]
Merge pull request #23 from Callum-/master
stream
Callum [Sun, 1 Sep 2013 09:55:55 +0000 (17:55 +0800)]
Merge remote-tracking branch 'upstream/master'
Callum [Sun, 1 Sep 2013 09:53:40 +0000 (17:53 +0800)]
Simple streaming functionality
Sam Moore [Sat, 31 Aug 2013 17:00:06 +0000 (01:00 +0800)]
Automatic commit of irc logs
Sam Moore [Fri, 30 Aug 2013 17:00:07 +0000 (01:00 +0800)]
Automatic commit of irc logs
UCC git Repository :: git.ucc.asn.au