diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md
index 6344b2f..2916315 100644
--- a/.github/ISSUE_TEMPLATE.md
+++ b/.github/ISSUE_TEMPLATE.md
@@ -1,47 +1,13 @@
-Thank you for opening an issue on an Adafruit Python library repository. To
-improve the speed of resolution please review the following guidelines and
-common troubleshooting steps below before creating the issue:
+Thank you for opening an issue on the Adafruit BeagleBone Python library repository.
-- **Do not use GitHub issues for troubleshooting projects and issues.** Instead use
- the forums at http://forums.adafruit.com to ask questions and troubleshoot why
- something isn't working as expected. In many cases the problem is a common issue
- that you will more quickly receive help from the forum community. GitHub issues
- are meant for known defects in the code. If you don't know if there is a defect
- in the code then start with troubleshooting on the forum first.
-- **If following a tutorial or guide be sure you didn't miss a step.** Carefully
- check all of the steps and commands to run have been followed. Consult the
- forum if you're unsure or have questions about steps in a guide/tutorial.
+In order to understand your system configuration better, please run:
+```
+sudo /opt/scripts/tools/version.sh
+```
-- **For Python/Raspberry Pi projects check these very common issues to ensure they don't apply**:
+and paste the output in a reply.
- - If you are receiving an **ImportError: No module named...** error then a
- library the code depends on is not installed. Check the tutorial/guide or
- README to ensure you have installed the necessary libraries. Usually the
- missing library can be installed with the `pip` tool, but check the tutorial/guide
- for the exact command.
+This script should be present for any image downloaded from:
+https://beagleboard.org/ or https://rcn-ee.com/
- - **Be sure you are supplying adequate power to the board.** Check the specs of
- your board and power in an external power supply. In many cases just
- plugging a board into your computer is not enough to power it and other
- peripherals.
-
- - **Double check all soldering joints and connections.** Flakey connections
- cause many mysterious problems. See the [guide to excellent soldering](https://learn.adafruit.com/adafruit-guide-excellent-soldering/tools) for examples of good solder joints.
-
-If you're sure this issue is a defect in the code and checked the steps above
-please fill in the following fields to provide enough troubleshooting information.
-You may delete the guideline and text above to just leave the following details:
-
-- Platform/operating system (i.e. Raspberry Pi with Raspbian operating system,
- Windows 32-bit, Windows 64-bit, Mac OSX 64-bit, etc.): **INSERT PLATFORM/OPERATING
- SYSTEM HERE**
-
-- Python version (run `python -version` or `python3 -version`): **INSERT PYTHON
- VERSION HERE**
-
-- Error message you are receiving, including any Python exception traces: **INSERT
- ERROR MESAGE/EXCEPTION TRACES HERE***
-
-- List the steps to reproduce the problem below (if possible attach code or commands
- to run): **LIST REPRO STEPS BELOW**
diff --git a/.travis.yml b/.travis.yml
index df3bb3e..f515d75 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,4 +1,6 @@
language: python
+python:
+ - "3.6"
install:
- pip install tox
script:
diff --git a/Adafruit_BBIO/Encoder.py b/Adafruit_BBIO/Encoder.py
index 21c88c1..84ca5f6 100644
--- a/Adafruit_BBIO/Encoder.py
+++ b/Adafruit_BBIO/Encoder.py
@@ -351,7 +351,8 @@ def frequency(self, frequency):
new positions.
'''
- period = self._NS_FACTOR / frequency # Period in nanoseconds
+ # github issue #299: force period to be an integer
+ period = int(self._NS_FACTOR / frequency) # Period in nanoseconds
self._eqep.node.period = str(period)
self._logger.debug(
"Set frequency(): Channel {}, frequency: {} Hz, "
diff --git a/CHANGELOG.md b/CHANGELOG.md
index caf0bbb..4f9325e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,47 @@
+1.1.2
+---
+Daniel Nguyen (2):
+ Update common.c
+ Update common.c
+
+Drew Fustini (28):
+ upload to PyPI againt to resolve #293
+ do not set pinmux on the beaglebone blue
+ remove deug output
+ Fix dead link to bone.js #296
+ force Encoder period to be an integer #299
+ Ignore new compiler warnings in gcc 8.2.0
+ Update setup.py
+ do not set pin mode for built-in USRn LEDs
+ Change name of P1_3 to match bone.js
+ Fix warning about casting incompatible function types #308
+ Fix warning print format strings being truncated #308
+ Fix warning about casting incompatible function types #308
+ Fix warnings on format truncation and sizeof in strncpy #308
+ Fix warning about casting incompatible function types #308
+ Update travis config to specify Python 3.6
+ Update tox.ini to Python 3.6
+ Merge pull request #321 from adafruit/issue308
+ Update ISSUE_TEMPLATE.md
+ Update README.md
+ Update README.md
+ Merge pull request #327 from zer0cod3r/master
+ Merge pull request #337 from SamPovilus/docfix
+ Update README.md
+ Update README.md
+ Update README.md
+ remove -Werror from CFLAGS
+ Remove suppression of gcc warnings in CFLAGS #336
+ Update version in setup.py to v1.2
+
+Sam Povilus (1):
+ fixing document locaiton and version as current location dosn't load
+
+1.1.1
+---
+Attempt upload to PyPI again to avoid
+error reported in issue #293
+
1.1.0
---
Aaron Marburg (1):
diff --git a/README.md b/README.md
index cc179c2..fba6863 100644
--- a/README.md
+++ b/README.md
@@ -7,36 +7,37 @@
Adafruit BBIO is an API to enable [GPIO](README.md#gpio-setup), [PWM](README.md#pwm), [ADC](README.md#adc), [UART](README.md#uart), [SPI](README.md#spi) and [eQEP](README.md#eqep) (Quadrature Encoder) hardware access from Python applications running on the Beaglebone.
* It is recommended to use an [official BeagleBoard.org Debian image](https://beagleboard.org/latest-images)
- * **Currently recommended image: [Debian 9.4 "Stretch" IoT (2018-06-17)](http://debian.beagleboard.org/images/bone-debian-9.4-iot-armhf-2018-06-17-4gb.img.xz)**
- * Install [Linux kernel](https://elinux.org/Beagleboard:BeagleBoneBlack_Debian#Kernel_Options) [4.14.x](https://elinux.org/Beagleboard:BeagleBoneBlack_Debian#Mainline_.284.14.x_lts.29) to enable [non-root control of GPIO](https://github.com/rcn-ee/repos/blob/master/bb-customizations/suite/stretch/debian/80-gpio-noroot.rules) and [PWM](https://github.com/rcn-ee/repos/blob/master/bb-customizations/suite/stretch/debian/81-pwm-noroot.rules) [_(commit)_](https://github.com/adafruit/adafruit-beaglebone-io-python/commit/b65cbf8e41b444bad7c4ef6cfd4f88a30210fd78)
+ * **Currently recommended image: [Debian 10.3 "Buster" IoT (2020-04-06)](http://beagleboard.org/latest-images)** _(default kernel is 4.19.x-ti)_
-* Adafruit_BBIO supports Linux kernels 3.8 through 4.14
+* Adafruit_BBIO supports Linux kernels 3.8 through 4.19
* New versions of Adafruit_BBIO may break backwards compatibility. Please read the [changelog](CHANGELOG.md).
+* It is recommended to use Python 3
+
## Installation on Debian
-Easiest:
+Note: Follow the instructions on BeagleBoard.org to [get connected to the Internet](https://beagleboard.org/upgrade#connect)
+
+**Easiest:**
```
-sudo ntpdate pool.ntp.org
sudo apt-get update
-sudo apt-get install build-essential python-dev python-pip -y
-sudo pip install Adafruit_BBIO
+sudo apt-get install build-essential python3-dev python3-pip -y
+sudo pip3 install Adafruit_BBIO
```
-Manual:
+**Manual:**
```
-sudo ntpdate pool.ntp.org
sudo apt-get update
-sudo apt-get install build-essential python-dev python-pip -y
+sudo apt-get install build-essential python3-dev python3-pip -y
git clone git://github.com/adafruit/adafruit-beaglebone-io-python.git
cd adafruit-beaglebone-io-python
-sudo python setup.py install
+sudo python3 setup.py install
```
Upgrade Adafruit_BBIO to latest version on [PyPI](https://pypi.python.org/pypi/Adafruit_BBIO):
```
-sudo pip install --upgrade Adafruit_BBIO
+sudo pip3 install --upgrade Adafruit_BBIO
```
## Usage
@@ -265,13 +266,25 @@ To use the enhanced Quadrature Encoder Pulse (eQEP) module, please refer to the
Install py.test to run the tests. You'll also need the python compiler package for pytest:
```
-sudo pip install pytest
+sudo pip3 install pytest
```
Execute the following in the root of the project:
```
-sudo pytest
+pytest
+```
+NOTE: `sudo` should not be required as udev configures group ownership and permission for [GPIO](https://github.com/rcn-ee/repos/blob/master/bb-customizations/suite/stretch/debian/80-gpio-noroot.rules) and [PWM](https://github.com/rcn-ee/repos/blob/master/bb-customizations/suite/stretch/debian/81-pwm-noroot.rules)
+
+## Reporting issues
+
+When reporting issues, plesae run the following script which will print the system configuration:
+```
+sudo /opt/scripts/tools/version.sh
```
-NOTE: `sudo` should not be required when running [Debian 9.2 "Stretch" iot (2017-10-29)](https://elinux.org/Beagleboard:BeagleBoneBlack_Debian#microSD.2FStandalone:_.28stretch-iot.29_.28All_BeagleBone_Variants_.26_PocketBeagle.29) with [Linux kernel](https://elinux.org/Beagleboard:BeagleBoneBlack_Debian#Kernel_Options) [4.14.x](https://elinux.org/Beagleboard:BeagleBoneBlack_Debian#Mainline_.284.14.x_lts.29) as udev configures group ownership and permission for [GPIO](https://github.com/rcn-ee/repos/blob/master/bb-customizations/suite/stretch/debian/80-gpio-noroot.rules) and [PWM](https://github.com/rcn-ee/repos/blob/master/bb-customizations/suite/stretch/debian/81-pwm-noroot.rules)
+and paste the output in a reply.
+
+This script should be present for any Debian or Ubunut image downloaded from:
+https://beagleboard.org/ or https://rcn-ee.com/
+
## Credits
diff --git a/setup.py b/setup.py
index bbe0209..a6f5891 100644
--- a/setup.py
+++ b/setup.py
@@ -21,7 +21,7 @@
else:
kernel41 = None
-CFLAGS = ['-Wall', '-Werror', '-Wextra', '-Wno-missing-field-initializers', '-Wno-strict-aliasing' ]
+CFLAGS = ['-Wall']
classifiers = ['Development Status :: 3 - Alpha',
'Operating System :: POSIX :: Linux',
@@ -40,11 +40,12 @@
}
setup(name = 'Adafruit_BBIO',
- version = '1.1.0',
+ version = '1.2.0',
author = 'Justin Cooper',
author_email = 'justin@adafruit.com',
description = 'A module to control BeagleBone IO channels',
long_description = open_as_utf8('README.md').read() + open_as_utf8('CHANGELOG.md').read(),
+ long_description_content_type = 'text/markdown',
license = 'MIT',
keywords = 'Adafruit BeagleBone IO GPIO PWM ADC',
url = 'https://github.com/adafruit/adafruit-beaglebone-io-python/',
diff --git a/source/c_adc.c b/source/c_adc.c
index 21ad284..d496366 100644
--- a/source/c_adc.c
+++ b/source/c_adc.c
@@ -41,9 +41,9 @@ int adc_initialized = 0;
BBIO_err initialize_adc(void)
{
#ifdef BBBVERSION41
- char test_path[49];
+ char test_path[149];
#else
- char test_path[40];
+ char test_path[140];
#endif
FILE *fh;
BBIO_err err;
@@ -94,10 +94,10 @@ BBIO_err read_value(unsigned int ain, float *value)
{
FILE * fh;
#ifdef BBBVERSION41
- char ain_path[49];
+ char ain_path[149];
snprintf(ain_path, sizeof(ain_path), "%s%d_raw", adc_prefix_dir, ain);
#else
- char ain_path[40];
+ char ain_path[140];
snprintf(ain_path, sizeof(ain_path), "%s%d", adc_prefix_dir, ain);
#endif
diff --git a/source/c_pinmux.c b/source/c_pinmux.c
index 6932ec6..23f1030 100644
--- a/source/c_pinmux.c
+++ b/source/c_pinmux.c
@@ -9,11 +9,16 @@
BBIO_err set_pin_mode(const char *key, const char *mode)
{
// char ocp_dir[] defined in common.h
- char path[60]; // "/sys/devices/platform/ocp/ocp:P#_##_pinmux/state"
+ char path[100]; // "/sys/devices/platform/ocp/ocp:P#_##_pinmux/state"
char pinmux_dir[20]; // "ocp:P#_##_pinmux"
char pin[6]; //"P#_##"
FILE *f = NULL;
-
+
+ // pin mode can not be set for the built-in USRn LEDs
+ if (strncmp(key, "USR", 3) == 0) {
+ return BBIO_OK;
+ }
+
if (strlen(key) == 4) // Key P#_# format, must inject '0' to be P#_0#
snprintf(pin, sizeof(pin), "%.3s0%c", key,key[3]);
else //copy string
@@ -32,6 +37,14 @@ BBIO_err set_pin_mode(const char *key, const char *mode)
snprintf(pinmux_dir, sizeof(pinmux_dir), "ocp:%s_pinmux", pin);
snprintf(path, sizeof(path), "%s/%s/state", ocp_dir, pinmux_dir);
+ /* beaglebone blue has complete dtb file and does not need overlays */
+ if(beaglebone_blue()) {
+ fprintf(stderr, "DEBUG: Adafruit_BBIO: set_pin_mode() :: Pinmux file: %s, mode: %s", path, mode);
+ fprintf(stderr, "DEBUG: Adafruit_BBIO: set_pin_mode(): beaglebone_blue() is TRUE; return BBIO_OK\n");
+ return BBIO_OK;
+ }
+
+
f = fopen(path, "w");
if (NULL == f) {
return BBIO_ACCESS;
diff --git a/source/c_pwm.c b/source/c_pwm.c
index e1f917e..a5ef5ec 100644
--- a/source/c_pwm.c
+++ b/source/c_pwm.c
@@ -94,6 +94,14 @@ void export_pwm(struct pwm_exp *new_pwm)
}
}
+int is_dmtimer_pin(pwm_t *p) {
+ char temp[6];
+ strncpy(temp, p->module, 5);
+ temp[5] = '\0';
+
+ return (strcmp(temp, "timer") == 0);
+}
+
BBIO_err initialize_pwm(void)
{
#ifdef BBBVERSION41 // don't load overlay in 4.1+
@@ -119,7 +127,7 @@ BBIO_err initialize_pwm(void)
BBIO_err pwm_set_frequency(const char *key, float freq) {
int len;
- char buffer[20];
+ char buffer[100];
unsigned long period_ns;
struct pwm_exp *pwm;
@@ -195,7 +203,7 @@ BBIO_err pwm_set_frequency(const char *key, float freq) {
// Only works before chip is enabled
BBIO_err pwm_set_polarity(const char *key, int polarity) {
int len;
- char buffer[9]; /* allow room for trailing NUL byte */
+ char buffer[100]; /* allow room for trailing NUL byte */
struct pwm_exp *pwm;
#ifdef BBBVERSION41
int enabled; /* Maintain original state */
@@ -275,7 +283,7 @@ BBIO_err pwm_set_polarity(const char *key, int polarity) {
BBIO_err pwm_set_duty_cycle(const char *key, float duty) {
int len;
- char buffer[20];
+ char buffer[100];
struct pwm_exp *pwm;
if (duty < 0.0 || duty > 100.0)
@@ -309,17 +317,17 @@ BBIO_err pwm_setup(const char *key, __attribute__ ((unused)) float duty, __attri
struct pwm_exp *new_pwm;
#ifdef BBBVERSION41
- char pwm_dev_path[45]; // "/sys/devices/platform/ocp/48300000.epwmss"
- char pwm_addr_path[60]; // "/sys/devices/platform/ocp/48300000.epwmss/48300200.ehrpwm"
- char pwm_chip_path[75]; // "/sys/devices/platform/ocp/48300000.epwmss/48300200.ehrpwm/pwm/pwmchip0"
- char pwm_export_path[80]; // "/sys/devices/platform/ocp/48300000.epwmss/48300200.ehrpwm/pwm/pwmchip0/export"
- char pwm_path[85]; // "/sys/devices/platform/ocp/48300000.epwmss/48300200.ehrpwm/pwm/pwmchip0/pwm1"
- char pwm_path_udev[85]; // "/sys/devices/platform/ocp/48300000.epwmss/48300200.ehrpwm/pwm/pwmchip0/pwm-0:1"
- char ecap_path_udev[85];// "/sys/devices/platform/ocp/48300000.epwmss/48300100.ecap/pwm/pwmchip0/pwm-0:0/"
- char duty_path[95]; // "/sys/devices/platform/ocp/48300000.epwmss/48300200.ehrpwm/pwm/pwmchip0/pwm1/duty_cycle"
- char period_path[95];
- char polarity_path[95];
- char enable_path[90];
+ char pwm_dev_path[100]; // "/sys/devices/platform/ocp/48300000.epwmss"
+ char pwm_addr_path[150]; // "/sys/devices/platform/ocp/48300000.epwmss/48300200.ehrpwm"
+ char pwm_chip_path[200]; // "/sys/devices/platform/ocp/48300000.epwmss/48300200.ehrpwm/pwm/pwmchip0"
+ char pwm_export_path[250]; // "/sys/devices/platform/ocp/48300000.epwmss/48300200.ehrpwm/pwm/pwmchip0/export"
+ char pwm_path[250]; // "/sys/devices/platform/ocp/48300000.epwmss/48300200.ehrpwm/pwm/pwmchip0/pwm2"
+ char pwm_path_udev[250]; // "/sys/devices/platform/ocp/48300000.epwmss/48300200.ehrpwm/pwm/pwmchip0/pwm-0:2"
+ char ecap_path_udev[300]; // "/sys/devices/platform/ocp/48300000.epwmss/48300200.ecap/pwm/pwmchip0/pwm-0:0/"
+ char duty_path[300]; // "/sys/devices/platform/ocp/48300000.epwmss/48300200.ehrpwm/pwm/pwmchip0/pwm2/duty_cycle"
+ char period_path[300];
+ char polarity_path[300];
+ char enable_path[300];
char pin_mode[PIN_MODE_LEN]; // "pwm" or "pwm2"
int e;
@@ -375,16 +383,27 @@ BBIO_err pwm_setup(const char *key, __attribute__ ((unused)) float duty, __attri
return err;
}
- err = build_path(ocp_dir, p->chip, pwm_dev_path, sizeof(pwm_dev_path));
- if (err != BBIO_OK) {
- syslog(LOG_ERR, "Adafruit_BBIO: pwm_setup: %s couldn't build pwm_dev_path: %i", key, err);
- return err;
- }
+ int dmtimer_pin = is_dmtimer_pin(p);
- err = build_path(pwm_dev_path, p->addr, pwm_addr_path, sizeof(pwm_addr_path));
- if (err != BBIO_OK) {
- syslog(LOG_ERR, "Adafruit_BBIO: pwm_setup: %s couldn't build pwm_addr_path: %i", key, err);
- return err;
+ if(!dmtimer_pin) {
+ err = build_path(ocp_dir, p->chip, pwm_dev_path, sizeof(pwm_dev_path));
+ if (err != BBIO_OK) {
+ syslog(LOG_ERR, "Adafruit_BBIO: pwm_setup: %s couldn't build pwm_dev_path: %i", key, err);
+ return err;
+ }
+
+ err = build_path(pwm_dev_path, p->addr, pwm_addr_path, sizeof(pwm_addr_path));
+ if (err != BBIO_OK) {
+ syslog(LOG_ERR, "Adafruit_BBIO: pwm_setup: %s couldn't build pwm_addr_path: %i", key, err);
+ return err;
+ }
+ }
+ else {
+ err = build_path("/sys/devices/platform", p->addr, pwm_addr_path, sizeof(pwm_addr_path));
+ if (err != BBIO_OK) {
+ syslog(LOG_ERR, "Adafruit_BBIO: pwm_setup: %s couldn't build pwm_addr_path, are you sure you've loaded the correct dmtimer device tree overlay?: %i", key, err);
+ return err;
+ }
}
err = build_path(pwm_addr_path, "pwm/pwmchip", pwm_chip_path, sizeof(pwm_chip_path));
@@ -397,10 +416,10 @@ BBIO_err pwm_setup(const char *key, __attribute__ ((unused)) float duty, __attri
syslog(LOG_DEBUG, "Adafruit_BBIO: pwm_start: key: %s, pwm_path: %s", key, pwm_path);
//pwm with udev patch
- snprintf(pwm_path_udev, sizeof(pwm_path_udev), "%s/pwm-%c:%d", pwm_chip_path, pwm_path[66], p->index);
+ snprintf(pwm_path_udev, sizeof(pwm_path_udev), "%s/pwm-%c:%d", pwm_chip_path, dmtimer_pin ? pwm_path[47] : pwm_path[66], p->index);
syslog(LOG_DEBUG, "Adafruit_BBIO: pwm_start: key: %s, pwm_path_udev: %s", key, pwm_path_udev);
//ecap output with udev patch
- snprintf(ecap_path_udev, sizeof(ecap_path_udev), "%s/pwm-%c:%d", pwm_chip_path, pwm_path[67], p->index);
+ snprintf(ecap_path_udev, sizeof(ecap_path_udev), "%s/pwm-%c:%d", pwm_chip_path, dmtimer_pin ? pwm_path[47] : pwm_path[67], p->index);
syslog(LOG_DEBUG, "Adafruit_BBIO: pwm_start: key: %s, ecap_path_udev: %s", key, ecap_path_udev);
// Export PWM if hasn't already been
@@ -456,11 +475,11 @@ BBIO_err pwm_setup(const char *key, __attribute__ ((unused)) float duty, __attri
return BBIO_GEN;
}
} else {
- strncpy(pwm_path, ecap_path_udev, sizeof(ecap_path_udev));
+ strncpy(pwm_path, ecap_path_udev, sizeof(pwm_path));
}
}
} else {
- strncpy(pwm_path, pwm_path_udev, sizeof(pwm_path_udev));
+ strncpy(pwm_path, pwm_path_udev, sizeof(pwm_path));
usleep(100*1000);
}
}
@@ -470,12 +489,12 @@ BBIO_err pwm_setup(const char *key, __attribute__ ((unused)) float duty, __attri
snprintf(duty_path, sizeof(duty_path), "%s/duty_cycle", pwm_path);
snprintf(enable_path, sizeof(enable_path), "%s/enable", pwm_path);
#else
- char fragment[18];
- char pwm_fragment[20];
- char pwm_path[45];
- char duty_path[56];
- char period_path[50];
- char polarity_path[55];
+ char fragment[100];
+ char pwm_fragment[100];
+ char pwm_path[100];
+ char duty_path[200];
+ char period_path[100];
+ char polarity_path[100];
int period_fd, duty_fd, polarity_fd;
if (!pwm_initialized) {
@@ -590,7 +609,7 @@ BBIO_err pwm_start(const char *key, float duty, float freq, int polarity)
//fprintf(stderr, "Adafruit_BBIO: pwm_start: %s, %f, %f, %i\n", key, duty, freq, polarity);
BBIO_err err;
- char buffer[20];
+ char buffer[100];
ssize_t len;
struct pwm_exp *pwm = lookup_exported_pwm(key);
@@ -694,7 +713,7 @@ BBIO_err pwm_disable(const char *key)
#ifndef BBBVERSION41
BBIO_err err;
- char fragment[18];
+ char fragment[100];
snprintf(fragment, sizeof(fragment), "bone_pwm_%s", key);
err = unload_device_tree(fragment);
if (err != BBIO_OK)
@@ -709,7 +728,7 @@ BBIO_err pwm_disable(const char *key)
{
#ifdef BBBVERSION41
- char buffer[2];
+ char buffer[100];
size_t len;
// Disable the PWM
diff --git a/source/common.c b/source/common.c
index 42dd5f5..f911d49 100644
--- a/source/common.c
+++ b/source/common.c
@@ -69,7 +69,7 @@ typedef struct pins_t {
int ain;
} pins_t;
-//Table generated based on https://raw.github.com/jadonk/bonescript/master/node_modules/bonescript/bone.js
+//Table generated based on https://github.com/jadonk/bonescript/blob/master/src/bone.js
pins_t table[] = {
{ "USR0", "USR0", 53, -1, -1},
{ "USR1", "USR1", 54, -1, -1},
@@ -81,10 +81,10 @@ pins_t table[] = {
{ "GPIO1_7", "P8_4", 39, -1, -1},
{ "GPIO1_2", "P8_5", 34, -1, -1},
{ "GPIO1_3", "P8_6", 35, -1, -1},
- { "TIMER4", "P8_7", 66, -1, -1},
- { "TIMER7", "P8_8", 67, -1, -1},
- { "TIMER5", "P8_9", 69, -1, -1},
- { "TIMER6", "P8_10", 68, -1, -1},
+ { "TIMER4", "P8_7", 66, 2, -1},
+ { "TIMER7", "P8_8", 67, 2, -1},
+ { "TIMER5", "P8_9", 69, 2, -1},
+ { "TIMER6", "P8_10", 68, 2, -1},
{ "GPIO1_13", "P8_11", 45, -1, -1},
{ "GPIO1_12", "P8_12", 44, -1, -1},
{ "EHRPWM2B", "P8_13", 23, 4, -1},
@@ -189,7 +189,7 @@ pins_t table[] = {
// These are for the PocketBeagle
{ "VIN_AC", "P1_1", 0, -1, -1},
{ "GPIO2_23", "P1_2", 87, -1, -1},
- { "USB1_VBUS_OUT", "P1_3", 0, -1, -1},
+ { "USB1_DRVVBUS", "P1_3", 0, -1, -1},
{ "GPIO2_25", "P1_4", 89, -1, -1},
{ "USB1_VBUS_IN", "P1_5", 0, -1, -1},
{ "SPI0_CS0", "P1_6", 5, -1, -1},
@@ -206,15 +206,15 @@ pins_t table[] = {
{ "VREFN", "P1_17", 0, -1, -1},
{ "VREFP", "P1_18", 0, -1, -1},
{ "AIN0", "P1_19", 0, -1, 0},
- { "GPIO0_20", "P1_20", 20, -1, -1},
+ { "GPIO0_20", "P1_20", 20, 4, -1},
{ "AIN1", "P1_21", 0, -1, 1},
{ "GND", "P1_22", 0, -1, -1},
{ "AIN2", "P1_23", 0, -1, 2},
{ "VOUT-5V", "P1_24", 0, -1, -1},
{ "AIN3", "P1_25", 0, -1, 3},
- { "I2C2_SDA", "P1_26", 12, -1, -1},
+ { "I2C2_SDA", "P1_26", 12, 1, -1},
{ "AIN4", "P1_27", 0, -1, 4},
- { "I2C2_SCL", "P1_28", 13, -1, -1},
+ { "I2C2_SCL", "P1_28", 13, 1, -1},
{ "GPIO3_21", "P1_29", 117, -1, -1},
{ "UART0_TXD", "P1_30", 43, -1, -1},
{ "GPIO3_18", "P1_31", 114, -1, -1},
@@ -249,11 +249,11 @@ pins_t table[] = {
{ "GPIO1_12", "P2_24", 44, -1, -1},
{ "SPI1_CS0", "P2_25", 41, -1, -1},
{ "RESET#", "P2_26", 0, -1, -1},
- { "SPI1_D0", "P2_27", 40, -1, -1},
+ { "SPI1_D0", "P2_27", 40, 5, -1},
{ "GPIO3_20", "P2_28", 116, -1, -1},
{ "SPI1_SCLK", "P2_29", 7, -1, -1},
{ "GPIO3_17", "P2_30", 113, -1, -1},
- { "SPI1_CS1", "P2_31", 19, -1, -1},
+ { "SPI1_CS1", "P2_31", 19, 2, -1},
{ "GPIO3_16", "P2_32", 112, -1, -1},
{ "GPIO1_13", "P2_33", 45, -1, -1},
{ "GPIO3_19", "P2_34", 115, -1, -1},
@@ -271,6 +271,8 @@ pins_t table[] = {
// P2_09 uart1_txd
// P1_08 uart2_rxd
// P1_10 uart2_txd
+// P2_05 uart4_rxd
+// P2_07 uart4_txd
uart_t uart_table[] = {
{ "UART1", "/dev/ttyO1", "ADAFRUIT-UART1", "P9_26", "P9_24"},
@@ -281,12 +283,13 @@ uart_t uart_table[] = {
{ "PB-UART0", "/dev/ttyO0", "ADAFRUIT-UART0", "P1_30", "P1_32"},
{ "PB-UART1", "/dev/ttyO1", "ADAFRUIT-UART1", "P2_11", "P2_09"},
{ "PB-UART2", "/dev/ttyO2", "ADAFRUIT-UART2", "P1_08", "P1_10"},
+ { "PB-UART4", "/dev/ttyO4", "ADAFRUIT-UART4", "P2_05", "P2_07"},
{ NULL, NULL, 0, 0, 0 }
};
// Copied from https://github.com/jadonk/bonescript/blob/master/src/bone.js
// See am335x technical manual, p. 183, for more info:
-// http://www.ti.com/lit/ug/spruh73n/spruh73n.pdf
+// https://www.ti.com/lit/ug/spruh73q/spruh73q.pdf
pwm_t pwm_table[] = {
{ "ehrpwm2", 6, 1, 4, "ehrpwm.2:1", "EHRPWM2B", "48304000", "48304200", "P8_13"},
{ "ehrpwm2", 5, 0, 4, "ehrpwm.2:0", "EHRPWM2A", "48304000", "48304200", "P8_19"},
@@ -302,12 +305,21 @@ pwm_t pwm_table[] = {
{ "ehrpwm0", 1, 1, 1, "ehrpwm.0:1", "EHRPWM0B", "48300000", "48300200", "P9_29"},
{ "ehrpwm0", 0, 0, 1, "ehrpwm.0:0", "EHRPWM0A", "48300000", "48300200", "P9_31"},
{ "ecap0", 2, 0, 0, "ecap.0", "ECAPPWM0", "48300000", "48300100", "P9_42"},
+ { "timer4", 0, 0, 2, "", "", "", "dmtimer-pwm-4", "P8_7" },
+ { "timer7", 0, 0, 2, "", "", "", "dmtimer-pwm-7", "P8_8" },
+ { "timer5", 0, 0, 2, "", "", "", "dmtimer-pwm-5", "P8_9" },
+ { "timer6", 0, 0, 2, "", "", "", "dmtimer-pwm-6", "P8_10" },
{ "ehrpwm0", 0, 0, 1, "ehrpwm.0:0", "EHRPWM0A", "48300000", "48300200", "P1_8"},
{ "ehrpwm0", 0, 0, 1, "ehrpwm.0:0", "EHRPWM0A", "48300000", "48300200", "P1_36"},
{ "ehrpwm0", 1, 1, 1, "ehrpwm.0:1", "EHRPWM0B", "48300000", "48300200", "P1_10"},
{ "ehrpwm0", 1, 1, 1, "ehrpwm.0:1", "EHRPWM0B", "48300000", "48300200", "P1_33"},
{ "ehrpwm1", 3, 0, 6, "ehrpwm.1:0", "EHRPWM1A", "48302000", "48302200", "P2_1"},
{ "ehrpwm2", 6, 1, 3, "ehrpwm.2:1", "EHRPWM2B", "48304000", "48304200", "P2_3"},
+ { "timer7", 0, 0, 4, "", "", "", "dmtimer-pwm-7", "P1_20" },
+ { "timer6", 0, 0, 1, "", "", "", "dmtimer-pwm-6", "P1_26" },
+ { "timer5", 0, 0, 1, "", "", "", "dmtimer-pwm-5", "P1_28" },
+ { "timer7", 0, 0, 5, "", "", "", "dmtimer-pwm-7", "P2_27" },
+ { "timer4", 0, 0, 2, "", "", "", "dmtimer-pwm-4", "P2_31" },
{ NULL, 0, 0, 0, NULL, NULL, NULL, NULL, NULL }
};
@@ -636,12 +648,10 @@ BBIO_err load_device_tree(const char *name)
{
char line[256];
FILE *file = NULL;
-
+ char slots[100];
#ifdef BBBVERSION41
- char slots[41];
snprintf(ctrl_dir, sizeof(ctrl_dir), "/sys/devices/platform/bone_capemgr");
#else
- char slots[40];
build_path("/sys/devices", "bone_capemgr", ctrl_dir, sizeof(ctrl_dir));
#endif
@@ -698,11 +708,10 @@ BBIO_err load_device_tree(const char *name)
int device_tree_loaded(const char *name)
{
FILE *file = NULL;
+ char slots[100];
#ifdef BBBVERSION41
- char slots[41];
snprintf(ctrl_dir, sizeof(ctrl_dir), "/sys/devices/platform/bone_capemgr");
#else
- char slots[40];
build_path("/sys/devices", "bone_capemgr", ctrl_dir, sizeof(ctrl_dir));
#endif
char line[256];
@@ -755,11 +764,10 @@ int device_tree_loaded(const char *name)
BBIO_err unload_device_tree(const char *name)
{
FILE *file = NULL;
+ char slots[100];
#ifdef BBBVERSION41
- char slots[41];
snprintf(ctrl_dir, sizeof(ctrl_dir), "/sys/devices/platform/bone_capemgr");
#else
- char slots[40];
build_path("/sys/devices", "bone_capemgr", ctrl_dir, sizeof(ctrl_dir));
#endif
char line[256];
diff --git a/source/constants.c b/source/constants.c
index 5e284c8..23753c6 100644
--- a/source/constants.c
+++ b/source/constants.c
@@ -35,39 +35,41 @@ SOFTWARE.
void define_constants(PyObject *module)
{
- high = Py_BuildValue("i", HIGH);
- PyModule_AddObject(module, "HIGH", high);
+ PyObject *object;
- low = Py_BuildValue("i", LOW);
- PyModule_AddObject(module, "LOW", low);
+ object = Py_BuildValue("i", HIGH);
+ PyModule_AddObject(module, "HIGH", object);
- output = Py_BuildValue("i", OUTPUT);
- PyModule_AddObject(module, "OUT", output);
+ object = Py_BuildValue("i", LOW);
+ PyModule_AddObject(module, "LOW", object);
- input = Py_BuildValue("i", INPUT);
- PyModule_AddObject(module, "IN", input);
+ object = Py_BuildValue("i", OUTPUT);
+ PyModule_AddObject(module, "OUT", object);
- alt0 = Py_BuildValue("i", ALT0);
- PyModule_AddObject(module, "ALT0", alt0);
+ object = Py_BuildValue("i", INPUT);
+ PyModule_AddObject(module, "IN", object);
- pud_off = Py_BuildValue("i", PUD_OFF);
- PyModule_AddObject(module, "PUD_OFF", pud_off);
+ object = Py_BuildValue("i", ALT0);
+ PyModule_AddObject(module, "ALT0", object);
- pud_up = Py_BuildValue("i", PUD_UP);
- PyModule_AddObject(module, "PUD_UP", pud_up);
+ object = Py_BuildValue("i", PUD_OFF);
+ PyModule_AddObject(module, "PUD_OFF", object);
- pud_down = Py_BuildValue("i", PUD_DOWN);
- PyModule_AddObject(module, "PUD_DOWN", pud_down);
+ object = Py_BuildValue("i", PUD_UP);
+ PyModule_AddObject(module, "PUD_UP", object);
+
+ object = Py_BuildValue("i", PUD_DOWN);
+ PyModule_AddObject(module, "PUD_DOWN", object);
- rising_edge = Py_BuildValue("i", RISING_EDGE);
- PyModule_AddObject(module, "RISING", rising_edge);
+ object = Py_BuildValue("i", RISING_EDGE);
+ PyModule_AddObject(module, "RISING", object);
- falling_edge = Py_BuildValue("i", FALLING_EDGE);
- PyModule_AddObject(module, "FALLING", falling_edge);
+ object = Py_BuildValue("i", FALLING_EDGE);
+ PyModule_AddObject(module, "FALLING", object);
- both_edge = Py_BuildValue("i", BOTH_EDGE);
- PyModule_AddObject(module, "BOTH", both_edge);
+ object = Py_BuildValue("i", BOTH_EDGE);
+ PyModule_AddObject(module, "BOTH", object);
- version = Py_BuildValue("s", "0.0.20");
- PyModule_AddObject(module, "VERSION", version);
+ object = Py_BuildValue("s", "0.0.20");
+ PyModule_AddObject(module, "VERSION", object);
}
diff --git a/source/constants.h b/source/constants.h
index 0f6fdf5..82ebe5e 100644
--- a/source/constants.h
+++ b/source/constants.h
@@ -1,19 +1,6 @@
#ifndef CONSTANTS_H
#define CONSTANTS_H
-PyObject *high;
-PyObject *low;
-PyObject *input;
-PyObject *output;
-PyObject *alt0;
-PyObject *pud_off;
-PyObject *pud_up;
-PyObject *pud_down;
-PyObject *rising_edge;
-PyObject *falling_edge;
-PyObject *both_edge;
-PyObject *version;
-
void define_constants(PyObject *module);
#endif
diff --git a/source/py_gpio.c b/source/py_gpio.c
index 1f37dda..99cb0e7 100644
--- a/source/py_gpio.c
+++ b/source/py_gpio.c
@@ -555,14 +555,14 @@ static PyObject *py_setwarnings(__attribute__ ((unused)) PyObject *self, __attri
static const char moduledocstring[] = "GPIO functionality of a BeagleBone using Python";
PyMethodDef gpio_methods[] = {
- {"setup", (PyCFunction)py_setup_channel, METH_VARARGS | METH_KEYWORDS, "Set up the GPIO channel, direction and (optional) pull/up down control\nchannel - Either: RPi board pin number (not BCM GPIO 00..nn number). Pins start from 1\n or : BCM GPIO number\ndirection - INPUT or OUTPUT\n[pull_up_down] - PUD_OFF (default), PUD_UP or PUD_DOWN\n[initial] - Initial value for an output channel\n[delay] - Time in milliseconds to wait after exporting gpio pin"},
+ {"setup", (PyCFunction)(void *)py_setup_channel, METH_VARARGS | METH_KEYWORDS, "Set up the GPIO channel, direction and (optional) pull/up down control\nchannel - Either: RPi board pin number (not BCM GPIO 00..nn number). Pins start from 1\n or : BCM GPIO number\ndirection - INPUT or OUTPUT\n[pull_up_down] - PUD_OFF (default), PUD_UP or PUD_DOWN\n[initial] - Initial value for an output channel\n[delay] - Time in milliseconds to wait after exporting gpio pin"},
{"cleanup", py_cleanup, METH_VARARGS, "Clean up by resetting all GPIO channels that have been used by this program to INPUT with no pullup/pulldown and no event detection"},
{"output", py_output_gpio, METH_VARARGS, "Output to a GPIO channel\ngpio - gpio channel\nvalue - 0/1 or False/True or LOW/HIGH"},
{"input", py_input_gpio, METH_VARARGS, "Input from a GPIO channel. Returns HIGH=1=True or LOW=0=False\ngpio - gpio channel"},
- {"add_event_detect", (PyCFunction)py_add_event_detect, METH_VARARGS | METH_KEYWORDS, "Enable edge detection events for a particular GPIO channel.\nchannel - either board pin number or BCM number depending on which mode is set.\nedge - RISING, FALLING or BOTH\n[callback] - A callback function for the event (optional)\n[bouncetime] - Switch bounce timeout in ms for callback"},
+ {"add_event_detect", (PyCFunction)(void *)py_add_event_detect, METH_VARARGS | METH_KEYWORDS, "Enable edge detection events for a particular GPIO channel.\nchannel - either board pin number or BCM number depending on which mode is set.\nedge - RISING, FALLING or BOTH\n[callback] - A callback function for the event (optional)\n[bouncetime] - Switch bounce timeout in ms for callback"},
{"remove_event_detect", py_remove_event_detect, METH_VARARGS, "Remove edge detection for a particular GPIO channel\ngpio - gpio channel"},
{"event_detected", py_event_detected, METH_VARARGS, "Returns True if an edge has occured on a given GPIO. You need to enable edge detection using add_event_detect() first.\ngpio - gpio channel"},
- {"add_event_callback", (PyCFunction)py_add_event_callback, METH_VARARGS | METH_KEYWORDS, "Add a callback for an event already defined using add_event_detect()\ngpio - gpio channel\ncallback - a callback function\n[bouncetime] - Switch bounce timeout in ms"},
+ {"add_event_callback", (PyCFunction)(void *)py_add_event_callback, METH_VARARGS | METH_KEYWORDS, "Add a callback for an event already defined using add_event_detect()\ngpio - gpio channel\ncallback - a callback function\n[bouncetime] - Switch bounce timeout in ms"},
{"wait_for_edge", py_wait_for_edge, METH_VARARGS, "Wait for an edge.\ngpio - gpio channel\nedge - RISING, FALLING or BOTH\ntimeout (optional) - time to wait in miliseconds. -1 will wait forever (default)"},
{"gpio_function", py_gpio_function, METH_VARARGS, "Return the current GPIO function (IN, OUT, ALT0)\ngpio - gpio channel"},
{"setwarnings", py_setwarnings, METH_VARARGS, "Enable or disable warning messages"},
@@ -599,8 +599,10 @@ PyMODINIT_FUNC initGPIO(void)
initlog(LOG_INFO, NULL, BBIO_LOG_OPTION);
+#if PY_VERSION_HEX < 0x03090000
if (!PyEval_ThreadsInitialized())
PyEval_InitThreads();
+#endif
if (Py_AtExit(event_cleanup) != 0)
{
diff --git a/source/py_pwm.c b/source/py_pwm.c
index 55f50f9..e5f10f8 100644
--- a/source/py_pwm.c
+++ b/source/py_pwm.c
@@ -215,10 +215,10 @@ static PyObject *py_set_frequency(__attribute__ ((unused)) PyObject *self, PyObj
static const char moduledocstring[] = "PWM functionality of a BeagleBone using Python";
PyMethodDef pwm_methods[] = {
- {"start", (PyCFunction)py_start_channel, METH_VARARGS | METH_KEYWORDS, "Set up and start the PWM channel. channel can be in the form of 'P8_10', or 'EHRPWM2A'"},
- {"stop", (PyCFunction)py_stop_channel, METH_VARARGS | METH_KEYWORDS, "Stop the PWM channel. channel can be in the form of 'P8_10', or 'EHRPWM2A'"},
- { "set_duty_cycle", (PyCFunction)py_set_duty_cycle, METH_VARARGS | METH_KEYWORDS, "Change the duty cycle\ndutycycle - between 0.0 and 100.0" },
- { "set_frequency", (PyCFunction)py_set_frequency, METH_VARARGS | METH_KEYWORDS, "Change the frequency\nfrequency - frequency in Hz (freq > 0.0)" },
+ {"start", (PyCFunction)(void *)py_start_channel, METH_VARARGS | METH_KEYWORDS, "Set up and start the PWM channel. channel can be in the form of 'P8_10', or 'EHRPWM2A'"},
+ {"stop", (PyCFunction)(void *)py_stop_channel, METH_VARARGS | METH_KEYWORDS, "Stop the PWM channel. channel can be in the form of 'P8_10', or 'EHRPWM2A'"},
+ { "set_duty_cycle", (PyCFunction)(void *)py_set_duty_cycle, METH_VARARGS | METH_KEYWORDS, "Change the duty cycle\ndutycycle - between 0.0 and 100.0" },
+ { "set_frequency", (PyCFunction)(void *)py_set_frequency, METH_VARARGS | METH_KEYWORDS, "Change the frequency\nfrequency - frequency in Hz (freq > 0.0)" },
{"cleanup", py_cleanup, METH_VARARGS, "Clean up by resetting all GPIO channels that have been used by this program to INPUT with no pullup/pulldown and no event detection"},
//{"setwarnings", py_setwarnings, METH_VARARGS, "Enable or disable warning messages"},
{NULL, NULL, 0, NULL}
diff --git a/source/spimodule.c b/source/spimodule.c
index 3b94109..7e438bd 100644
--- a/source/spimodule.c
+++ b/source/spimodule.c
@@ -777,17 +777,17 @@ PyDoc_STRVAR(SPI_type_doc,
"specified SPI device interface.\n");
static PyMethodDef SPI_methods[] = {
- {"open", (PyCFunction)SPI_open, METH_VARARGS | METH_KEYWORDS,
+ {"open", (PyCFunction)(void *)SPI_open, METH_VARARGS | METH_KEYWORDS,
SPI_open_doc},
- {"close", (PyCFunction)SPI_close, METH_NOARGS,
+ {"close", (PyCFunction)(void *)SPI_close, METH_NOARGS,
SPI_close_doc},
- {"readbytes", (PyCFunction)SPI_readbytes, METH_VARARGS,
+ {"readbytes", (PyCFunction)(void *)SPI_readbytes, METH_VARARGS,
SPI_read_doc},
- {"writebytes", (PyCFunction)SPI_writebytes, METH_VARARGS,
+ {"writebytes", (PyCFunction)(void *)SPI_writebytes, METH_VARARGS,
SPI_write_doc},
- {"xfer", (PyCFunction)SPI_xfer, METH_VARARGS,
+ {"xfer", (PyCFunction)(void *)SPI_xfer, METH_VARARGS,
SPI_xfer_doc},
- {"xfer2", (PyCFunction)SPI_xfer2, METH_VARARGS,
+ {"xfer2", (PyCFunction)(void *)SPI_xfer2, METH_VARARGS,
SPI_xfer2_doc},
{NULL},
};
diff --git a/tox.ini b/tox.ini
index abaae1f..084648a 100644
--- a/tox.ini
+++ b/tox.ini
@@ -4,7 +4,7 @@
# and then run "tox" from this directory.
[tox]
-envlist = py27, py34
+envlist = py27, py36
[testenv]
commands = echo "run pytest on beaglebone"
pFad - Phonifier reborn
Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.
Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.
Alternative Proxies:
Alternative Proxy
pFad Proxy
pFad v3 Proxy
pFad v4 Proxy