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

Commit

Permalink
Release 2.28
Browse files Browse the repository at this point in the history
  • Loading branch information
MrYsLab authored and MrYsLab committed Nov 9, 2018
1 parent 949e62a commit 90f4075
Show file tree
Hide file tree
Showing 13 changed files with 28 additions and 22 deletions.
2 changes: 1 addition & 1 deletion FirmataPlus/source/libraries/FirmataPlus/FirmataPlus.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
FirmataPlus.cpp - Firmata library v2.5.3 - 2016-06-18
Copyright (c) 2006-2008 Hans-Christoph Steiner. All rights reserved.
Copyright (C) 2009-2016 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
18 changes: 9 additions & 9 deletions FirmataPlus/source/libraries/FirmataPlus/examples/FirmataPlus/FirmataPlus.ino
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
Copyright (C) 2010-2011 Paul Stoffregen. All rights reserved.
Copyright (C) 2009 Shigeru Kobayashi. All rights reserved.
Copyright (C) 2009-2011 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
Expand All @@ -27,8 +27,8 @@
formatted using the GNU C formatting and indenting
*/
/* This sketch provides additional functionality to StandardFirmata.

/* This sketch provides additional functionality to StandardFirmata.
It provides support for:
Tone
Stepper
Expand All @@ -45,8 +45,8 @@
#include <FirmataPlus.h>
#include <NewPing.h>
#include <Stepper.h>
#include <ooPinChangeInt.h>
#include <AdaEncoder.h>
#include <ooPinChangeInt.h>
#include <AdaEncoder.h>
#include <avr/wdt.h>

#define I2C_WRITE B00000000
Expand Down Expand Up @@ -678,7 +678,7 @@ void sysexCallback(byte command, byte argc, byte *argv)
case KEEP_ALIVE:
keepAliveInterval = argv[0] + (argv[1] << 7);
previousKeepAliveMillis = millis();
break;
break;
case SAMPLING_INTERVAL:
if (argc > 1) {
samplingInterval = argv[0] + (argv[1] << 7);
Expand Down Expand Up @@ -764,11 +764,11 @@ void sysexCallback(byte command, byte argc, byte *argv)
// requested pin designators
encoderPin1 = argv[0] ;
encoderPin2 = argv[1] ;
static AdaEncoder encoder =
static AdaEncoder encoder =
AdaEncoder('a', encoderPin1, encoderPin2) ;
//thisEncoder = &encoder ;
encoderPresent = true ;
break ;
break ;

case SERIAL_MESSAGE:
#ifdef FIRMATA_SERIAL_FEATURE
Expand Down Expand Up @@ -1116,7 +1116,7 @@ void loop()
currentMillis = millis();
if (currentMillis - previousKeepAliveMillis > keepAliveInterval*1000) {
systemResetCallback();

wdt_enable(WDTO_15MS);
// systemResetCallback();
while(1)
Expand Down
2 changes: 1 addition & 1 deletion FirmataPlus/source/libraries/FirmataPlus32u4/FirmataPlus32u4.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
FirmataPlus.cpp - Firmata library v2.5.3 - 2016-06-18
Copyright (c) 2006-2008 Hans-Christoph Steiner. All rights reserved.
Copyright (C) 2009-2016 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
2 changes: 1 addition & 1 deletion FirmataPlus/source/libraries/FirmataPlus32u4/examples/FirmataPlus32u4/FirmataPlus32u4.ino
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
Copyright (C) 2010-2011 Paul Stoffregen. All rights reserved.
Copyright (C) 2009 Shigeru Kobayashi. All rights reserved.
Copyright (C) 2009-2011 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
Expand Down
2 changes: 1 addition & 1 deletion FirmataPlus/source/libraries/FirmataPlusLBT/FirmataPlusLBT.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
FirmataPlus.cpp - Firmata library v2.5.3 - 2016-06-18
Copyright (c) 2006-2008 Hans-Christoph Steiner. All rights reserved.
Copyright (C) 2009-2016 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
2 changes: 1 addition & 1 deletion FirmataPlus/source/libraries/FirmataPlusLBT/examples/FirmataPlusLBT/FirmataPlusLBT.ino
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
Copyright (C) 2010-2011 Paul Stoffregen. All rights reserved.
Copyright (C) 2009 Shigeru Kobayashi. All rights reserved.
Copyright (C) 2009-2011 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
Expand Down
2 changes: 1 addition & 1 deletion FirmataPlus/source/libraries/FirmataPlusRB/FirmataPlusRB.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
FirmataPlus.cpp - Firmata library v2.5.3 - 2016-06-18
Copyright (c) 2006-2008 Hans-Christoph Steiner. All rights reserved.
Copyright (C) 2009-2016 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
6 changes: 3 additions & 3 deletions FirmataPlus/source/libraries/FirmataPlusRB/examples/FirmataPlusRB/FirmataPlusRB.ino
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
Copyright (C) 2010-2011 Paul Stoffregen. All rights reserved.
Copyright (C) 2009 Shigeru Kobayashi. All rights reserved.
Copyright (C) 2009-2015 Jeff Hoefs. All rights reserved.
Copyright (C) 2013-2015 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 @@ -683,7 +683,7 @@ void sysexCallback(byte command, byte argc, byte *argv)
case KEEP_ALIVE:
keepAliveInterval = argv[0] + (argv[1] << 7);
previousKeepAliveMillis = millis();
break;
break;
case SAMPLING_INTERVAL:
if (argc > 1) {
samplingInterval = argv[0] + (argv[1] << 7);
Expand Down Expand Up @@ -939,7 +939,7 @@ void disableI2CPins() {
void systemResetCallback()
{
isResetting = true;

encoderPresent = false;

// initialize a defalt state
Expand Down
2 changes: 1 addition & 1 deletion FirmataPlus/source/libraries/FirmataPlusRBPixy/FirmataPlusRBPixy.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
FirmataPlus.cpp - Firmata library v2.5.3 - 2016-06-18
Copyright (c) 2006-2008 Hans-Christoph Steiner. All rights reserved.
Copyright (C) 2009-2016 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
2 changes: 1 addition & 1 deletion ...aPlus/source/libraries/FirmataPlusRBPixy/examples/FirmataPlusRBPixy/FirmataPlusRBPixy.ino
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
Copyright (C) 2010-2011 Paul Stoffregen. All rights reserved.
Copyright (C) 2009 Shigeru Kobayashi. All rights reserved.
Copyright (C) 2009-2015 Jeff Hoefs. All rights reserved.
Copyright (C) 2013-2015 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
6 changes: 6 additions & 0 deletions documentation/changelog.md
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,11 @@
# Change Log

## Release 2.28
09 November 2018

* Fixed issue #87
* Updated copyright strings for FirmataPlus files - no code changes

## Release 2.27
22 October 2018

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.27"
PYMATA_VERSION = "2.28"

# each byte represents a digital port
# and its value contains the current port settings
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.27',
version='2.28',
packages=['pymata_aio', 'utilities'],
install_requires=['pyserial', 'websockets'],
entry_points={
Expand Down

0 comments on commit 90f4075

Please sign in to comment.