Sam Moore [Mon, 19 Aug 2013 04:27:52 +0000 (12:27 +0800)]
Add data performance tests, revise block diagram, add pthread_mutex_init
Jeremy Tan [Mon, 19 Aug 2013 02:07:01 +0000 (10:07 +0800)]
Merge branch 'master' of https://github.com/szmoore/MCTX3420.git
Sam Moore [Sun, 18 Aug 2013 17:00:09 +0000 (01:00 +0800)]
Automatic commit of irc logs
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.
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
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
Sam Moore [Sun, 18 Aug 2013 09:54:56 +0000 (02:54 -0700)]
Merge pull request #14 from jtanx/master
Update fastcgi test code
Jeremy Tan [Sun, 18 Aug 2013 03:25:11 +0000 (11:25 +0800)]
Merge branch 'master' of https://github.com/jtanx/MCTX3420.git
Jeremy Tan [Sun, 18 Aug 2013 03:22:47 +0000 (11:22 +0800)]
Update nginx configs
Jeremy Tan [Sun, 18 Aug 2013 03:16:03 +0000 (11:16 +0800)]
Update nginx configs
Jeremy Tan [Sun, 18 Aug 2013 03:11:06 +0000 (11:11 +0800)]
Merge branch 'master' of https://github.com/szmoore/MCTX3420.git
Jeremy Tan [Sun, 18 Aug 2013 03:10:54 +0000 (11:10 +0800)]
Update fastcgi testcode and add hashed password test code
Sam Moore [Sat, 17 Aug 2013 17:00:08 +0000 (01:00 +0800)]
Automatic commit of irc logs
Jeremy Tan [Sat, 17 Aug 2013 05:17:29 +0000 (13:17 +0800)]
Merge branch 'master' of https://github.com/szmoore/MCTX3420.git
Jeremy Tan [Sat, 17 Aug 2013 05:17:23 +0000 (13:17 +0800)]
Updated gitignore
Sam Moore [Fri, 16 Aug 2013 17:00:08 +0000 (01:00 +0800)]
Automatic commit of irc logs
Jeremy Tan [Fri, 16 Aug 2013 12:22:00 +0000 (20:22 +0800)]
Merge branch 'master' of https://github.com/szmoore/MCTX3420.git
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
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
Justin Kruger [Fri, 16 Aug 2013 08:46:41 +0000 (16:46 +0800)]
Merge remote-tracking branch 'upstream/master'
Jeremy Tan [Fri, 16 Aug 2013 03:38:44 +0000 (11:38 +0800)]
Rework the fcgi code a bit.
Jeremy Tan [Fri, 16 Aug 2013 00:46:40 +0000 (08:46 +0800)]
Merge branch 'master' of https://github.com/szmoore/MCTX3420.git
Sam Moore [Fri, 16 Aug 2013 00:28:37 +0000 (08:28 +0800)]
Fixed binary file access
Really dumb mistakes.
If we can open the file for reading and writing, and remove the need to open/close
in both threads each time it is accessed, the efficiency might be better.
We'd still have to close the file to save changes to disk though,
might be a problem if the program crashes.
Sam Moore [Thu, 15 Aug 2013 17:28:47 +0000 (01:28 +0800)]
Progress on Framework for Server software
We have:
- Threaded stuff for sensors that stores data in a buffer and periodically dumps it to a binary file
- The use of the buffer reduces the number of times the mutex must be acquired (mutex = expensive)
- Will do some tests to see if the buffer improves performance
- Dummy function for querying sensors
- Sensor Handler function (QuerySensor) gets data from binary file, dumps to a buffer and then prints
There is something not quite right; QuerySensor appears to get the most recent dump that the sensor thread made.
eg: In the current version, dumps are made twice as often as queries, so you miss half the data.
Should be able to fix this after more sleep...
Sam Moore [Thu, 15 Aug 2013 17:00:15 +0000 (01:00 +0800)]
Automatic commit of irc logs
Justin Kruger [Thu, 15 Aug 2013 14:11:44 +0000 (22:11 +0800)]
Safety notes summary
Will add more detailed notes & fancy flowchart
Jeremy Tan [Thu, 15 Aug 2013 13:26:47 +0000 (21:26 +0800)]
fix redundant code, add makefile and example webpage
Jeremy Tan [Thu, 15 Aug 2013 13:08:38 +0000 (21:08 +0800)]
Update the fastcgi test code
Justin Kruger [Thu, 15 Aug 2013 12:02:17 +0000 (20:02 +0800)]
Merge remote-tracking branch 'upstream/master'
Sam Moore [Thu, 15 Aug 2013 05:27:12 +0000 (13:27 +0800)]
Merge branch 'master' of https://github.com/jtanx/MCTX3420 into jtanx-master
Conflicts:
server/log.c
server/main.c
Merged in Jeremy's changes to log functions with my changes
to the documentation.
Sam Moore [Thu, 15 Aug 2013 05:09:26 +0000 (13:09 +0800)]
Merge branch 'master' of github:szmoore/MCTX3420
Jeremy Tan [Thu, 15 Aug 2013 01:13:01 +0000 (09:13 +0800)]
Remove SQLite approach
Jeremy Tan [Thu, 15 Aug 2013 01:10:54 +0000 (09:10 +0800)]
Modify logging functions to use inbuilt function naming identifiers
Jeremy Tan [Thu, 15 Aug 2013 00:29:58 +0000 (08:29 +0800)]
Merge branch 'master' of https://github.com/szmoore/MCTX3420.git
Sam Moore [Wed, 14 Aug 2013 17:00:07 +0000 (01:00 +0800)]
Automatic commit of irc logs
Sam Moore [Wed, 14 Aug 2013 15:33:24 +0000 (23:33 +0800)]
Get Doxygen working nicely
Anyone who ends up working on the code can just use doxygen to generate the documentation themselves.
We'll include the generated documentation with the final release.
Document stuff!
Sam Moore [Wed, 14 Aug 2013 15:00:28 +0000 (23:00 +0800)]
Change rpi -> server
Since it might not run on a RPi. Possibly a BeagleBone (?)
Either way, it will be run on something similar to debian GNU/Linux.
Sam Moore [Wed, 14 Aug 2013 10:13:00 +0000 (18:13 +0800)]
Actually make program compile
Whoops
Sam Moore [Wed, 14 Aug 2013 10:04:50 +0000 (18:04 +0800)]
Remove HTTP server, get ready to write basic threaded program
We will use a FastCGI to handle HTTP requests instead of writing a custom HTTP server.
Jeremy Tan [Wed, 14 Aug 2013 08:31:00 +0000 (16:31 +0800)]
Update fastcgi stuff
Jeremy Tan [Wed, 14 Aug 2013 01:03:27 +0000 (09:03 +0800)]
Merge branch 'master' of https://github.com/szmoore/MCTX3420.git
Jeremy Tan [Wed, 14 Aug 2013 01:02:07 +0000 (09:02 +0800)]
Update fastcgi readme
Jeremy Tan [Wed, 14 Aug 2013 00:51:46 +0000 (08:51 +0800)]
Add FastCGI approach
Sam Moore [Tue, 13 Aug 2013 17:00:11 +0000 (01:00 +0800)]
Automatic commit of irc logs
Jeremy Tan [Tue, 13 Aug 2013 12:18:26 +0000 (20:18 +0800)]
add some random code playing with sqlite3 C api
Jeremy Tan [Tue, 13 Aug 2013 11:26:42 +0000 (19:26 +0800)]
Merge branch 'master' of https://github.com/szmoore/MCTX3420.git
Jeremy Tan [Tue, 13 Aug 2013 11:23:30 +0000 (19:23 +0800)]
Add sqlite approach
Sam Moore [Tue, 13 Aug 2013 07:23:11 +0000 (15:23 +0800)]
Changed directory structure, updated READMEs
Create directory "rpi" for anything that runs on the Raspberry Pi.
Sam Moore [Tue, 13 Aug 2013 07:07:00 +0000 (15:07 +0800)]
Delete helloworld.c
Why is this still here?
Sam Moore [Tue, 13 Aug 2013 06:52:43 +0000 (14:52 +0800)]
Merge branch 'master' of github:szmoore/MCTX3420
I keep forgetting; `git pull` before `git commit` avoids these crappy merge things.
Sam Moore [Tue, 13 Aug 2013 06:51:13 +0000 (14:51 +0800)]
Add week 2 reports
(At least, the ones that I have)
Jeremy Tan [Tue, 13 Aug 2013 05:47:04 +0000 (13:47 +0800)]
test pull request
Sam Moore [Mon, 12 Aug 2013 17:00:08 +0000 (01:00 +0800)]
Automatic commit of irc logs
Sam Moore [Sun, 11 Aug 2013 17:00:10 +0000 (01:00 +0800)]
Automatic commit of irc logs
Sam Moore [Thu, 8 Aug 2013 17:00:07 +0000 (01:00 +0800)]
Automatic commit of irc logs
Sam Moore [Wed, 7 Aug 2013 17:00:11 +0000 (01:00 +0800)]
Automatic commit of irc logs
Sam Moore [Wed, 7 Aug 2013 13:02:19 +0000 (21:02 +0800)]
Merge branch 'master' of github:szmoore/MCTX3420
This merge is necessary because I forgot to `git pull` before I did `git commit`
and I didn't have the latest IRC logs. I should stop doing that.
Sam Moore [Wed, 7 Aug 2013 06:26:11 +0000 (14:26 +0800)]
Test webserver with minimalist JavaScript
I'm not sure if we want to use jQuery, but it works for testing.
I think this webserver is a good proof of concept.
I will get it to set or read a GPIO pin on the raspberry pi.
Then I can try the same thing with a CGI script under apache2.
Sam Moore [Tue, 6 Aug 2013 17:00:08 +0000 (01:00 +0800)]
Automatic commit of irc logs
Sam Moore [Tue, 6 Aug 2013 16:49:40 +0000 (00:49 +0800)]
Add necessary HTTP response headers
Apparently chromium is smart enough to not need them, but I'm guessing other browsers do.
Sam Moore [Tue, 6 Aug 2013 16:19:13 +0000 (00:19 +0800)]
More work on webserver test
It can send a text file straight to a client.
Something wierd happens.
If you use chrome to look at a html file, it displays fine.
If you use iceweasel (ie: firefox) to look at the same file, it just shows as plain text.
Using netcat to test, a real webserver just dumps html files the same way.
So what is (not) happening to make iceweasel fail to recognise it as html?
Sam Moore [Tue, 6 Aug 2013 10:55:15 +0000 (18:55 +0800)]
Makefile for webserver test
I always forget the Makefile.
Sam Moore [Tue, 6 Aug 2013 10:53:14 +0000 (18:53 +0800)]
Merge branch 'master' of github:szmoore/MCTX3420
Sam Moore [Tue, 6 Aug 2013 10:50:04 +0000 (18:50 +0800)]
Investigate software for interfacing with hardware via HTTP requests
Investigated CGI scripts. Don't think they are feasable.
Currently investigating custom web server.
Used some existing files from a previous project
(network.h network.c log.h log.c).
I'm making some error in parsing the request, but out of time for now.
Sam Moore [Mon, 5 Aug 2013 17:00:09 +0000 (01:00 +0800)]
Automatic commit of irc logs
Sam Moore [Mon, 5 Aug 2013 14:42:22 +0000 (22:42 +0800)]
Update README
Actually make the README useful.
Sam Moore [Mon, 5 Aug 2013 13:41:33 +0000 (21:41 +0800)]
Add week 1 report
Sam Moore [Mon, 5 Aug 2013 10:52:25 +0000 (03:52 -0700)]
Merge pull request #5 from justinjessada/master
Testing git stuff
Justin Kruger [Mon, 5 Aug 2013 06:52:55 +0000 (14:52 +0800)]
Merge remote-tracking branch 'upstream/master'
Sam Moore [Sun, 4 Aug 2013 17:00:08 +0000 (01:00 +0800)]
Automatic commit of irc logs
Sam Moore [Sun, 4 Aug 2013 16:37:02 +0000 (00:37 +0800)]
Add png version of block diagram
Sam Moore [Sun, 4 Aug 2013 15:37:14 +0000 (23:37 +0800)]
Created high level block diagram of server hardware/software
I think this summarises what we discussed in our first meeting.
I may have gotten carried away.
The other approach suggested was to use some sort of custom hardware,
with a wireless link to a hand held device.
Making this diagram reinforces my belief that we shouldn't do that.
We'd have to implement the same blue stuff as well as all of the green stuff.
Also there would be more red stuff.
That's my technical explanation :P
Sam Moore
Justin Kruger [Sun, 4 Aug 2013 11:41:45 +0000 (19:41 +0800)]
Testing git stuff
Brief notes on sensor types
Sam Moore [Sun, 4 Aug 2013 07:22:20 +0000 (15:22 +0800)]
Update README
Sam Moore [Sun, 4 Aug 2013 06:20:09 +0000 (14:20 +0800)]
Automatic commit of irc logs
Callum- [Sun, 4 Aug 2013 06:07:42 +0000 (23:07 -0700)]
Merge pull request #2 from Callum-/master
testing pull request - callum
Callum- [Sun, 4 Aug 2013 20:56:18 +0000 (13:56 -0700)]
Testing
matchesucc [Sun, 4 Aug 2013 05:30:08 +0000 (22:30 -0700)]
Merge pull request #1 from firefields/master
Update README
firefields [Sun, 4 Aug 2013 05:27:37 +0000 (13:27 +0800)]
Update README
firefields [Sun, 4 Aug 2013 05:10:08 +0000 (13:10 +0800)]
Update README
matchesucc [Sun, 4 Aug 2013 05:08:55 +0000 (13:08 +0800)]
Update README
asdf
firefields [Sun, 4 Aug 2013 05:08:05 +0000 (13:08 +0800)]
Update README
firefields [Sun, 4 Aug 2013 05:00:47 +0000 (13:00 +0800)]
Update 2013-08-01.txt
Changed a 3 to a 4 because the numbering was wrong
matchesucc [Sun, 4 Aug 2013 04:58:51 +0000 (12:58 +0800)]
Create helloworld.c
Testing editing in github
Sam Moore [Sun, 4 Aug 2013 04:36:31 +0000 (12:36 +0800)]
Testing committing to github and git.ucc
Sam Moore [Thu, 1 Aug 2013 11:07:05 +0000 (19:07 +0800)]
Notes on Meeting 1
Sam Moore [Thu, 1 Aug 2013 02:06:32 +0000 (10:06 +0800)]
Initial Commit
UCC git Repository :: git.ucc.asn.au