matches/MCTX3420.git
24 years agoAdded LED control button to test GUI
Debian User [Sat, 1 Jan 2000 00:05:48 +0000 (00:05 +0000)]
Added LED control button to test GUI

11 years agoMerge 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

11 years agoFix ADC sampling
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

11 years agoMerge pull request #40 from jtanx/master
Jeremy Tan [Sun, 22 Sep 2013 00:50:03 +0000 (17:50 -0700)]
Merge pull request #40 from jtanx/master

Various updates

11 years agoMerge 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

11 years agoUpdate 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

11 years agoUpdate test gui stuff
Jeremy Tan [Sun, 22 Sep 2013 00:39:26 +0000 (08:39 +0800)]
Update test gui stuff

11 years agoMerge branch 'fix_hardwarecode'
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???

11 years agoGet BBB pin control working
Sam Moore [Sat, 21 Sep 2013 17:25:22 +0000 (01:25 +0800)]
Get BBB pin control working

Thank god it finally works.

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

11 years agoAdd filename and line number to Log/Fatal functions
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.

11 years agoImage: 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.

11 years agoChange 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

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

11 years agoMake code compile
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.

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

11 years agoAdd test gui
Jeremy Tan [Thu, 19 Sep 2013 06:09:17 +0000 (14:09 +0800)]
Add test gui

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

11 years agoAdded Beaglebone code to sensors.c & actuators.c
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.

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

11 years agoChange 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

11 years agoAutomatic commit of irc logs
Sam Moore [Tue, 17 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 [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

11 years agoNotes from meeting
Sam Moore [Tue, 17 Sep 2013 03:09:11 +0000 (11:09 +0800)]
Notes from meeting

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

11 years agoRemove crap
Debian User [Mon, 16 Sep 2013 06:38:32 +0000 (06:38 +0000)]
Remove crap

11 years agoMake it work on the BBB
Debian User [Mon, 16 Sep 2013 06:31:18 +0000 (06:31 +0000)]
Make it work on the BBB

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

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

11 years agoAmend syslog config (remove need to chmod)
Jeremy Tan [Sun, 15 Sep 2013 14:01:50 +0000 (22:01 +0800)]
Amend syslog config (remove need to chmod)

11 years agoSwitch to syslog for logging messages.
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.

11 years agoMinor mods to control code
Jeremy Tan [Sun, 15 Sep 2013 08:05:31 +0000 (16:05 +0800)]
Minor mods to control code

11 years agoUpdated control stuff
Jeremy Tan [Sun, 15 Sep 2013 06:45:35 +0000 (14:45 +0800)]
Updated control stuff

11 years agoMerge branch 'master' of github:szmoore/MCTX3420 into intertest
Sam Moore [Sun, 15 Sep 2013 05:25:17 +0000 (13:25 +0800)]
Merge branch 'master' of github:szmoore/MCTX3420 into intertest

11 years agoAdd "image" module
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)

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

11 years agoInterferometer Test Program
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.

11 years agoAdd semi working control code
Jeremy Tan [Sat, 14 Sep 2013 07:44:33 +0000 (15:44 +0800)]
Add semi working control code

11 years agoChange times to be relative to this experiment
Jeremy Tan [Sat, 14 Sep 2013 06:15:10 +0000 (14:15 +0800)]
Change times to be relative to this experiment

11 years agoPartial implementation of higher level control functions
Jeremy Tan [Sat, 14 Sep 2013 06:03:27 +0000 (14:03 +0800)]
Partial implementation of higher level control functions

11 years agoManual merge of semi-updated control code
Jeremy Tan [Sat, 14 Sep 2013 03:19:49 +0000 (11:19 +0800)]
Manual merge of semi-updated control code

11 years agoMerge branch 'master' of https://github.com/szmoore/MCTX3420.git
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

11 years agoUse FCGI_INT_T instead of FCGI_LONG_T as appropriate
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)

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

11 years agoCleaned up Beaglebone sensors/actuators/PWM code
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

11 years agoMerge branch 'master' of github:szmoore/MCTX3420
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.

11 years agoAdd Actuator related code
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?

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

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

11 years agoModified 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

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

11 years agomade threshold structure and fixed checkdata
Callum [Fri, 13 Sep 2013 07:03:54 +0000 (15:03 +0800)]
made threshold structure and fixed checkdata

11 years agoMerge branch 'master' of https://github.com/szmoore/MCTX3420.git
Jeremy Tan [Fri, 13 Sep 2013 06:36:57 +0000 (14:36 +0800)]
Merge branch 'master' of https://github.com/szmoore/MCTX3420.git

11 years agoCode cleanup and partial modification to control code
Jeremy Tan [Fri, 13 Sep 2013 06:35:26 +0000 (14:35 +0800)]
Code cleanup and partial modification to control code

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

11 years agoModified sanity check
Callum [Fri, 13 Sep 2013 06:14:20 +0000 (14:14 +0800)]
Modified sanity check

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

11 years agoMerge remote-tracking branch 'upstream/master'
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

11 years agoSome bugfixes for sensor/data code + add FCGI_INT_T
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.

11 years agoMerge branch 'master' of github:szmoore/MCTX3420
Sam Moore [Thu, 12 Sep 2013 17:06:29 +0000 (01:06 +0800)]
Merge branch 'master' of github:szmoore/MCTX3420

Stupid irc logs

11 years agoFix errors in refactored code
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.

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

11 years agoMerge branch 'refactor'
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

11 years agoRefactor Sensor related code; introduce seperate functions for dealing with DataPoints
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

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

11 years agoRevert change made to timestamp placing in JSON responses
Jeremy Tan [Thu, 12 Sep 2013 14:14:08 +0000 (22:14 +0800)]
Revert change made to timestamp placing in JSON responses

11 years agoAdd request parsing helper, add TIMEVAL_* macros, move timestamps to identify module
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

11 years agoincluded analog and digital fail test sensors
Callum [Thu, 12 Sep 2013 13:26:53 +0000 (21:26 +0800)]
included analog and digital fail test sensors

11 years agoGet rid of OpenCV for now
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)

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

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

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

11 years agoMerge branch 'master' of https://github.com/szmoore/MCTX3420.git
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

11 years agoAdd relative times, allow "points" param to work with "start_time"
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?

11 years agoImprove Server API for transferring sensor data
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

11 years agoMerge pull request #30 from Callum-/master
Sam Moore [Mon, 9 Sep 2013 01:34:41 +0000 (18:34 -0700)]
Merge pull request #30 from Callum-/master

safety check

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

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

11 years agoSimple safety check
Callum [Sun, 8 Sep 2013 11:45:06 +0000 (19:45 +0800)]
Simple safety check

11 years agoAdded safety check mechanism (needs some work)
Callum [Sun, 8 Sep 2013 11:43:41 +0000 (19:43 +0800)]
Added safety check mechanism (needs some work)

11 years agoMerge pull request #29 from Callum-/master
Callum [Sun, 8 Sep 2013 09:38:50 +0000 (02:38 -0700)]
Merge pull request #29 from Callum-/master

fixed memory leaks

11 years agoFixed memory leaks
Callum [Sun, 8 Sep 2013 09:36:43 +0000 (17:36 +0800)]
Fixed memory leaks

11 years agoFixed memory leaks
Callum [Sun, 8 Sep 2013 09:33:53 +0000 (17:33 +0800)]
Fixed memory leaks

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

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