diff --git a/CHANGELOG.rst b/CHANGELOG.rst index e3a91af..ca70f0f 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -1,3 +1,9 @@ +0.3.3 +---- +* Added Debug printing for all the capabilities with the toggle_debug() function +* Added 2 functions from @streamnsight for PWM that allow for setting the period of the PWM and the Pulse Width, both in nanoseconds +* Fixed the SPI2 overlay stuff by using the NTC overlay instead of mine. + 0.3.2 ---- * Fixing issue #53 to handle the return values of the set functions in pwm_enable. diff --git a/overlays/builder.py b/overlays/builder.py index 8857972..c554591 100644 --- a/overlays/builder.py +++ b/overlays/builder.py @@ -6,7 +6,6 @@ import sys def compile(): print("Compiling DTS Files") - call(["dtc", "-O", "dtb", "-o", "overlays/chip-spi2.dtbo", "-b", "o", "-@", "overlays/chip-spi2.dts"]) call(["dtc", "-O", "dtb", "-o", "overlays/chip-pwm0.dtbo", "-b", "o", "-@", "overlays/chip-pwm0.dts"]) def copy(): @@ -20,5 +19,4 @@ def copy(): for fl in glob.glob(overlay_path+"/chip-*-.dtbo"): os.remove(fl) print("Moving DTBO files to "+overlay_path) - shutil.move("overlays/chip-spi2.dtbo", overlay_path+"/chip-spi2.dtbo") shutil.move("overlays/chip-pwm0.dtbo", overlay_path+"/chip-pwm0.dtbo") diff --git a/overlays/chip-spi2.dts b/overlays/chip-spi2.dts deleted file mode 100644 index 7ecd79b..0000000 --- a/overlays/chip-spi2.dts +++ /dev/null @@ -1,93 +0,0 @@ -/* - * Copyright 2016, Robert Wolterman - * This file is an amalgamation of stuff from Kolja Windeler, Maxime Ripard, and Renzo. - * - * This file is dual-licensed: you can use it either under the terms - * of the GPL or the X11 license, at your option. Note that this dual - * licensing only applies to this file, and not this project as a - * whole. - * - * a) This file is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2 of the - * License, or (at your option) any later version. - * - * This file is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * Or, alternatively, - * - * b) Permission is hereby granted, free of charge, to any person - * obtaining a copy of this software and associated documentation - * files (the "Software"), to deal in the Software without - * restriction, including without limitation the rights to use, - * copy, modify, merge, publish, distribute, sublicense, and/or - * sell copies of the Software, and to permit persons to whom the - * Software is furnished to do so, subject to the following - * conditions: - * - * The above copyright notice and this permission notice shall be - * included in all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, - * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES - * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND - * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT - * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, - * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING - * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR - * OTHER DEALINGS IN THE SOFTWARE. - */ - -/dts-v1/; -/plugin/; - -/ { - compatible = "nextthing,chip", "allwinner,sun5i-r8"; - - /* activate the gpio for interrupt */ - fragment@0 { - target-path = <&pio>; - - __overlay__ { - chip_spi2_pins: spi2@0 { - allwinner,pins = "PE1", "PE2", "PE3"; - allwinner,function = "spi2"; - allwinner,drive = "0"; //; - allwinner,pull = "0"; //; - }; - - chip_spi2_cs0_pins: spi2_cs0@0 { - allwinner,pins = "PE0"; - allwinner,function = "spi2"; - allwinner,drive = "0"; //; - allwinner,pull = "0"; //; - }; - }; - }; - - /* - * Enable our SPI device, with an spidev device connected - * to it - */ - fragment@1 { - target = <&spi2>; - - __overlay__ { - #address-cells = <1>; - #size-cells = <0>; - pinctrl-names = "default"; - pinctrl-0 = <&chip_spi2_pins>, <&chip_spi2_cs0_pins>; - status = "okay"; - - spi2@0 { - compatible = "rohm,dh2228fv"; - reg = <0>; - spi-max-frequency = <24000000>; - }; - }; - }; -}; - diff --git a/setup.py b/setup.py index 71f69cf..e88d62c 100644 --- a/setup.py +++ b/setup.py @@ -20,7 +20,7 @@ classifiers = ['Development Status :: 3 - Alpha', 'Topic :: System :: Hardware'] setup(name = 'CHIP_IO', - version = '0.3.2', + version = '0.3.3', author = 'Robert Wolterman', author_email = 'robert.wolterman@gmail.com', description = 'A module to control CHIP IO channels', diff --git a/source/constants.c b/source/constants.c index cca20f4..29b5d1f 100644 --- a/source/constants.c +++ b/source/constants.c @@ -88,6 +88,6 @@ void define_constants(PyObject *module) module_debug = Py_BuildValue("i", DEBUG ? Py_True: Py_False); PyModule_AddObject(module, "DEBUG", module_debug); - version = Py_BuildValue("s", "0.3.2"); + version = Py_BuildValue("s", "0.3.3"); PyModule_AddObject(module, "VERSION", version); } diff --git a/source/py_pwm.c b/source/py_pwm.c index e783277..83b6ea4 100644 --- a/source/py_pwm.c +++ b/source/py_pwm.c @@ -62,6 +62,8 @@ static PyObject *py_start_channel(PyObject *self, PyObject *args, PyObject *kwar int polarity = 0; static char *kwlist[] = {"channel", "duty_cycle", "frequency", "polarity", NULL}; + clear_error_msg(); + if (!PyArg_ParseTupleAndKeywords(args, kwargs, "s|ffi", kwlist, &channel, &duty_cycle, &frequency, &polarity)) { return NULL; } @@ -100,6 +102,8 @@ static PyObject *py_stop_channel(PyObject *self, PyObject *args, PyObject *kwarg char key[8]; char *channel; + clear_error_msg(); + if (!PyArg_ParseTuple(args, "s", &channel)) return NULL; @@ -121,6 +125,8 @@ static PyObject *py_set_duty_cycle(PyObject *self, PyObject *args, PyObject *kwa float duty_cycle = 0.0; static char *kwlist[] = {"channel", "duty_cycle", NULL}; + clear_error_msg(); + if (!PyArg_ParseTupleAndKeywords(args, kwargs, "s|f", kwlist, &channel, &duty_cycle)) return NULL; @@ -152,6 +158,8 @@ static PyObject *py_set_pulse_width_ns(PyObject *self, PyObject *args, PyObject unsigned long period_ns; static char *kwlist[] = {"channel", "pulse_width_ns", NULL}; + clear_error_msg(); + if (!PyArg_ParseTupleAndKeywords(args, kwargs, "s|k", kwlist, &channel, &pulse_width_ns)) return NULL; @@ -190,6 +198,8 @@ static PyObject *py_set_frequency(PyObject *self, PyObject *args, PyObject *kwar float frequency = 1.0; static char *kwlist[] = {"channel", "frequency", NULL}; + clear_error_msg(); + if (!PyArg_ParseTupleAndKeywords(args, kwargs, "s|f", kwlist, &channel, &frequency)) return NULL; @@ -220,6 +230,8 @@ static PyObject *py_set_period_ns(PyObject *self, PyObject *args, PyObject *kwar unsigned long period_ns = 2e6; static char *kwlist[] = {"channel", "period_ns", NULL}; + clear_error_msg(); + if (!PyArg_ParseTupleAndKeywords(args, kwargs, "s|k", kwlist, &channel, &period_ns)) return NULL; diff --git a/source/py_softpwm.c b/source/py_softpwm.c index 2c45c95..2a4dbe1 100644 --- a/source/py_softpwm.c +++ b/source/py_softpwm.c @@ -41,6 +41,8 @@ static PyObject *py_cleanup(PyObject *self, PyObject *args) char key[8]; char *channel = NULL; + clear_error_msg(); + // Channel is optional if (!PyArg_ParseTuple(args, "|s", &channel)) return NULL; @@ -69,6 +71,8 @@ static PyObject *py_start_channel(PyObject *self, PyObject *args, PyObject *kwar int polarity = 0; static char *kwlist[] = {"channel", "duty_cycle", "frequency", "polarity", NULL}; + clear_error_msg(); + if (!PyArg_ParseTupleAndKeywords(args, kwargs, "s|ffi", kwlist, &channel, &duty_cycle, &frequency, &polarity)) { return NULL; } @@ -114,6 +118,8 @@ static PyObject *py_stop_channel(PyObject *self, PyObject *args, PyObject *kwarg char key[8]; char *channel; + clear_error_msg(); + if (!PyArg_ParseTuple(args, "s", &channel)) return NULL; @@ -135,6 +141,8 @@ static PyObject *py_set_duty_cycle(PyObject *self, PyObject *args, PyObject *kwa float duty_cycle = 0.0; static char *kwlist[] = {"channel", "duty_cycle", NULL}; + clear_error_msg(); + if (!PyArg_ParseTupleAndKeywords(args, kwargs, "s|f", kwlist, &channel, &duty_cycle)) return NULL; @@ -165,6 +173,8 @@ static PyObject *py_set_frequency(PyObject *self, PyObject *args, PyObject *kwar float frequency = 1.0; static char *kwlist[] = {"channel", "frequency", NULL}; + clear_error_msg(); + if (!PyArg_ParseTupleAndKeywords(args, kwargs, "s|f", kwlist, &channel, &frequency)) return NULL;