Skip to content
This repository has been archived by the owner on Mar 28, 2020. It is now read-only.

Commit

Permalink
v2.22
Browse files Browse the repository at this point in the history
  • Loading branch information
MrYsLab authored and MrYsLab committed Jul 4, 2018
1 parent 7511b3e commit dbd577b
Show file tree
Hide file tree
Showing 13 changed files with 52 additions and 40 deletions.
Binary file modified FirmataPlus/libraries.zip
View file
Binary file not shown.
Binary file added FirmataPlus/source/libraries.zip
View file
Binary file not shown.
13 changes: 7 additions & 6 deletions FirmataPlus/source/libraries/FirmataPlus/FirmataPlus.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
FirmataPlus.h - Firmata library based on v2.5.3 - 2016-06-18 of Firmata
Copyright (C) 2006-2008 Hans-Christoph Steiner. All rights reserved.
Copyright (C) 2009-2015 Jeff Hoefs. All rights reserved.
Copyright (C) 2013-2016 Alan Yorinks. All rights reserved.
Copyright (C) 2013-2018 Alan Yorinks. All rights reserved.
This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
Expand Down Expand Up @@ -111,12 +111,13 @@
#define PIN_MODE_ONEWIRE 0x07 // pin configured for 1-wire
#define PIN_MODE_STEPPER 0x08 // pin configured for stepper motor
#define PIN_MODE_ENCODER 0x09 // pin configured for rotary encoders
#define PIN_MODE_TONE 0x0A
#define PIN_MODE_SONAR 0x0B
#define PIN_MODE_SERIAL 0x0C // pin configured for serial communication
#define PIN_MODE_PULLUP 0x0D // enable internal pull-up resistor for pin
#define PIN_MODE_SERIAL 0x0A
#define PIN_MODE_PULLUP 0x0B // enable internal pull-up resistor for pin
#define PIN_MODE_SONAR 0x0C // pin configured for HC-SR04
#define PIN_MODE_TONE 0x0D
#define PIN_MODE_PIXY 0x0E
#define PIN_MODE_IGNORE 0x7F // pin configured to be ignored by digitalWrite and capabilityResponse
#define TOTAL_PIN_MODES 15
#define TOTAL_PIN_MODES 17



Expand Down
13 changes: 7 additions & 6 deletions FirmataPlus/source/libraries/FirmataPlus32u4/FirmataPlus32u4.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
FirmataPlus.h - Firmata library based on v2.5.3 - 2016-06-18 of Firmata
Copyright (C) 2006-2008 Hans-Christoph Steiner. All rights reserved.
Copyright (C) 2009-2015 Jeff Hoefs. All rights reserved.
Copyright (C) 2013-2016 Alan Yorinks. All rights reserved.
Copyright (C) 2013-2018 Alan Yorinks. All rights reserved.
This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
Expand Down Expand Up @@ -110,12 +110,13 @@
#define PIN_MODE_ONEWIRE 0x07 // pin configured for 1-wire
#define PIN_MODE_STEPPER 0x08 // pin configured for stepper motor

#define PIN_MODE_TONE 0x0A
#define PIN_MODE_SONAR 0x0B
#define PIN_MODE_SERIAL 0x0C // pin configured for serial communication
#define PIN_MODE_PULLUP 0x0D // enable internal pull-up resistor for pin
#define PIN_MODE_SERIAL 0x0A
#define PIN_MODE_PULLUP 0x0B // enable internal pull-up resistor for pin
#define PIN_MODE_SONAR 0x0C // pin configured for HC-SR04
#define PIN_MODE_TONE 0x0D
#define PIN_MODE_PIXY 0x0E
#define PIN_MODE_IGNORE 0x7F // pin configured to be ignored by digitalWrite and capabilityResponse
#define TOTAL_PIN_MODES 15
#define TOTAL_PIN_MODES 17



Expand Down
15 changes: 8 additions & 7 deletions FirmataPlus/source/libraries/FirmataPlusLBT/FirmataPlusLBT.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
FirmataPlus.h - Firmata library based on v2.5.3 - 2016-06-18 of Firmata
Copyright (C) 2006-2008 Hans-Christoph Steiner. All rights reserved.
Copyright (C) 2009-2015 Jeff Hoefs. All rights reserved.
Copyright (C) 2013-2016 Alan Yorinks. All rights reserved.
Copyright (C) 2013-2018 Alan Yorinks. All rights reserved.
This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
Expand Down Expand Up @@ -110,13 +110,14 @@
#define PIN_MODE_I2C 0x06 // pin included in I2C setup
#define PIN_MODE_ONEWIRE 0x07 // pin configured for 1-wire
#define PIN_MODE_STEPPER 0x08 // pin configured for stepper motor
#define PIN_MODE_ENCODER 0x09 // pin configured for rotary encoders
#define PIN_MODE_TONE 0x0A
#define PIN_MODE_SONAR 0x0B
#define PIN_MODE_SERIAL 0x0C // pin configured for serial communication
#define PIN_MODE_PULLUP 0x0D // enable internal pull-up resistor for pin

#define PIN_MODE_SERIAL 0x0A
#define PIN_MODE_PULLUP 0x0B // enable internal pull-up resistor for pin
#define PIN_MODE_SONAR 0x0C // pin configured for HC-SR04
#define PIN_MODE_TONE 0x0D
#define PIN_MODE_PIXY 0x0E
#define PIN_MODE_IGNORE 0x7F // pin configured to be ignored by digitalWrite and capabilityResponse
#define TOTAL_PIN_MODES 15
#define TOTAL_PIN_MODES 17



Expand Down
15 changes: 8 additions & 7 deletions FirmataPlus/source/libraries/FirmataPlusRB/FirmataPlusRB.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
FirmataPlus.h - Firmata library based on v2.5.3 - 2016-06-18 of Firmata
Copyright (C) 2006-2008 Hans-Christoph Steiner. All rights reserved.
Copyright (C) 2009-2015 Jeff Hoefs. All rights reserved.
Copyright (C) 2013-2016 Alan Yorinks. All rights reserved.
Copyright (C) 2013-2018 Alan Yorinks. All rights reserved.
This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
Expand Down Expand Up @@ -110,13 +110,14 @@
#define PIN_MODE_I2C 0x06 // pin included in I2C setup
#define PIN_MODE_ONEWIRE 0x07 // pin configured for 1-wire
#define PIN_MODE_STEPPER 0x08 // pin configured for stepper motor
#define PIN_MODE_ENCODER 0x09 // pin configured for rotary encoders
#define PIN_MODE_TONE 0x0A
#define PIN_MODE_SONAR 0x0B
#define PIN_MODE_SERIAL 0x0C // pin configured for serial communication
#define PIN_MODE_PULLUP 0x0D // enable internal pull-up resistor for pin
#define
#define PIN_MODE_SERIAL 0x0A
#define PIN_MODE_PULLUP 0x0B // enable internal pull-up resistor for pin
#define PIN_MODE_SONAR 0x0C // pin configured for HC-SR04
#define PIN_MODE_TONE 0x0D
#define PIN_MODE_PIXY 0x0E
#define PIN_MODE_IGNORE 0x7F // pin configured to be ignored by digitalWrite and capabilityResponse
#define TOTAL_PIN_MODES 15
#define TOTAL_PIN_MODES 17



Expand Down
12 changes: 6 additions & 6 deletions FirmataPlus/source/libraries/FirmataPlusRBPixy/FirmataPlusRBPixy.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
FirmataPlus.h - Firmata library based on v2.5.3 - 2016-06-18 of Firmata
Copyright (C) 2006-2008 Hans-Christoph Steiner. All rights reserved.
Copyright (C) 2009-2015 Jeff Hoefs. All rights reserved.
Copyright (C) 2013-2016 Alan Yorinks. All rights reserved.
Copyright (C) 2013-2018 Alan Yorinks. All rights reserved.
This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
Expand Down Expand Up @@ -113,13 +113,13 @@
#define PIN_MODE_ONEWIRE 0x07 // pin configured for 1-wire
#define PIN_MODE_STEPPER 0x08 // pin configured for stepper motor
#define PIN_MODE_ENCODER 0x09 // pin configured for rotary encoders
#define PIN_MODE_TONE 0x0A
#define PIN_MODE_SONAR 0x0B
#define PIN_MODE_SERIAL 0x0C // pin configured for serial communication
#define PIN_MODE_PULLUP 0x0D // enable internal pull-up resistor for pin
#define PIN_MODE_SERIAL 0x0A
#define PIN_MODE_PULLUP 0x0B // enable internal pull-up resistor for pin
#define PIN_MODE_SONAR 0x0C // pin configured for HC-SR04
#define PIN_MODE_TONE 0x0D
#define PIN_MODE_PIXY 0x0E
#define PIN_MODE_IGNORE 0x7F // pin configured to be ignored by digitalWrite and capabilityResponse
#define TOTAL_PIN_MODES 16
#define TOTAL_PIN_MODES 17



Expand Down
5 changes: 5 additions & 0 deletions documentation/changelog.md
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
# Change Log

## Release 2.22
4 July 2018

* Aligned pin types with StandardFirmata to support pullup input

## Release 2.21
15 June 2018

Expand Down
11 changes: 7 additions & 4 deletions pymata_aio/constants.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,10 +30,13 @@ class Constants:
I2C = 0x06 # pin included in I2C setup
ONEWIRE = 0x07 # possible future feature
STEPPER = 0x08 # any pin in stepper mode
TONE = 0x09 # Any pin in TONE mode
ENCODER = 0x0a
SONAR = 0x0b # Any pin in SONAR mode
PIXY = 0x0c # Any pin used by Pixy camera
ENCODER = 0x09 # Any pin in encoder mode
SERIAL = 0x0a
PULLUP = 0x0b # Any pin in pullup mode
SONAR = 0x0c # Any pin in SONAR mode
TONE = 0x0d # Any pin in tone mode
PIXY = 0x0e # Any pin used by Pixy camera

IGNORE = 0x7f

# Tone commands
Expand Down
2 changes: 1 addition & 1 deletion pymata_aio/private_constants.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ class PrivateConstants:
SYSEX_REALTIME = 0x7F # MIDI Reserved for realtime messages

# reserved for PyMata
PYMATA_VERSION = "2.21"
PYMATA_VERSION = "2.22"

# each byte represents a digital port
# and its value contains the current port settings
Expand Down
2 changes: 1 addition & 1 deletion pymata_aio/pymata3.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -578,7 +578,7 @@ def set_pin_mode(self, pin_number, pin_state, callback=None, cb_type=None):
:param pin_number: Arduino Pin Number
:param pin_state: INPUT/OUTPUT/ANALOG/PWM - for SERVO use
:param pin_state: INPUT/OUTPUT/ANALOG/PWM/PULLUP - for SERVO use
servo_config()
:param callback: Optional: A reference to a call back function to be
Expand Down
2 changes: 1 addition & 1 deletion pymata_aio/pymata_core.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1094,7 +1094,7 @@ async def set_pin_mode(self, pin_number, pin_state, callback=None,
:param pin_number: Arduino Pin Number
:param pin_state: INPUT/OUTPUT/ANALOG/PWM - for SERVO use
:param pin_state: INPUT/OUTPUT/ANALOG/PWM/PULLUP - for SERVO use
servo_config()
:param callback: Optional: A reference to a call back function to be
Expand Down
2 changes: 1 addition & 1 deletion setup.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

setup(
name='pymata-aio',
version='2.21',
version='2.22',
packages=['pymata_aio'],
install_requires=['pyserial==2.7', 'websockets'],
url='https://github.com/MrYsLab/pymata-aio/wiki',
Expand Down

0 comments on commit dbd577b

Please sign in to comment.