Others/CHIP_IO
1
0
Fork 0
mirror of https://github.com/xtacocorex/CHIP_IO synced 2025-07-20 12:53:22 +00:00
Code Issues Releases Activity

Fixes bugs with creating thread. Forces 0 and 100 duty cycles

Browse Source
This commit is contained in:
Brady L. Hurlburt
2016-05-06 15:13:48 +00:00
parent 9538a4f52b
commit 2f3172568a
1 changed files with 38 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

64
source/c_softpwm.c
View File

@ -41,6 +41,7 @@ SOFTWARE.
#include "c_pwm.h" #include "c_pwm.h"
#include "common.h" #include "common.h"
#include "event_gpio.h" #include "event_gpio.h"
#include "Python.h"
#define KEYLEN 7 #define KEYLEN 7
@ -141,7 +142,7 @@ int softpwm_set_duty_cycle(const char *key, float duty) {;
return 0; return 0;
} }
void* softpwm_thread_toggle(void *key) void *softpwm_thread_toggle(void *key)
{ {
struct softpwm *pwm; struct softpwm *pwm;
unsigned int gpio; unsigned int gpio;
@ -155,13 +156,14 @@ void* softpwm_thread_toggle(void *key)
/* Used to determine if something has /* Used to determine if something has
* has changed * has changed
*/ */
unsigned int freq_local = 0; float freq_local = 0;
unsigned int duty_local = 0; float duty_local = 0;
unsigned int polarity_local = 0; unsigned int polarity_local = 0;
bool stop_flag_local = false; bool stop_flag_local = false;
bool enabled_local = false; bool enabled_local = false;
bool recalculate_timing = false; bool recalculate_timing = false;
get_gpio_number(key, &gpio); get_gpio_number(key, &gpio);
pwm = lookup_exported_pwm((char*)key); pwm = lookup_exported_pwm((char*)key);
@ -194,24 +196,38 @@ void* softpwm_thread_toggle(void *key)
if (enabled_local) if (enabled_local)
{ {
/* Set gpio */
if (polarity_local) /* Force 0 duty cycle to be 0 */
gpio_set_value(gpio, HIGH); if (duty_local != 0)
else {
gpio_set_value(gpio, LOW); /* Set gpio */
if (polarity_local)
gpio_set_value(gpio, HIGH);
else
gpio_set_value(gpio, LOW);
}
nanosleep(&tim_on, NULL); nanosleep(&tim_on, NULL);
/* Unset gpio */ /* Force 100 duty cycle to be 100 */
if (polarity_local) if (duty_local != 100)
gpio_set_value(gpio, LOW); {
else /* Unset gpio */
gpio_set_value(gpio, HIGH); if (polarity_local)
gpio_set_value(gpio, LOW);
else
gpio_set_value(gpio, HIGH);
}
nanosleep(&tim_off, NULL); nanosleep(&tim_off, NULL);
} }
} }
if (polarity_local)
gpio_set_value(gpio, LOW);
else
gpio_set_value(gpio, HIGH);
/* This pwm has been disabled */ /* This pwm has been disabled */
pthread_exit(NULL); pthread_exit(NULL);
} }
@ -219,7 +235,7 @@ void* softpwm_thread_toggle(void *key)
int softpwm_start(const char *key, float duty, float freq, int polarity) int softpwm_start(const char *key, float duty, float freq, int polarity)
{ {
struct softpwm *new_pwm, *pwm; struct softpwm *new_pwm, *pwm;
pthread_t *new_thread; pthread_t new_thread;
pthread_mutex_t *new_params_lock; pthread_mutex_t *new_params_lock;
unsigned int gpio; unsigned int gpio;
int ret; int ret;
@ -233,7 +249,6 @@ int softpwm_start(const char *key, float duty, float freq, int polarity)
if (new_pwm == 0) { if (new_pwm == 0) {
return -1; // out of memory return -1; // out of memory
} }
new_params_lock = (pthread_mutex_t *)malloc(sizeof(pthread_mutex_t)); new_params_lock = (pthread_mutex_t *)malloc(sizeof(pthread_mutex_t));
if (new_pwm == 0) { if (new_pwm == 0) {
return -1; // out of memory return -1; // out of memory
@ -259,17 +274,18 @@ int softpwm_start(const char *key, float duty, float freq, int polarity)
pwm->next = new_pwm; pwm->next = new_pwm;
} }
softpwm_set_duty_cycle(key, duty); softpwm_set_duty_cycle(new_pwm->key, duty);
softpwm_set_frequency(key, freq); softpwm_set_frequency(new_pwm->key, freq);
softpwm_set_polarity(key, polarity); softpwm_set_polarity(new_pwm->key, polarity);
// create thread for pwm // create thread for pwm
ret = pthread_create(new_thread, NULL, softpwm_thread_toggle, (void *)key); ret = pthread_create(&new_thread, NULL, softpwm_thread_toggle, (void *)new_pwm->key);
if (ret) { if (ret) {
printf("ERROR; return code from pthread_create() is %d\n", ret); PySys_WriteStderr("DEBUG; soft_pwm ERROR IN pthread_create\n");
exit(-1); exit(-1);
} }
new_pwm->thread = *new_thread;
new_pwm->thread = new_thread;
pthread_mutex_lock(new_params_lock); pthread_mutex_lock(new_params_lock);
new_pwm->params.enabled = true; new_pwm->params.enabled = true;
pthread_mutex_unlock(new_params_lock); pthread_mutex_unlock(new_params_lock);
@ -282,11 +298,6 @@ int softpwm_disable(const char *key)
struct softpwm *pwm, *temp, *prev_pwm = NULL; struct softpwm *pwm, *temp, *prev_pwm = NULL;
unsigned int gpio = 0; unsigned int gpio = 0;
// Disable the PWM
softpwm_set_frequency(key, 0);
softpwm_set_polarity(key, 0);
softpwm_set_duty_cycle(key, 0);
// remove from list // remove from list
pwm = exported_pwms; pwm = exported_pwms;
while (pwm != NULL) while (pwm != NULL)
@ -297,6 +308,7 @@ int softpwm_disable(const char *key)
pwm->params.stop_flag = true; pwm->params.stop_flag = true;
pthread_mutex_unlock(pwm->params_lock); pthread_mutex_unlock(pwm->params_lock);
get_gpio_number(key, &gpio); get_gpio_number(key, &gpio);
gpio_set_value(gpio, LOW);
gpio_unexport(gpio); gpio_unexport(gpio);
if (prev_pwm == NULL) if (prev_pwm == NULL)