From d6dfb232850bda27902c1942a43cabeaf67f3e61 Mon Sep 17 00:00:00 2001 From: Ivica Ico Bukvic <ico@vt.edu> Date: Mon, 17 Mar 2014 22:50:21 -0400 Subject: [PATCH] minor aesthetic fixes --- .../raspberry_pi/disis_gpio/disis_gpio-help.pd | 10 +++++----- l2ork_addons/raspberry_pi/disis_gpio/disis_gpio.c | 6 +++--- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/l2ork_addons/raspberry_pi/disis_gpio/disis_gpio-help.pd b/l2ork_addons/raspberry_pi/disis_gpio/disis_gpio-help.pd index c6c22517a..9cddb6e02 100644 --- a/l2ork_addons/raspberry_pi/disis_gpio/disis_gpio-help.pd +++ b/l2ork_addons/raspberry_pi/disis_gpio/disis_gpio-help.pd @@ -1,4 +1,4 @@ -#N canvas 423 183 801 505 10; +#N canvas 156 188 801 505 10; #X obj 27 349 tgl 15 0 empty empty empty 17 7 0 10 -262144 -1 -1 0 1; #X floatatom 424 448 5 0 0 0 - - -, f 5; @@ -18,15 +18,15 @@ 1; #X msg 89 370 pwm \$1; #X obj 89 349 nbx 5 14 0 1023 0 0 empty empty empty 0 -8 0 10 -262144 --1 -1 426 256 0; +-1 -1 0 256 0; #X text 150 349 pwm range is 0-1023; #X msg 95 68 export 18; #X floatatom 499 448 5 0 0 0 - - -, f 5; -#X text 24 27 1st export the desired pin or use "export" without an +#X text 24 24 1st export the desired pin or use "export" without an argument if you have pin already specified via previous export call or as a creation argument; #X text 24 107 2nd set the direction \, and open the pin; -#X text 24 287 4th either start sending data by sending float 0 or +#X text 24 291 4th either start sending data by sending float 0 or 1 to a regular pin or a 0-1023 range to a pwm (18) pin. If receiving data \, start the metro to get updates through the first outlet. Metro is not needed if only sending data.; @@ -40,7 +40,7 @@ is not needed if only sending data.; #X obj 112 225 tgl 15 0 empty empty empty 17 7 0 10 -262144 -1 -1 0 1; #X msg 112 247 togglesoftpwm \$1; -#X text 24 160 3rd (optional) enable hardware pwm (works only on pin +#X text 24 154 3rd (optional) enable hardware pwm (works only on pin 18) OR software pwm (works on all pins \, including pin 18). The two are mutually exclusive and will toggle each other off automatically and reported in the console (this will not be reflected by toggles diff --git a/l2ork_addons/raspberry_pi/disis_gpio/disis_gpio.c b/l2ork_addons/raspberry_pi/disis_gpio/disis_gpio.c index 432daf50d..6a3ff8d95 100644 --- a/l2ork_addons/raspberry_pi/disis_gpio/disis_gpio.c +++ b/l2ork_addons/raspberry_pi/disis_gpio/disis_gpio.c @@ -42,12 +42,12 @@ typedef struct _params // The softPWM Frequency is derived from the "pulse time" below. Essentially, // the frequency is a function of the range and this pulse time. // The total period will be range * pulse time in uS, so a pulse time -// of 100 and a range of 100 gives a period of 100 * 100 = 10,000 uS -// which is a frequency of 100Hz. +// of 10 and a range of 1000 gives a period of 100 * 100 = 10,000 uS +// which is a frequency of 1000Hz. // // It's possible to get a higher frequency by lowering the pulse time, // however CPU uage will skyrocket as wiringPi uses a hard-loop to time -// periods under 100uS - this is because the Linux timer calls are just +// periods under 10uS - this is because the Linux timer calls are just // accurate at all, and have an overhead. // // Another way to increase the frequency is to reduce the range - however -- GitLab