diff --git a/FirmataPlus/source/libraries/FirmataPlus/FirmataPlus.cpp b/FirmataPlus/source/libraries/FirmataPlus/FirmataPlus.cpp index a83af02..5027a48 100644 --- a/FirmataPlus/source/libraries/FirmataPlus/FirmataPlus.cpp +++ b/FirmataPlus/source/libraries/FirmataPlus/FirmataPlus.cpp @@ -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 diff --git a/FirmataPlus/source/libraries/FirmataPlus/examples/FirmataPlus/FirmataPlus.ino b/FirmataPlus/source/libraries/FirmataPlus/examples/FirmataPlus/FirmataPlus.ino index 6a49af9..115bf6d 100644 --- a/FirmataPlus/source/libraries/FirmataPlus/examples/FirmataPlus/FirmataPlus.ino +++ b/FirmataPlus/source/libraries/FirmataPlus/examples/FirmataPlus/FirmataPlus.ino @@ -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 @@ -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 @@ -45,8 +45,8 @@ #include #include #include -#include -#include +#include +#include #include #define I2C_WRITE B00000000 @@ -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); @@ -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 @@ -1116,7 +1116,7 @@ void loop() currentMillis = millis(); if (currentMillis - previousKeepAliveMillis > keepAliveInterval*1000) { systemResetCallback(); - + wdt_enable(WDTO_15MS); // systemResetCallback(); while(1) diff --git a/FirmataPlus/source/libraries/FirmataPlus32u4/FirmataPlus32u4.cpp b/FirmataPlus/source/libraries/FirmataPlus32u4/FirmataPlus32u4.cpp index 8c2b8eb..ec22cf6 100644 --- a/FirmataPlus/source/libraries/FirmataPlus32u4/FirmataPlus32u4.cpp +++ b/FirmataPlus/source/libraries/FirmataPlus32u4/FirmataPlus32u4.cpp @@ -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 diff --git a/FirmataPlus/source/libraries/FirmataPlus32u4/examples/FirmataPlus32u4/FirmataPlus32u4.ino b/FirmataPlus/source/libraries/FirmataPlus32u4/examples/FirmataPlus32u4/FirmataPlus32u4.ino index 2f26ec6..b320069 100644 --- a/FirmataPlus/source/libraries/FirmataPlus32u4/examples/FirmataPlus32u4/FirmataPlus32u4.ino +++ b/FirmataPlus/source/libraries/FirmataPlus32u4/examples/FirmataPlus32u4/FirmataPlus32u4.ino @@ -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 diff --git a/FirmataPlus/source/libraries/FirmataPlusLBT/FirmataPlusLBT.cpp b/FirmataPlus/source/libraries/FirmataPlusLBT/FirmataPlusLBT.cpp index fe23269..d2959b1 100644 --- a/FirmataPlus/source/libraries/FirmataPlusLBT/FirmataPlusLBT.cpp +++ b/FirmataPlus/source/libraries/FirmataPlusLBT/FirmataPlusLBT.cpp @@ -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 diff --git a/FirmataPlus/source/libraries/FirmataPlusLBT/examples/FirmataPlusLBT/FirmataPlusLBT.ino b/FirmataPlus/source/libraries/FirmataPlusLBT/examples/FirmataPlusLBT/FirmataPlusLBT.ino index af877a5..e272af1 100644 --- a/FirmataPlus/source/libraries/FirmataPlusLBT/examples/FirmataPlusLBT/FirmataPlusLBT.ino +++ b/FirmataPlus/source/libraries/FirmataPlusLBT/examples/FirmataPlusLBT/FirmataPlusLBT.ino @@ -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 diff --git a/FirmataPlus/source/libraries/FirmataPlusRB/FirmataPlusRB.cpp b/FirmataPlus/source/libraries/FirmataPlusRB/FirmataPlusRB.cpp index 8c78712..7af1e8a 100644 --- a/FirmataPlus/source/libraries/FirmataPlusRB/FirmataPlusRB.cpp +++ b/FirmataPlus/source/libraries/FirmataPlusRB/FirmataPlusRB.cpp @@ -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 diff --git a/FirmataPlus/source/libraries/FirmataPlusRB/examples/FirmataPlusRB/FirmataPlusRB.ino b/FirmataPlus/source/libraries/FirmataPlusRB/examples/FirmataPlusRB/FirmataPlusRB.ino index aeb82b1..3d2ff5b 100644 --- a/FirmataPlus/source/libraries/FirmataPlusRB/examples/FirmataPlusRB/FirmataPlusRB.ino +++ b/FirmataPlus/source/libraries/FirmataPlusRB/examples/FirmataPlusRB/FirmataPlusRB.ino @@ -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 @@ -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); @@ -939,7 +939,7 @@ void disableI2CPins() { void systemResetCallback() { isResetting = true; - + encoderPresent = false; // initialize a defalt state diff --git a/FirmataPlus/source/libraries/FirmataPlusRBPixy/FirmataPlusRBPixy.cpp b/FirmataPlus/source/libraries/FirmataPlusRBPixy/FirmataPlusRBPixy.cpp index 31b1842..d091b76 100644 --- a/FirmataPlus/source/libraries/FirmataPlusRBPixy/FirmataPlusRBPixy.cpp +++ b/FirmataPlus/source/libraries/FirmataPlusRBPixy/FirmataPlusRBPixy.cpp @@ -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 diff --git a/FirmataPlus/source/libraries/FirmataPlusRBPixy/examples/FirmataPlusRBPixy/FirmataPlusRBPixy.ino b/FirmataPlus/source/libraries/FirmataPlusRBPixy/examples/FirmataPlusRBPixy/FirmataPlusRBPixy.ino index 51d7359..08c562e 100644 --- a/FirmataPlus/source/libraries/FirmataPlusRBPixy/examples/FirmataPlusRBPixy/FirmataPlusRBPixy.ino +++ b/FirmataPlus/source/libraries/FirmataPlusRBPixy/examples/FirmataPlusRBPixy/FirmataPlusRBPixy.ino @@ -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 diff --git a/documentation/changelog.md b/documentation/changelog.md index 0f34f58..f8360f0 100644 --- a/documentation/changelog.md +++ b/documentation/changelog.md @@ -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 diff --git a/pymata_aio/private_constants.py b/pymata_aio/private_constants.py index 7ecd9ec..93b7684 100644 --- a/pymata_aio/private_constants.py +++ b/pymata_aio/private_constants.py @@ -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 diff --git a/setup.py b/setup.py index 06e62e9..1058fb7 100644 --- a/setup.py +++ b/setup.py @@ -6,7 +6,7 @@ setup( name='pymata-aio', - version='2.27', + version='2.28', packages=['pymata_aio', 'utilities'], install_requires=['pyserial', 'websockets'], entry_points={