matches/MCTX3420.git
11 years agoAutomatic commit of irc logs
Sam Moore [Sat, 7 Sep 2013 17:00:07 +0000 (01:00 +0800)]
Automatic commit of irc logs

11 years agoAdd experimental support for querying a sensor an arbitrary range of points
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

11 years agoAdd sensors, actuators, PWM code
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

11 years agoAutomatic commit of irc logs
Sam Moore [Fri, 6 Sep 2013 17:00:08 +0000 (01:00 +0800)]
Automatic commit of irc logs

11 years agoUpdate unit tests
Jeremy Tan [Fri, 6 Sep 2013 12:54:45 +0000 (20:54 +0800)]
Update unit tests

11 years agoMerge pull request #27 from jtanx/master
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

11 years agoRevert change to dump loop condition
Jeremy Tan [Fri, 6 Sep 2013 12:01:02 +0000 (20:01 +0800)]
Revert change to dump loop condition

11 years agoAdd API version and change FCGI_RejectJSON
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.

11 years agoFix g_sensor_names (enum out of order) and add identification
Jeremy Tan [Fri, 6 Sep 2013 03:02:40 +0000 (11:02 +0800)]
Fix g_sensor_names (enum out of order) and add identification

11 years agoAutomatic commit of irc logs
Sam Moore [Thu, 5 Sep 2013 17:00:08 +0000 (01:00 +0800)]
Automatic commit of irc logs

11 years agoMerge pull request #26 from jtanx/master
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

11 years agoNicer version...
Jeremy Tan [Thu, 5 Sep 2013 13:21:46 +0000 (21:21 +0800)]
Nicer version...

11 years agoMerge branch 'master' of https://github.com/szmoore/MCTX3420.git
Jeremy Tan [Thu, 5 Sep 2013 13:18:38 +0000 (21:18 +0800)]
Merge branch 'master' of https://github.com/szmoore/MCTX3420.git

11 years agoChange @purpose to @brief (Doxygen warning) and work on unit tests
Jeremy Tan [Thu, 5 Sep 2013 13:18:32 +0000 (21:18 +0800)]
Change @purpose to @brief (Doxygen warning) and work on unit tests

11 years agoAutomatic commit of irc logs
Sam Moore [Wed, 4 Sep 2013 17:00:06 +0000 (01:00 +0800)]
Automatic commit of irc logs

11 years agoMerge branch 'master' of https://github.com/szmoore/MCTX3420.git
Jeremy Tan [Wed, 4 Sep 2013 12:05:08 +0000 (20:05 +0800)]
Merge branch 'master' of https://github.com/szmoore/MCTX3420.git

11 years agoFix segfault and bounds checking on sensor queries
Jeremy Tan [Wed, 4 Sep 2013 12:04:41 +0000 (20:04 +0800)]
Fix segfault and bounds checking on sensor queries

11 years agoAutomatic commit of irc logs
Sam Moore [Tue, 3 Sep 2013 17:00:08 +0000 (01:00 +0800)]
Automatic commit of irc logs

11 years agoAutomatic commit of irc logs
Sam Moore [Mon, 2 Sep 2013 17:00:06 +0000 (01:00 +0800)]
Automatic commit of irc logs

11 years agoAdd control to GUI
Sam Moore [Mon, 2 Sep 2013 11:51:40 +0000 (19:51 +0800)]
Add control to GUI

11 years agoMerge branch 'master' of https://github.com/szmoore/MCTX3420.git
Jeremy Tan [Mon, 2 Sep 2013 05:18:21 +0000 (13:18 +0800)]
Merge branch 'master' of https://github.com/szmoore/MCTX3420.git

11 years agoAdd log message for any rejected requests
Jeremy Tan [Mon, 2 Sep 2013 05:17:56 +0000 (13:17 +0800)]
Add log message for any rejected requests

11 years agoMerge pull request #25 from jtanx/master
Jeremy Tan [Mon, 2 Sep 2013 03:24:27 +0000 (20:24 -0700)]
Merge pull request #25 from jtanx/master

Update makefile

11 years agoCreate web directory to put web stuff in
Sam Moore [Mon, 2 Sep 2013 11:15:16 +0000 (19:15 +0800)]
Create web directory to put web stuff in

11 years agoMerge branch 'master' of https://github.com/szmoore/MCTX3420.git
Jeremy Tan [Mon, 2 Sep 2013 03:22:52 +0000 (11:22 +0800)]
Merge branch 'master' of https://github.com/szmoore/MCTX3420.git

11 years agoFix makefile
Jeremy Tan [Mon, 2 Sep 2013 03:22:34 +0000 (11:22 +0800)]
Fix makefile

11 years agoMerge pull request #24 from jtanx/master
Jeremy Tan [Mon, 2 Sep 2013 02:54:02 +0000 (19:54 -0700)]
Merge pull request #24 from jtanx/master

Add actuators code

11 years agoFix linkage issues
Jeremy Tan [Mon, 2 Sep 2013 00:58:04 +0000 (08:58 +0800)]
Fix linkage issues

11 years agoMerge branch 'master' of https://github.com/szmoore/MCTX3420.git
Jeremy Tan [Mon, 2 Sep 2013 00:45:52 +0000 (08:45 +0800)]
Merge branch 'master' of https://github.com/szmoore/MCTX3420.git

11 years agoUpdate unit tests.
Jeremy Tan [Mon, 2 Sep 2013 00:45:28 +0000 (08:45 +0800)]
Update unit tests.
Todo: Fix unit tests for access control

11 years agoAutomatic commit of irc logs
Sam Moore [Sun, 1 Sep 2013 17:00:06 +0000 (01:00 +0800)]
Automatic commit of irc logs

11 years agoAdd basic jQuery & flot GUI
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.

11 years agoMerge pull request #23 from Callum-/master
Sam Moore [Sun, 1 Sep 2013 16:01:32 +0000 (09:01 -0700)]
Merge pull request #23 from Callum-/master

stream

11 years agoMerge remote-tracking branch 'upstream/master'
Callum [Sun, 1 Sep 2013 09:55:55 +0000 (17:55 +0800)]
Merge remote-tracking branch 'upstream/master'

11 years agoSimple streaming functionality
Callum [Sun, 1 Sep 2013 09:53:40 +0000 (17:53 +0800)]
Simple streaming functionality

11 years agoAutomatic commit of irc logs
Sam Moore [Sat, 31 Aug 2013 17:00:06 +0000 (01:00 +0800)]
Automatic commit of irc logs

11 years agoAutomatic commit of irc logs
Sam Moore [Fri, 30 Aug 2013 17:00:07 +0000 (01:00 +0800)]
Automatic commit of irc logs

11 years agoChange FCGI_Authorize* to FCGI_*Control. Add actuator test code.
Jeremy Tan [Fri, 30 Aug 2013 10:20:35 +0000 (18:20 +0800)]
Change FCGI_Authorize* to FCGI_*Control. Add actuator test code.

11 years agoMerge branch 'master' of https://github.com/szmoore/MCTX3420.git
Jeremy Tan [Fri, 30 Aug 2013 10:18:30 +0000 (18:18 +0800)]
Merge branch 'master' of https://github.com/szmoore/MCTX3420.git

11 years agoAutomatic commit of irc logs
Sam Moore [Thu, 29 Aug 2013 17:00:10 +0000 (01:00 +0800)]
Automatic commit of irc logs

11 years ago(Restructure) Move controls to separate file.
Jeremy Tan [Thu, 29 Aug 2013 08:13:30 +0000 (16:13 +0800)]
(Restructure) Move controls to separate file.
This should be where actuators stuff goes.

11 years agoMerge branch 'master' of https://github.com/szmoore/MCTX3420.git
Jeremy Tan [Thu, 29 Aug 2013 01:35:29 +0000 (09:35 +0800)]
Merge branch 'master' of https://github.com/szmoore/MCTX3420.git

Conflicts:
irc/log

11 years agoMerge branch 'master' of https://github.com/jtanx/MCTX3420.git
Jeremy Tan [Thu, 29 Aug 2013 01:34:59 +0000 (09:34 +0800)]
Merge branch 'master' of https://github.com/jtanx/MCTX3420.git

Conflicts:
testing/qunit/unit-tests.js

11 years agoSwitch back to HTTP status codes for fastcgi + update unit tests
Jeremy Tan [Thu, 29 Aug 2013 01:32:35 +0000 (09:32 +0800)]
Switch back to HTTP status codes for fastcgi + update unit tests

11 years agoSwitch back to HTTP status codes for fastcgi + update unit tests
Jeremy Tan [Thu, 29 Aug 2013 01:28:44 +0000 (09:28 +0800)]
Switch back to HTTP status codes for fastcgi + update unit tests

11 years agoAutomatic commit of irc logs
Sam Moore [Wed, 28 Aug 2013 17:00:05 +0000 (01:00 +0800)]
Automatic commit of irc logs

11 years agoAutomatic commit of irc logs
Sam Moore [Tue, 27 Aug 2013 17:00:10 +0000 (01:00 +0800)]
Automatic commit of irc logs

11 years agoBegin unit tests
Jeremy Tan [Wed, 28 Aug 2013 09:35:02 +0000 (17:35 +0800)]
Begin unit tests

11 years agoAutomatic commit of irc logs
Sam Moore [Tue, 27 Aug 2013 17:00:10 +0000 (01:00 +0800)]
Automatic commit of irc logs

11 years agoMerge branch 'master' of https://github.com/szmoore/MCTX3420.git
Jeremy Tan [Tue, 27 Aug 2013 13:04:43 +0000 (21:04 +0800)]
Merge branch 'master' of https://github.com/szmoore/MCTX3420.git

11 years agoAdd extern for JSONBool to header
Jeremy Tan [Tue, 27 Aug 2013 13:03:30 +0000 (21:03 +0800)]
Add extern for JSONBool to header

11 years agoMerge pull request #21 from jtanx/master
Jeremy Tan [Tue, 27 Aug 2013 13:01:42 +0000 (06:01 -0700)]
Merge pull request #21 from jtanx/master

Add JSON bool function

11 years agoAdd JSON bool function
Jeremy Tan [Tue, 27 Aug 2013 13:00:30 +0000 (21:00 +0800)]
Add JSON bool function

11 years agoMerge pull request #20 from jtanx/master
Sam Moore [Tue, 27 Aug 2013 12:31:20 +0000 (05:31 -0700)]
Merge pull request #20 from jtanx/master

Update nginx configs and makefile libs

11 years agoMove nginx configs and update makefile (crypto lib)
Jeremy Tan [Tue, 27 Aug 2013 11:44:20 +0000 (19:44 +0800)]
Move nginx configs and update makefile (crypto lib)

11 years agoMerge branch 'master' of https://github.com/szmoore/MCTX3420.git
Jeremy Tan [Tue, 27 Aug 2013 11:26:10 +0000 (19:26 +0800)]
Merge branch 'master' of https://github.com/szmoore/MCTX3420.git

11 years agoAutomatic commit of irc logs
Sam Moore [Mon, 26 Aug 2013 17:00:09 +0000 (01:00 +0800)]
Automatic commit of irc logs

11 years agoGet threads to deal with exit conditions, create timestamps
Sam Moore [Mon, 26 Aug 2013 05:43:21 +0000 (13:43 +0800)]
Get threads to deal with exit conditions, create timestamps

11 years agoMerge branch 'master' of https://github.com/szmoore/MCTX3420.git
Jeremy Tan [Mon, 26 Aug 2013 05:38:15 +0000 (13:38 +0800)]
Merge branch 'master' of https://github.com/szmoore/MCTX3420.git

11 years agoMerge pull request #18 from justinjessada/master
Sam Moore [Mon, 26 Aug 2013 03:05:58 +0000 (20:05 -0700)]
Merge pull request #18 from justinjessada/master

Added code samples for Beaglebone sensors

11 years agoMerge pull request #19 from Callum-/master
Callum [Sun, 25 Aug 2013 08:19:36 +0000 (01:19 -0700)]
Merge pull request #19 from Callum-/master

camera

11 years agoDelete .capture.c.swp
Callum [Sun, 25 Aug 2013 08:18:15 +0000 (16:18 +0800)]
Delete .capture.c.swp

11 years agofunction for takingand saving images
Callum [Sun, 25 Aug 2013 08:14:23 +0000 (16:14 +0800)]
function for takingand saving images

11 years agoAutomatic commit of irc logs
Sam Moore [Sat, 24 Aug 2013 17:00:07 +0000 (01:00 +0800)]
Automatic commit of irc logs

11 years agoMerge remote-tracking branch 'upstream/master'
Justin Kruger [Sat, 24 Aug 2013 09:00:56 +0000 (17:00 +0800)]
Merge remote-tracking branch 'upstream/master'

11 years agoSensors code
Justin Kruger [Sat, 24 Aug 2013 08:52:21 +0000 (16:52 +0800)]
Sensors code

Added some sensors code examples and notes for Beaglebone hardware

11 years agoAutomatic commit of irc logs
Sam Moore [Fri, 23 Aug 2013 17:00:07 +0000 (01:00 +0800)]
Automatic commit of irc logs

11 years agoAutomatic commit of irc logs
Sam Moore [Thu, 22 Aug 2013 17:00:09 +0000 (01:00 +0800)]
Automatic commit of irc logs

11 years agoAutomatic commit of irc logs
Sam Moore [Wed, 21 Aug 2013 17:00:06 +0000 (01:00 +0800)]
Automatic commit of irc logs

11 years agoFix params field for reject message
Jeremy Tan [Wed, 21 Aug 2013 14:10:40 +0000 (22:10 +0800)]
Fix params field for reject message

11 years agoMerge pull request #16 from jtanx/master
Sam Moore [Wed, 21 Aug 2013 02:55:20 +0000 (19:55 -0700)]
Merge pull request #16 from jtanx/master

Update FastCGI code and restructure headers a bit

11 years agoAutomatic commit of irc logs
Sam Moore [Tue, 20 Aug 2013 17:00:09 +0000 (01:00 +0800)]
Automatic commit of irc logs

11 years agoAdd code to test authorization scheme
Jeremy Tan [Tue, 20 Aug 2013 12:22:37 +0000 (20:22 +0800)]
Add code to test authorization scheme

11 years agoUpdate FastCGI code and restructure includes a bit
Jeremy Tan [Tue, 20 Aug 2013 12:01:20 +0000 (20:01 +0800)]
Update FastCGI code and restructure includes a bit

11 years agoMerge branch 'master' of https://github.com/szmoore/MCTX3420.git
Jeremy Tan [Tue, 20 Aug 2013 08:55:49 +0000 (16:55 +0800)]
Merge branch 'master' of https://github.com/szmoore/MCTX3420.git

11 years agoUpdate FCGI JSON methods
Jeremy Tan [Tue, 20 Aug 2013 08:55:16 +0000 (16:55 +0800)]
Update FCGI JSON methods

11 years agoAutomatic commit of irc logs
Sam Moore [Mon, 19 Aug 2013 17:00:09 +0000 (01:00 +0800)]
Automatic commit of irc logs

11 years agoFix SensorHandler while loop
Sam Moore [Mon, 19 Aug 2013 13:19:47 +0000 (21:19 +0800)]
Fix SensorHandler while loop

do while causes undefined behaviour when params string is empty

11 years agoPut FastCGI code into server framework
Sam Moore [Mon, 19 Aug 2013 12:56:33 +0000 (20:56 +0800)]
Put FastCGI code into server framework

Implement basic SensorHandler function.
Can now get data from (simulated still) sensor displayed in web browser.

SensorHandler deals with argument checking, identifies the sensor,
sends the JSON, etc, calls Sensor_Query appropriately.

Sensor_Query actually fills a buffer with requested number of data points.

Example of use:
http://server.address/api/sensor?id=0

Use run.sh to start fastcgi server under valgrind.

11 years agoMerge pull request #15 from jtanx/master
Sam Moore [Mon, 19 Aug 2013 06:42:58 +0000 (23:42 -0700)]
Merge pull request #15 from jtanx/master

Update FastCGI Test code

11 years agoAdd data performance tests, revise block diagram, add pthread_mutex_init
Sam Moore [Mon, 19 Aug 2013 04:27:52 +0000 (12:27 +0800)]
Add data performance tests, revise block diagram, add pthread_mutex_init

11 years agoMerge branch 'master' of https://github.com/szmoore/MCTX3420.git
Jeremy Tan [Mon, 19 Aug 2013 02:07:01 +0000 (10:07 +0800)]
Merge branch 'master' of https://github.com/szmoore/MCTX3420.git

11 years agoAutomatic commit of irc logs
Sam Moore [Sun, 18 Aug 2013 17:00:09 +0000 (01:00 +0800)]
Automatic commit of irc logs

11 years agoProject Management Stuff
Sam Moore [Sun, 18 Aug 2013 13:22:06 +0000 (21:22 +0800)]
Project Management Stuff

Blergh.

- List of tasks fairly complete (?)
- Timeline fairly not started at all

Done in ProjectLibre but exported to Microsoft Project Format so other people can edit it.

11 years agoChange sensor data transfer
Sam Moore [Sun, 18 Aug 2013 13:11:37 +0000 (21:11 +0800)]
Change sensor data transfer

 - Keep binary file always open (mode "a+b"); don't need to reopen each time it is accessed
 - Fill query buffer with most recent datapoints (as opposed to trying to transfer datapoints in sequential order)
   - Better because it keeps client as up to date as possible
   - Rather than client getting increasingly outdated data

TODO:
 - Test to see if buffers in front of writing to file worth it
   - Probably will be; saves from having to unlock mutex on every single data point
 - Merge Query and FCGI stuff

11 years agoAdd test main and update nginx config to have HTTP basic auth for api/login
Jeremy Tan [Sun, 18 Aug 2013 12:44:25 +0000 (20:44 +0800)]
Add test main and update nginx config to have HTTP basic auth for api/login

11 years agoMerge pull request #14 from jtanx/master
Sam Moore [Sun, 18 Aug 2013 09:54:56 +0000 (02:54 -0700)]
Merge pull request #14 from jtanx/master

Update fastcgi test code

11 years agoMerge branch 'master' of https://github.com/jtanx/MCTX3420.git
Jeremy Tan [Sun, 18 Aug 2013 03:25:11 +0000 (11:25 +0800)]
Merge branch 'master' of https://github.com/jtanx/MCTX3420.git

11 years agoUpdate nginx configs
Jeremy Tan [Sun, 18 Aug 2013 03:22:47 +0000 (11:22 +0800)]
Update nginx configs

11 years agoUpdate nginx configs
Jeremy Tan [Sun, 18 Aug 2013 03:16:03 +0000 (11:16 +0800)]
Update nginx configs

11 years agoMerge branch 'master' of https://github.com/szmoore/MCTX3420.git
Jeremy Tan [Sun, 18 Aug 2013 03:11:06 +0000 (11:11 +0800)]
Merge branch 'master' of https://github.com/szmoore/MCTX3420.git

11 years agoUpdate fastcgi testcode and add hashed password test code
Jeremy Tan [Sun, 18 Aug 2013 03:10:54 +0000 (11:10 +0800)]
Update fastcgi testcode and add hashed password test code

11 years agoAutomatic commit of irc logs
Sam Moore [Sat, 17 Aug 2013 17:00:08 +0000 (01:00 +0800)]
Automatic commit of irc logs

11 years agoMerge branch 'master' of https://github.com/szmoore/MCTX3420.git
Jeremy Tan [Sat, 17 Aug 2013 05:17:29 +0000 (13:17 +0800)]
Merge branch 'master' of https://github.com/szmoore/MCTX3420.git

11 years agoUpdated gitignore
Jeremy Tan [Sat, 17 Aug 2013 05:17:23 +0000 (13:17 +0800)]
Updated gitignore

11 years agoAutomatic commit of irc logs
Sam Moore [Fri, 16 Aug 2013 17:00:08 +0000 (01:00 +0800)]
Automatic commit of irc logs

11 years agoMerge branch 'master' of https://github.com/szmoore/MCTX3420.git
Jeremy Tan [Fri, 16 Aug 2013 12:22:00 +0000 (20:22 +0800)]
Merge branch 'master' of https://github.com/szmoore/MCTX3420.git

11 years agoMerge pull request #13 from justinjessada/master
Sam Moore [Fri, 16 Aug 2013 11:15:47 +0000 (04:15 -0700)]
Merge pull request #13 from justinjessada/master

Added software safety summary & checklist

11 years agoSafety notes updated
Justin Kruger [Fri, 16 Aug 2013 08:48:06 +0000 (16:48 +0800)]
Safety notes updated

Fairly general, more specific aspects can be considered by the people
working on that system

11 years agoMerge remote-tracking branch 'upstream/master'
Justin Kruger [Fri, 16 Aug 2013 08:46:41 +0000 (16:46 +0800)]
Merge remote-tracking branch 'upstream/master'

UCC git Repository :: git.ucc.asn.au