matches/MCTX3420.git
10 years agoUpdate Titlepage with links to individual sections
Sam Moore [Fri, 1 Nov 2013 04:08:53 +0000 (12:08 +0800)]
Update Titlepage with links to individual sections

10 years agoFix up Image Processing and include figures
Sam Moore [Fri, 1 Nov 2013 03:49:01 +0000 (11:49 +0800)]
Fix up Image Processing and include figures

I think they are right :S

10 years agoMerge branch 'master' of github:szmoore/MCTX3420
Sam Moore [Fri, 1 Nov 2013 03:08:04 +0000 (11:08 +0800)]
Merge branch 'master' of github:szmoore/MCTX3420

Conflicts:
reports/final/chapters/Results.tex

Stupidly I used slightly different label names for the sections than their section names -_-

10 years agoMerge pull request #82 from jtanx/master
Sam Moore [Fri, 1 Nov 2013 03:07:23 +0000 (20:07 -0700)]
Merge pull request #82 from jtanx/master

Minor fixes to the report
.... hopefully this works

10 years agoChanged some things...
Sam Moore [Fri, 1 Nov 2013 03:05:55 +0000 (11:05 +0800)]
Changed some things...

The only thing I can remember is changing the title page... lack of sleep...

10 years agotry to trim it
Jeremy Tan [Fri, 1 Nov 2013 01:40:17 +0000 (09:40 +0800)]
try to trim it

10 years agofix cites that I broke...
Jeremy Tan [Thu, 31 Oct 2013 23:34:56 +0000 (07:34 +0800)]
fix cites that I broke...

10 years agoSpell check!!!!!
Jeremy Tan [Thu, 31 Oct 2013 23:34:56 +0000 (07:34 +0800)]
Spell check!!!!!

10 years agoMinor fixes
Jeremy Tan [Thu, 31 Oct 2013 23:34:56 +0000 (07:34 +0800)]
Minor fixes

10 years agoMerge branch 'master' of https://github.com/jtanx/MCTX3420
Jeremy Tan [Thu, 31 Oct 2013 23:00:53 +0000 (07:00 +0800)]
Merge branch 'master' of https://github.com/jtanx/MCTX3420

10 years agoAttempt to get image streaming page back from the dead (untested).
Jeremy Tan [Thu, 31 Oct 2013 22:56:45 +0000 (06:56 +0800)]
Attempt to get image streaming page back from the dead (untested).

10 years agoSome fixes
Jeremy Tan [Thu, 31 Oct 2013 05:28:40 +0000 (13:28 +0800)]
Some fixes

10 years agoUpdate dilatometer.c
Callum [Thu, 31 Oct 2013 22:33:07 +0000 (06:33 +0800)]
Update dilatometer.c

10 years agoMerge branch 'master' of github:szmoore/MCTX3420
Sam Moore [Thu, 31 Oct 2013 21:33:34 +0000 (05:33 +0800)]
Merge branch 'master' of github:szmoore/MCTX3420

10 years agoDraft of Report
Sam Moore [Thu, 31 Oct 2013 21:32:57 +0000 (05:32 +0800)]
Draft of Report

... It's too big :S

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

10 years agoWork on report
Sam Moore [Thu, 31 Oct 2013 10:17:31 +0000 (18:17 +0800)]
Work on report

Include Justin's section (all of Introduction)

10 years agoSome fixes
Jeremy Tan [Thu, 31 Oct 2013 05:28:40 +0000 (13:28 +0800)]
Some fixes

10 years agoAutomatic commit of irc logs
Sam Moore [Wed, 30 Oct 2013 17:00:14 +0000 (01:00 +0800)]
Automatic commit of irc logs

10 years agoswitch to fixed passwords (based on month/year)
Jeremy Tan [Tue, 29 Oct 2013 06:12:29 +0000 (14:12 +0800)]
switch to fixed passwords (based on month/year)
hey, adrian wanted it

10 years agoMerge branch 'master' of https://github.com/szmoore/MCTX3420
Jeremy Tan [Wed, 30 Oct 2013 14:11:49 +0000 (22:11 +0800)]
Merge branch 'master' of https://github.com/szmoore/MCTX3420

10 years agoUpdate dilatometer.h
Callum [Wed, 30 Oct 2013 13:09:14 +0000 (21:09 +0800)]
Update dilatometer.h

10 years agoUpdate report, add stuff on OS and PWM
Jeremy Tan [Wed, 30 Oct 2013 12:32:42 +0000 (20:32 +0800)]
Update report, add stuff on OS and PWM

10 years agoAdd usleep to strain.c just in case...
Sam Moore [Wed, 30 Oct 2013 04:49:09 +0000 (12:49 +0800)]
Add usleep to strain.c just in case...

Irrational fear of mutexes failing...

10 years agoFix dilatometer, other misc stuff
Sam Moore [Wed, 30 Oct 2013 04:39:58 +0000 (12:39 +0800)]
Fix dilatometer, other misc stuff

Camera_GetImage needs to modify IplImage* not CvMat*
Other bug fixes.

10 years agoadd fclose to shadow login
Jeremy Tan [Wed, 30 Oct 2013 01:22:57 +0000 (09:22 +0800)]
add fclose to shadow login

10 years agoUpdate dilatometer.c
Callum [Tue, 29 Oct 2013 18:29:56 +0000 (02:29 +0800)]
Update dilatometer.c

10 years agoMerge pull request #73 from Callum-/dilatometer
Callum [Tue, 29 Oct 2013 18:29:40 +0000 (11:29 -0700)]
Merge pull request #73 from Callum-/dilatometer

got some more test images from earlier iterations

10 years agogot some more test images from earlier iterations
Callum [Tue, 29 Oct 2013 18:13:07 +0000 (02:13 +0800)]
got some more test images from earlier iterations

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

10 years agoMerge pull request #72 from Callum-/dilatometer
Callum [Tue, 29 Oct 2013 16:55:41 +0000 (09:55 -0700)]
Merge pull request #72 from Callum-/dilatometer

Added a dilatometer "sensor"

10 years agoAdded a dilatometer "sensor"
Callum [Tue, 29 Oct 2013 16:45:28 +0000 (00:45 +0800)]
Added a dilatometer "sensor"

10 years agoUpdate dilatometer.h
Callum [Tue, 29 Oct 2013 16:27:27 +0000 (00:27 +0800)]
Update dilatometer.h

10 years agoMerge pull request #71 from Callum-/dilatometer
Callum [Tue, 29 Oct 2013 15:59:27 +0000 (08:59 -0700)]
Merge pull request #71 from Callum-/dilatometer

changed some variables to defines

10 years agochanged some variables to defines
Callum [Tue, 29 Oct 2013 15:57:57 +0000 (23:57 +0800)]
changed some variables to defines

10 years agoMerge pull request #70 from Callum-/dilatometer
Callum [Tue, 29 Oct 2013 15:06:04 +0000 (08:06 -0700)]
Merge pull request #70 from Callum-/dilatometer

Dilatometer

10 years agomodified image.c
Callum [Tue, 29 Oct 2013 15:04:38 +0000 (23:04 +0800)]
modified image.c

10 years agoChanged capture initilisation
Callum [Tue, 29 Oct 2013 15:02:46 +0000 (23:02 +0800)]
Changed capture initilisation

10 years agoreport changes. longer!?!?!
Jeremy Tan [Tue, 29 Oct 2013 14:35:49 +0000 (22:35 +0800)]
report changes. longer!?!?!

10 years agoDelete test_edge.jpg
Callum [Tue, 29 Oct 2013 14:26:42 +0000 (22:26 +0800)]
Delete test_edge.jpg

moved

10 years agoDelete testimage.jpg
Callum [Tue, 29 Oct 2013 14:26:38 +0000 (22:26 +0800)]
Delete testimage.jpg

moved

10 years agoDelete test_edge_avg.jpg
Callum [Tue, 29 Oct 2013 14:26:33 +0000 (22:26 +0800)]
Delete test_edge_avg.jpg

moved

10 years agoDelete test_blurred.jpg
Callum [Tue, 29 Oct 2013 14:26:15 +0000 (22:26 +0800)]
Delete test_blurred.jpg

moved

10 years agoMerge pull request #69 from Callum-/dilatometer
Callum [Tue, 29 Oct 2013 13:43:47 +0000 (06:43 -0700)]
Merge pull request #69 from Callum-/dilatometer

Done a bunch of changes to image handling

10 years agoDone a bunch of changes to image handling
Callum [Tue, 29 Oct 2013 13:14:02 +0000 (21:14 +0800)]
Done a bunch of changes to image handling

10 years agoMerge branch 'master' of https://github.com/szmoore/MCTX3420
Jeremy Tan [Tue, 29 Oct 2013 07:03:27 +0000 (15:03 +0800)]
Merge branch 'master' of https://github.com/szmoore/MCTX3420

10 years agoAdd dilatometer as sensor
Sam Moore [Tue, 29 Oct 2013 04:56:41 +0000 (12:56 +0800)]
Add dilatometer as sensor

Changed type of functions as needed and called Sensor_Add appropriately.

10 years agowriteup
Jeremy Tan [Tue, 29 Oct 2013 06:58:59 +0000 (14:58 +0800)]
writeup

10 years agoAdd dilatometer as sensor
Sam Moore [Tue, 29 Oct 2013 04:56:41 +0000 (12:56 +0800)]
Add dilatometer as sensor

Changed type of functions as needed and called Sensor_Add appropriately.

10 years agoAutomatic commit of irc logs
Sam Moore [Mon, 28 Oct 2013 17:00:14 +0000 (01:00 +0800)]
Automatic commit of irc logs

10 years agoMerge pull request #68 from Callum-/dilatometer
Callum [Mon, 28 Oct 2013 15:09:04 +0000 (08:09 -0700)]
Merge pull request #68 from Callum-/dilatometer

Finished Dilatometer

10 years agoWrote code to implement camera
Callum [Mon, 28 Oct 2013 14:59:58 +0000 (22:59 +0800)]
Wrote code to implement camera

10 years agoMerge remote-tracking branch 'upstream/master' into dilatometer
Callum [Mon, 28 Oct 2013 14:58:26 +0000 (22:58 +0800)]
Merge remote-tracking branch 'upstream/master' into dilatometer

10 years agocomment
Callum [Mon, 28 Oct 2013 14:20:16 +0000 (22:20 +0800)]
comment

10 years agoAdd in change password
Jeremy Tan [Mon, 28 Oct 2013 14:15:13 +0000 (22:15 +0800)]
Add in change password

10 years agouse post for login. how did this get lost?
Jeremy Tan [Mon, 28 Oct 2013 14:04:25 +0000 (22:04 +0800)]
use post for login. how did this get lost?

10 years agoFix some minor compiler issues
Jeremy Tan [Mon, 28 Oct 2013 13:38:48 +0000 (21:38 +0800)]
Fix some minor compiler issues

10 years agoedited dilatometer
Callum [Mon, 28 Oct 2013 13:35:53 +0000 (21:35 +0800)]
edited dilatometer

10 years agoMerge branch 'users'
Jeremy Tan [Mon, 28 Oct 2013 13:21:47 +0000 (21:21 +0800)]
Merge branch 'users'

Conflicts:
server/parameters
Resolved to users branch

10 years agoFix link on login page
Jeremy Tan [Mon, 28 Oct 2013 13:12:38 +0000 (21:12 +0800)]
Fix link on login page

10 years agoremove own static stuff. use what's in place
Jeremy Tan [Mon, 28 Oct 2013 13:10:41 +0000 (21:10 +0800)]
remove own static stuff. use what's in place

10 years agoremove old stuff
Jeremy Tan [Mon, 28 Oct 2013 13:03:55 +0000 (21:03 +0800)]
remove old stuff

10 years agoNicen the rego form and add back the change password form
Jeremy Tan [Mon, 28 Oct 2013 12:59:13 +0000 (20:59 +0800)]
Nicen the rego form and add back the change password form

10 years agoMerge branch 'master' of github:szmoore/MCTX3420 into report
Sam Moore [Mon, 28 Oct 2013 07:48:35 +0000 (15:48 +0800)]
Merge branch 'master' of github:szmoore/MCTX3420 into report

Conflicts:
server/fastcgi.c
server/parameters

Also... calibrated sensors

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

10 years agosegment the admin gui
Jeremy Tan [Sun, 27 Oct 2013 15:19:06 +0000 (23:19 +0800)]
segment the admin gui
it has been segmented

fact:
usercake encourages spaghetti code
awfhauiwfauiwfauwblaaargh

may have to add back:
stuff

mailing won't work without an mta.
running postfix on the bbb...

10 years agoWork on report
Sam Moore [Sun, 27 Oct 2013 08:39:59 +0000 (16:39 +0800)]
Work on report

Blergh

10 years agoMerge branch 'master' of https://github.com/szmoore/MCTX3420
Jeremy Tan [Sun, 27 Oct 2013 07:47:35 +0000 (15:47 +0800)]
Merge branch 'master' of https://github.com/szmoore/MCTX3420

10 years agoDisallow control codes in urldecode
Jeremy Tan [Sun, 27 Oct 2013 07:45:46 +0000 (15:45 +0800)]
Disallow control codes in urldecode

10 years agoAutomatic commit of irc logs
Sam Moore [Sat, 26 Oct 2013 17:00:10 +0000 (01:00 +0800)]
Automatic commit of irc logs

10 years agoMerge pull request #67 from Callum-/master
Callum [Sat, 26 Oct 2013 07:27:13 +0000 (00:27 -0700)]
Merge pull request #67 from Callum-/master

Added some more tests

10 years agoAdded some more tests
Callum [Sat, 26 Oct 2013 07:25:22 +0000 (15:25 +0800)]
Added some more tests

10 years agoMerge pull request #66 from Callum-/master
Callum [Sat, 26 Oct 2013 07:15:58 +0000 (00:15 -0700)]
Merge pull request #66 from Callum-/master

More camera Stuff

10 years agoadded original image
Callum [Sat, 26 Oct 2013 07:13:14 +0000 (15:13 +0800)]
added original image

10 years agotesting images, with line imposed
Callum [Sat, 26 Oct 2013 07:08:54 +0000 (15:08 +0800)]
testing images, with line imposed

10 years agorenamed functions to microscope, redid Read fnctn
Callum [Sat, 26 Oct 2013 06:59:22 +0000 (14:59 +0800)]
renamed functions to microscope, redid Read fnctn

10 years agoMinor changes
Jeremy Tan [Sat, 26 Oct 2013 04:46:20 +0000 (12:46 +0800)]
Minor changes

10 years agoAdd links to the relevant help page for SBD
Jeremy Tan [Sat, 26 Oct 2013 04:02:20 +0000 (12:02 +0800)]
Add links to the relevant help page for SBD

10 years agoMerge branch 'master' of https://github.com/szmoore/MCTX3420.git
Jeremy Tan [Sat, 26 Oct 2013 03:55:58 +0000 (11:55 +0800)]
Merge branch 'master' of https://github.com/szmoore/MCTX3420.git

10 years agoUpdate the block diagram
Jeremy Tan [Sat, 26 Oct 2013 03:55:26 +0000 (11:55 +0800)]
Update the block diagram

10 years agoMerge branch 'master' of https://github.com/szmoore/MCTX3420 into users
Jeremy Tan [Sat, 26 Oct 2013 01:39:56 +0000 (09:39 +0800)]
Merge branch 'master' of https://github.com/szmoore/MCTX3420 into users

Conflicts:
server/fastcgi.c
server/parameters

10 years agoAutomatic commit of irc logs
Sam Moore [Fri, 25 Oct 2013 17:00:06 +0000 (01:00 +0800)]
Automatic commit of irc logs

10 years agoMerge branch 'users' of https://github.com/szmoore/MCTX3420 into users
Jeremy Tan [Fri, 25 Oct 2013 12:51:19 +0000 (20:51 +0800)]
Merge branch 'users' of https://github.com/szmoore/MCTX3420 into users

10 years agomodified version to get control key
Jeremy Tan [Mon, 21 Oct 2013 04:22:50 +0000 (12:22 +0800)]
modified version to get control key

10 years agomanual merge of fastcgi.c
Jeremy Tan [Mon, 21 Oct 2013 03:26:55 +0000 (11:26 +0800)]
manual merge of fastcgi.c

10 years agoAdd gmail chat log
Sam Moore [Sun, 20 Oct 2013 14:00:14 +0000 (22:00 +0800)]
Add gmail chat log

We should just keep using IRC :P

10 years agoBegin modifying UserCake
Sam Moore [Sun, 20 Oct 2013 13:35:12 +0000 (21:35 +0800)]
Begin modifying UserCake

Create admin upload page for uploading / purging users. Incomplete.
Note that this page needs to be secured somehow.

Realised that we probably need to add the UserCake install scripts as well, so we can
customise the database and other things when it is installed.

Modified something in the server too apparently.
I love it when I forget what I actually did...

10 years agoModify FastCGI server to use MySQL for auth
Sam Moore [Sun, 20 Oct 2013 08:36:01 +0000 (16:36 +0800)]
Modify FastCGI server to use MySQL for auth

Made some general improvements to Login_Handler and how the "auth_uri" is dealt with.
Called strsep, but it's not (that) evil since it doesn't do anything I wouldn't have done with boilerplate anyway.

MySQL for auth tested and appears to work. Using SHA6 instead of md5 (!) hashes.

10 years agoAdd UserCake
Sam Moore [Sun, 20 Oct 2013 05:02:54 +0000 (13:02 +0800)]
Add UserCake

We might be able to build on this to make a user management system.

UserCake Version: 2.0.2
http://usercake.com

This commit includes the original UserCake source.
Many files will need to be removed and/or rewritten.

UserCake uses MySQL for storing user information.
There is a C API for interfacing with MySQL. Hopefully that will work.

10 years agomore reporting
Jeremy Tan [Fri, 25 Oct 2013 12:39:20 +0000 (20:39 +0800)]
more reporting

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

10 years agoMore updates to report
Jeremy Tan [Thu, 24 Oct 2013 14:44:48 +0000 (22:44 +0800)]
More updates to report

10 years agoMerge pull request #65 from jtanx/master
Jeremy Tan [Thu, 24 Oct 2013 11:53:01 +0000 (04:53 -0700)]
Merge pull request #65 from jtanx/master

Add POST handling and properly URL Decode GET/POST requests

10 years agofix some gui stuff
Jeremy Tan [Thu, 24 Oct 2013 11:50:50 +0000 (19:50 +0800)]
fix some gui stuff

10 years agoOnly use POST for login, and only if the GET string is empty
Jeremy Tan [Thu, 24 Oct 2013 11:37:32 +0000 (19:37 +0800)]
Only use POST for login, and only if the GET string is empty
Fix 'friendly name' too.

10 years agoMerge branch 'master' of https://github.com/szmoore/MCTX3420.git
Jeremy Tan [Thu, 24 Oct 2013 11:17:51 +0000 (19:17 +0800)]
Merge branch 'master' of https://github.com/szmoore/MCTX3420.git

10 years agoAdd POST handling and URLDecode POST/GET request data. Switch Login to use POST inste...
Jeremy Tan [Thu, 24 Oct 2013 11:17:27 +0000 (19:17 +0800)]
Add POST handling and URLDecode POST/GET request data. Switch Login to use POST instead of GET.

Hopefully this doesn't introduce any new bugs.

10 years agoMerge pull request #64 from justinjessada/master
Sam Moore [Thu, 24 Oct 2013 09:51:07 +0000 (02:51 -0700)]
Merge pull request #64 from justinjessada/master

Modified data page and added some report stuff

10 years agoWork on report
Jeremy Tan [Thu, 24 Oct 2013 06:12:43 +0000 (14:12 +0800)]
Work on report

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

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