matches/MCTX3420.git
11 years agoMerge branch 'master' of https://github.com/jtanx/MCTX3420.git
Jeremy Tan [Sat, 28 Sep 2013 05:31:53 +0000 (13:31 +0800)]
Merge branch 'master' of https://github.com/jtanx/MCTX3420.git

11 years agocrappy hacks to disable pin code on x86 platforms while silencing gcc
Jeremy Tan [Fri, 27 Sep 2013 13:52:04 +0000 (21:52 +0800)]
crappy hacks to disable pin code on x86 platforms while silencing gcc

11 years agocrappy hacks to disable pin code on x86 platforms while silencing gcc
Jeremy Tan [Fri, 27 Sep 2013 13:52:04 +0000 (21:52 +0800)]
crappy hacks to disable pin code on x86 platforms while silencing gcc

11 years agofailing to test before committing :3
Jeremy Tan [Fri, 27 Sep 2013 12:08:59 +0000 (20:08 +0800)]
failing to test before committing :3

11 years agofailing to test before committing :3
Jeremy Tan [Fri, 27 Sep 2013 12:08:59 +0000 (20:08 +0800)]
failing to test before committing :3

11 years agoname derp
Jeremy Tan [Fri, 27 Sep 2013 11:47:30 +0000 (19:47 +0800)]
name derp

11 years agoname derp
Jeremy Tan [Fri, 27 Sep 2013 11:47:30 +0000 (19:47 +0800)]
name derp

11 years agoMerge branch 'master' of https://github.com/szmoore/MCTX3420.git
Jeremy Tan [Fri, 27 Sep 2013 11:39:23 +0000 (19:39 +0800)]
Merge branch 'master' of https://github.com/szmoore/MCTX3420.git

11 years agoMerge branch 'master' of https://github.com/szmoore/MCTX3420.git
Jeremy Tan [Fri, 27 Sep 2013 11:39:23 +0000 (19:39 +0800)]
Merge branch 'master' of https://github.com/szmoore/MCTX3420.git

11 years agoUpdate luts (remove GPIO 117, which was marked as reserved)
Jeremy Tan [Fri, 27 Sep 2013 11:38:41 +0000 (19:38 +0800)]
Update luts (remove GPIO 117, which was marked as reserved)

11 years agoUpdate luts (remove GPIO 117, which was marked as reserved)
Jeremy Tan [Fri, 27 Sep 2013 11:38:41 +0000 (19:38 +0800)]
Update luts (remove GPIO 117, which was marked as reserved)

11 years agoMerge pull request #43 from jtanx/master
Jeremy Tan [Fri, 27 Sep 2013 11:08:31 +0000 (04:08 -0700)]
Merge pull request #43 from jtanx/master

Fixes and stuff for pin control

11 years agoMerge pull request #43 from jtanx/master
Jeremy Tan [Fri, 27 Sep 2013 11:08:31 +0000 (04:08 -0700)]
Merge pull request #43 from jtanx/master

Fixes and stuff for pin control

11 years agoMade pinout diagrams
Jeremy Tan [Fri, 27 Sep 2013 10:59:22 +0000 (18:59 +0800)]
Made pinout diagrams

11 years agoMade pinout diagrams
Jeremy Tan [Fri, 27 Sep 2013 10:59:22 +0000 (18:59 +0800)]
Made pinout diagrams

11 years agoSmall fixes + add ability to un/export pins from pin_test
Jeremy Tan [Fri, 27 Sep 2013 08:58:37 +0000 (16:58 +0800)]
Small fixes + add ability to un/export pins from pin_test

11 years agoSmall fixes + add ability to un/export pins from pin_test
Jeremy Tan [Fri, 27 Sep 2013 08:58:37 +0000 (16:58 +0800)]
Small fixes + add ability to un/export pins from pin_test

11 years agoFix minor typo
Jeremy Tan [Fri, 27 Sep 2013 06:47:51 +0000 (14:47 +0800)]
Fix minor typo

11 years agoFix minor typo
Jeremy Tan [Fri, 27 Sep 2013 06:47:51 +0000 (14:47 +0800)]
Fix minor typo

11 years ago(Almost done) pin refactoring
Jeremy Tan [Fri, 27 Sep 2013 06:41:48 +0000 (14:41 +0800)]
(Almost done) pin refactoring

11 years ago(Almost done) pin refactoring
Jeremy Tan [Fri, 27 Sep 2013 06:41:48 +0000 (14:41 +0800)]
(Almost done) pin refactoring

11 years agoInterops with non-BBB platforms
Jeremy Tan [Fri, 27 Sep 2013 01:17:37 +0000 (09:17 +0800)]
Interops with non-BBB platforms

11 years agoInterops with non-BBB platforms
Jeremy Tan [Fri, 27 Sep 2013 01:17:37 +0000 (09:17 +0800)]
Interops with non-BBB platforms

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

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

11 years agosemifix. PWM stuff mostly works. ADC should work.
Jeremy Tan [Thu, 26 Sep 2013 15:06:29 +0000 (23:06 +0800)]
semifix. PWM stuff mostly works. ADC should work.

CLEANUP NECESSARY

11 years agosemifix. PWM stuff mostly works. ADC should work.
Jeremy Tan [Thu, 26 Sep 2013 15:06:29 +0000 (23:06 +0800)]
semifix. PWM stuff mostly works. ADC should work.

CLEANUP NECESSARY

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

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

11 years agosemi update lut stuff
Jeremy Tan [Wed, 25 Sep 2013 13:22:14 +0000 (21:22 +0800)]
semi update lut stuff

11 years agosemi update lut stuff
Jeremy Tan [Wed, 25 Sep 2013 13:22:14 +0000 (21:22 +0800)]
semi update lut stuff

11 years agopartial fix to gpio stuff (limit what can be exported)
Jeremy Tan [Wed, 25 Sep 2013 12:50:33 +0000 (20:50 +0800)]
partial fix to gpio stuff (limit what can be exported)

11 years agopartial fix to gpio stuff (limit what can be exported)
Jeremy Tan [Wed, 25 Sep 2013 12:50:33 +0000 (20:50 +0800)]
partial fix to gpio stuff (limit what can be exported)

11 years agoRemove unused files and add week7 & week8 reports
Sam Moore [Wed, 25 Sep 2013 11:52:29 +0000 (19:52 +0800)]
Remove unused files and add week7 & week8 reports

11 years agoRemove unused files and add week7 & week8 reports
Sam Moore [Wed, 25 Sep 2013 11:52:29 +0000 (19:52 +0800)]
Remove unused files and add week7 & week8 reports

11 years agoSemi fix for pwm
Jeremy Tan [Wed, 25 Sep 2013 07:56:02 +0000 (15:56 +0800)]
Semi fix for pwm

11 years agoSemi fix for pwm
Jeremy Tan [Wed, 25 Sep 2013 07:56:02 +0000 (15:56 +0800)]
Semi fix for pwm

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

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

11 years agoMerge pull request #42 from jtanx/master
Jeremy Tan [Tue, 24 Sep 2013 04:46:58 +0000 (21:46 -0700)]
Merge pull request #42 from jtanx/master

Update fastcgi bool type

11 years agoMerge pull request #42 from jtanx/master
Jeremy Tan [Tue, 24 Sep 2013 04:46:58 +0000 (21:46 -0700)]
Merge pull request #42 from jtanx/master

Update fastcgi bool type

11 years agoUpdate fastcgi bool type
Jeremy Tan [Tue, 24 Sep 2013 04:43:40 +0000 (12:43 +0800)]
Update fastcgi bool type

11 years agoUpdate fastcgi bool type
Jeremy Tan [Tue, 24 Sep 2013 04:43:40 +0000 (12:43 +0800)]
Update fastcgi bool type

11 years agoMerge branch 'master' of https://github.com/szmoore/MCTX3420
Sam Moore [Mon, 23 Sep 2013 20:35:11 +0000 (04:35 +0800)]
Merge branch 'master' of https://github.com/szmoore/MCTX3420

Always with the merge.

11 years agoMerge branch 'master' of https://github.com/szmoore/MCTX3420
Sam Moore [Mon, 23 Sep 2013 20:35:11 +0000 (04:35 +0800)]
Merge branch 'master' of https://github.com/szmoore/MCTX3420

Always with the merge.

11 years agoAdded module for direct control over pins
Sam Moore [Mon, 23 Sep 2013 20:27:45 +0000 (04:27 +0800)]
Added module for direct control over pins

Will hopefully be useful for testing purposes.

Usage:

1. GPIO Set
http://192.168.1.10/api/pin?type=gpo&set=S&num=N
 - S is 0 or 1 and N is the pin number (1 to 96)

2. GPIO Read
http://192.168.1.10/api/pin?type=gpi&num=N
 - N is pin number

3. ADC Read
http://192.168.1.10/api/pin?type=adc&num=N
 - N is pin number (0 to 7)

4. PWM Set
http://192.168.1.10/api/pin?type=pwm&num=N&set=1&freq=F&duty=D&pol=P
 - F in Hz, D as a multiplier (0 -> 1) P is 0 or 1
 - N is pin number (0 to 7)

5. PWM Stop
http://192.168.1.10/api/pin?type=pwm&num=N&set=0

Pin numbering according to http://beagleboard.org/static/images/cape-headers-pwm.png

PWM pins are numbered as: EHRPWM0A = 0, EHRPWM0B = 1, EHRPWM1A = 2, etc

Module code in pin_test.c and pin_test.h.
Uses functions declared in bbb_pin.h and implemented in bbb_pin.c

Note:
 - Also modified bbb_pin.c functions to not throw Fatal errors
   - Might want to change that back. It seemed like a good idea at 2am.

BUG ALERT:
 - Doing the following:
   http://192.168.1.10/api/pin?type=gpo&num=13&set=0
   Will give a FCGIRejectJSON (invalid Pin number).

11 years agoAdded module for direct control over pins
Sam Moore [Mon, 23 Sep 2013 20:27:45 +0000 (04:27 +0800)]
Added module for direct control over pins

Will hopefully be useful for testing purposes.

Usage:

1. GPIO Set
http://192.168.1.10/api/pin?type=gpo&set=S&num=N
 - S is 0 or 1 and N is the pin number (1 to 96)

2. GPIO Read
http://192.168.1.10/api/pin?type=gpi&num=N
 - N is pin number

3. ADC Read
http://192.168.1.10/api/pin?type=adc&num=N
 - N is pin number (0 to 7)

4. PWM Set
http://192.168.1.10/api/pin?type=pwm&num=N&set=1&freq=F&duty=D&pol=P
 - F in Hz, D as a multiplier (0 -> 1) P is 0 or 1
 - N is pin number (0 to 7)

5. PWM Stop
http://192.168.1.10/api/pin?type=pwm&num=N&set=0

Pin numbering according to http://beagleboard.org/static/images/cape-headers-pwm.png

PWM pins are numbered as: EHRPWM0A = 0, EHRPWM0B = 1, EHRPWM1A = 2, etc

Module code in pin_test.c and pin_test.h.
Uses functions declared in bbb_pin.h and implemented in bbb_pin.c

Note:
 - Also modified bbb_pin.c functions to not throw Fatal errors
   - Might want to change that back. It seemed like a good idea at 2am.

BUG ALERT:
 - Doing the following:
   http://192.168.1.10/api/pin?type=gpo&num=13&set=0
   Will give a FCGIRejectJSON (invalid Pin number).

11 years agoAdded restart functionality to run.sh
Sam Moore [Mon, 23 Sep 2013 17:52:27 +0000 (01:52 +0800)]
Added restart functionality to run.sh

Essentially if there is a non zero (error) exit, it will restart the program.
If it gets a massive number of fatal errors it will eventually give up.

We should do something similar to this.
Perhaps receive a certain number of fatal errors in a time interval to give up?

Perhaps make the software not have Fatal errors :P

Making sure cleanup code is called might be important.

Also we really need the errors to show up in the GUI.

Anyway, this is useful for now because it lets me do things like this:
http://192.168.1.10/api/pin?type=gpo&num=13

To find the non working pins (eg: GPIO13) without restarting the server a billion times.

11 years agoAdded restart functionality to run.sh
Sam Moore [Mon, 23 Sep 2013 17:52:27 +0000 (01:52 +0800)]
Added restart functionality to run.sh

Essentially if there is a non zero (error) exit, it will restart the program.
If it gets a massive number of fatal errors it will eventually give up.

We should do something similar to this.
Perhaps receive a certain number of fatal errors in a time interval to give up?

Perhaps make the software not have Fatal errors :P

Making sure cleanup code is called might be important.

Also we really need the errors to show up in the GUI.

Anyway, this is useful for now because it lets me do things like this:
http://192.168.1.10/api/pin?type=gpo&num=13

To find the non working pins (eg: GPIO13) without restarting the server a billion times.

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

11 years agoAutomatic commit of irc logs
Sam Moore [Mon, 23 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
Sam Moore [Mon, 23 Sep 2013 16:28:35 +0000 (00:28 +0800)]
Merge branch 'master' of https://github.com/szmoore/MCTX3420

There's always a merge.

11 years agoMerge branch 'master' of https://github.com/szmoore/MCTX3420
Sam Moore [Mon, 23 Sep 2013 16:28:35 +0000 (00:28 +0800)]
Merge branch 'master' of https://github.com/szmoore/MCTX3420

There's always a merge.

11 years agoMerge pull request #41 from jtanx/master
Jeremy Tan [Mon, 23 Sep 2013 07:47:32 +0000 (00:47 -0700)]
Merge pull request #41 from jtanx/master

Update gui

11 years agoMerge pull request #41 from jtanx/master
Jeremy Tan [Mon, 23 Sep 2013 07:47:32 +0000 (00:47 -0700)]
Merge pull request #41 from jtanx/master

Update gui

11 years agoUpdate gui
Jeremy Tan [Mon, 23 Sep 2013 07:46:33 +0000 (15:46 +0800)]
Update gui

11 years agoUpdate gui
Jeremy Tan [Mon, 23 Sep 2013 07:46:33 +0000 (15:46 +0800)]
Update gui

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

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

11 years agoWork on test gui
Jeremy Tan [Sun, 22 Sep 2013 13:50:17 +0000 (21:50 +0800)]
Work on test gui

11 years agoWork on test gui
Jeremy Tan [Sun, 22 Sep 2013 13:50:17 +0000 (21:50 +0800)]
Work on test gui

11 years agoIE8 fix (class is keyword and IE8 is not happy)
Jeremy Tan [Sun, 22 Sep 2013 07:37:57 +0000 (15:37 +0800)]
IE8 fix (class is keyword and IE8 is not happy)

11 years agoIE8 fix (class is keyword and IE8 is not happy)
Jeremy Tan [Sun, 22 Sep 2013 07:37:57 +0000 (15:37 +0800)]
IE8 fix (class is keyword and IE8 is not happy)

11 years agoAdd graphs. Currently eats 100% of my cpu...
Jeremy Tan [Sun, 22 Sep 2013 06:19:30 +0000 (14:19 +0800)]
Add graphs. Currently eats 100% of my cpu...

11 years agoAdd graphs. Currently eats 100% of my cpu...
Jeremy Tan [Sun, 22 Sep 2013 06:19:30 +0000 (14:19 +0800)]
Add graphs. Currently eats 100% of my cpu...

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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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.

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