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

pwm1 works on the chip pro, commit to allow me to reset all the changes that broke stuff on the normal chip

Browse Source
This commit is contained in:
Robert Wolterman
2017-02-25 12:48:36 -06:00
parent f66740b797
commit c21c431b7b
2 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
source/c_pwm.c
View File

@ -52,6 +52,7 @@ SOFTWARE.
struct pwm_exp struct pwm_exp
{ {
char key[KEYLEN+1]; /* leave room for terminating NUL byte */ char key[KEYLEN+1]; /* leave room for terminating NUL byte */
int iscpro;
int gpio; int gpio;
int initialized; int initialized;
int period_fd; int period_fd;
@ -412,6 +413,10 @@ int pwm_start(const char *key, float duty, float freq, int polarity)
struct pwm_exp *new_pwm, *pwm; struct pwm_exp *new_pwm, *pwm;
int gpio = 0; int gpio = 0;
int initialized = 0; int initialized = 0;
int iscpro = 0;
// Figure out if we are a CPro
iscpro = is_this_chippro();
// Figure out which pin we are // Figure out which pin we are
if (strcmp(key,"U13_18") == 0) { if (strcmp(key,"U13_18") == 0) {
@ -501,6 +506,7 @@ int pwm_start(const char *key, float duty, float freq, int polarity)
strncpy(new_pwm->key, key, KEYLEN); /* can leave string unterminated */ strncpy(new_pwm->key, key, KEYLEN); /* can leave string unterminated */
new_pwm->key[KEYLEN] = '\0'; /* terminate string */ new_pwm->key[KEYLEN] = '\0'; /* terminate string */
new_pwm->gpio = gpio; new_pwm->gpio = gpio;
new_pwm->iscpro = iscpro;
new_pwm->initialized = initialized; new_pwm->initialized = initialized;
new_pwm->period_fd = period_fd; new_pwm->period_fd = period_fd;
new_pwm->duty_fd = duty_fd; new_pwm->duty_fd = duty_fd;
@ -522,7 +528,7 @@ int pwm_start(const char *key, float duty, float freq, int polarity)
int rtnval = 0; int rtnval = 0;
// Always set polarity first // Always set polarity first
if (ISCHIPPRO == 1) { if (iscpro == 1) {
rtnval = pwm_set_polarity(key, polarity); rtnval = pwm_set_polarity(key, polarity);
} }
rtnval = pwm_set_enable(key, ENABLE); rtnval = pwm_set_enable(key, ENABLE);
@ -557,7 +563,7 @@ int pwm_disable(const char *key)
pwm_set_frequency(key, 0); pwm_set_frequency(key, 0);
pwm_set_duty_cycle(key, 0); pwm_set_duty_cycle(key, 0);
pwm_set_enable(key, DISABLE); pwm_set_enable(key, DISABLE);
if (ISCHIPPRO == 1) { if (pwm->iscpro == 1) {
pwm_set_polarity(key, 0); pwm_set_polarity(key, 0);
} }

8
source/py_pwm.c
View File

@ -76,13 +76,11 @@ static int init_module(void)
// python function value = is_chip_pro // python function value = is_chip_pro
static PyObject *py_is_chip_pro(PyObject *self, PyObject *args) static PyObject *py_is_chip_pro(PyObject *self, PyObject *args)
{ {
int is_cpro;
PyObject *py_value; PyObject *py_value;
if (!module_setup) { is_cpro = is_this_chippro();
init_module(); py_value = Py_BuildValue("i", is_cpro);
}
py_value = Py_BuildValue("i", ISCHIPPRO);
return py_value; return py_value;
} }