From bf0b7aa1ae0b74892390071c2c6b8fb7e4a1ddc5 Mon Sep 17 00:00:00 2001 From: wamisnet Date: Mon, 19 Feb 2018 00:41:48 +0900 Subject: [PATCH 01/18] =?UTF-8?q?NefryBTr2=E7=94=A8=E3=83=87=E3=82=A3?= =?UTF-8?q?=E3=82=B9=E3=83=97=E3=83=AC=E3=82=A4+I2C=E5=AF=BE=E5=BF=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- cores/esp32/nefry/inc/ssd1306/SSD1306Wire.h | 31 +++++++++++---------- 1 file changed, 16 insertions(+), 15 deletions(-) diff --git a/cores/esp32/nefry/inc/ssd1306/SSD1306Wire.h b/cores/esp32/nefry/inc/ssd1306/SSD1306Wire.h index 1cb7ab23e6e..838361a45d4 100644 --- a/cores/esp32/nefry/inc/ssd1306/SSD1306Wire.h +++ b/cores/esp32/nefry/inc/ssd1306/SSD1306Wire.h @@ -32,6 +32,7 @@ #include "../Wire/src/Wire.h" class SSD1306Wire : public OLEDDisplay { + TwoWire wireDevice = TwoWire(1); private: uint8_t _address; uint8_t _sda; @@ -45,10 +46,10 @@ class SSD1306Wire : public OLEDDisplay { } bool connect() { - Wire.begin(this->_sda, this->_scl); + wireDevice.begin(this->_sda, this->_scl); // Let's use ~700khz if ESP8266 is in 160Mhz mode // this will be limited to ~400khz if the ESP8266 in 80Mhz mode. - Wire.setClock(700000); + wireDevice.setClock(700000); return true; } @@ -94,13 +95,13 @@ class SSD1306Wire : public OLEDDisplay { for (y = minBoundY; y <= maxBoundY; y++) { for (x = minBoundX; x <= maxBoundX; x++) { if (k == 0) { - Wire.beginTransmission(_address); - Wire.write(0x40); + wireDevice.beginTransmission(_address); + wireDevice.write(0x40); } - Wire.write(buffer[x + y * DISPLAY_WIDTH]); + wireDevice.write(buffer[x + y * DISPLAY_WIDTH]); k++; if (k == 16) { - Wire.endTransmission(); + wireDevice.endTransmission(); k = 0; } } @@ -108,7 +109,7 @@ class SSD1306Wire : public OLEDDisplay { } if (k != 0) { - Wire.endTransmission(); + wireDevice.endTransmission(); } #else @@ -121,24 +122,24 @@ class SSD1306Wire : public OLEDDisplay { sendCommand(0x7); for (uint16_t i=0; i < DISPLAY_BUFFER_SIZE; i++) { - Wire.beginTransmission(this->_address); - Wire.write(0x40); + wireDevice.beginTransmission(this->_address); + wireDevice.write(0x40); for (uint8_t x = 0; x < 16; x++) { - Wire.write(buffer[i]); + wireDevice.write(buffer[i]); i++; } i--; - Wire.endTransmission(); + wireDevice.endTransmission(); } #endif } private: inline void sendCommand(uint8_t command) __attribute__((always_inline)){ - Wire.beginTransmission(_address); - Wire.write(0x80); - Wire.write(command); - Wire.endTransmission(); + wireDevice.beginTransmission(_address); + wireDevice.write(0x80); + wireDevice.write(command); + wireDevice.endTransmission(); } From e749d6380245ce9ce37bf2ff25d76b0ddc083c3b Mon Sep 17 00:00:00 2001 From: wamisnet Date: Mon, 12 Mar 2018 00:50:22 +0900 Subject: [PATCH 02/18] =?UTF-8?q?gitgnore=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index a686ac78564..14a3c7ac29a 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ tools/xtensa-esp32-elf tools/dist tools/esptool tools/esptool.exe +.vs/ From 43d4aabf3082f1e87dacc36f552dd4170ca5b91a Mon Sep 17 00:00:00 2001 From: wamisnet Date: Tue, 13 Mar 2018 00:02:21 +0900 Subject: [PATCH 03/18] =?UTF-8?q?#96=E3=80=80=E5=AF=BE=E5=BF=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../examples/FullColorLED/FullColorLED.ino | 24 ++++++++++++------- 1 file changed, 15 insertions(+), 9 deletions(-) diff --git a/libraries/Nefry/examples/FullColorLED/FullColorLED.ino b/libraries/Nefry/examples/FullColorLED/FullColorLED.ino index 17dab9d7d77..fc9c4850d8d 100644 --- a/libraries/Nefry/examples/FullColorLED/FullColorLED.ino +++ b/libraries/Nefry/examples/FullColorLED/FullColorLED.ino @@ -1,14 +1,20 @@ #include -//フルカラーLED　ランダムに色が変わります。 +#include +//フルカラーLED　順番に色が変わります。 void setup() { Nefry.setProgramName("FullColorLED"); //プログラム名を管理することができます。 - randomSeed(analogRead(A0)); } -int red,green,blue; void loop() { - red=random(255); //random関数は0-255の数値をランダムに返します。 - green=random(255); - blue=random(255); - Nefry.setLed(red,green,blue); //LEDがランダムに点灯します。 - delay(1000); //1秒待つ -} + NefryDisplay.print("Red"); + Nefry.setLed(255, 0, 0); //LEDが赤色に点灯します。 + delay(5000); //5秒待つ + NefryDisplay.print("Green"); + Nefry.setLed(0, 255, 0); //LEDが緑色に点灯します。 + delay(5000); //5秒待つ + NefryDisplay.print("Blue"); + Nefry.setLed(0, 0, 255); //LEDが青色に点灯します。 + delay(5000); //5秒待つ + NefryDisplay.print("OFF"); + Nefry.setLed(0, 0, 0); //LEDが消灯します。 + delay(5000); //5秒待つ +} \ No newline at end of file From f787d18bac21a39f9bdd88b3b626a48faa9d0ab5 Mon Sep 17 00:00:00 2001 From: wamisnet Date: Tue, 13 Mar 2018 00:51:50 +0900 Subject: [PATCH 04/18] =?UTF-8?q?Dialog=E3=81=AE=E3=82=BF=E3=82=A4?= =?UTF-8?q?=E3=83=88=E3=83=AB=E7=B7=A8=E9=9B=86=E3=82=92=E3=81=A7=E3=81=8D?= =?UTF-8?q?=E3=82=8B=E3=82=88=E3=81=86=E3=81=AB=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- cores/esp32/nefry/NefryDisplay.cpp | 8 ++++++-- cores/esp32/nefry/NefryDisplay.h | 2 ++ libraries/Nefry_Display/NefryDisplay.h | 2 ++ libraries/Nefry_Display/keywords.txt | 1 + 4 files changed, 11 insertions(+), 2 deletions(-) diff --git a/cores/esp32/nefry/NefryDisplay.cpp b/cores/esp32/nefry/NefryDisplay.cpp index f44da0bb808..8f389e1fd53 100644 --- a/cores/esp32/nefry/NefryDisplay.cpp +++ b/cores/esp32/nefry/NefryDisplay.cpp @@ -4,7 +4,7 @@ SSD1306 _nefrySsdDisplay(0x3c, SDA2, SCL2); String _nefryPrintDisplay1 = "", _nefryPrintDisplay2 = "", _nefryPrintDisplay3 = ""; - +String _dialogTitle = "Nefry PrintDialog"; /* 初期化 */ bool Nefry_Display::begin() { @@ -19,9 +19,13 @@ bool Nefry_Display::begin() return true; } +void Nefry_Display::setTitle(String title) { + _dialogTitle = title; +} + void setPrintDialogDisplay() { NefryDisplay.setFont(Arimo_12); - NefryDisplay.drawString(15, 0,"Nefry PrintDialog"); + NefryDisplay.drawString(15, 0, _dialogTitle); NefryDisplay.drawStringWithHScroll(0, 20, _nefryPrintDisplay1,10); NefryDisplay.drawStringWithHScroll(0, 35, _nefryPrintDisplay2, 10); NefryDisplay.drawStringWithHScroll(0, 50, _nefryPrintDisplay3, 10); diff --git a/cores/esp32/nefry/NefryDisplay.h b/cores/esp32/nefry/NefryDisplay.h index 71d86c410ee..fa40e3fb333 100644 --- a/cores/esp32/nefry/NefryDisplay.h +++ b/cores/esp32/nefry/NefryDisplay.h @@ -110,6 +110,8 @@ class Nefry_Display void autoScrollTask (); + void setTitle(String title); + private: GeneralFunction _func = NULL; uint16_t _scrollTextCount = 0; diff --git a/libraries/Nefry_Display/NefryDisplay.h b/libraries/Nefry_Display/NefryDisplay.h index 6f776801d0a..d9d3361a71c 100644 --- a/libraries/Nefry_Display/NefryDisplay.h +++ b/libraries/Nefry_Display/NefryDisplay.h @@ -110,6 +110,8 @@ class Nefry_Display void autoScrollTask(); + void setTitle(String title); + private: GeneralFunction _func = NULL; uint16_t _scrollTextCount = 0; diff --git a/libraries/Nefry_Display/keywords.txt b/libraries/Nefry_Display/keywords.txt index 7e3185c3c6c..d0b4dd8c57a 100644 --- a/libraries/Nefry_Display/keywords.txt +++ b/libraries/Nefry_Display/keywords.txt @@ -15,6 +15,7 @@ drawString KEYWORD2 getStringWidth KEYWORD2 setTextAlignment KEYWORD2 setFont KEYWORD2 +setTitle KEYWORD2 setPixel KEYWORD2 drawLine KEYWORD2 drawRect KEYWORD2 From 6b56b8b39c1cdefae090b78c847aa6f7865b808e Mon Sep 17 00:00:00 2001 From: wamisnet Date: Tue, 13 Mar 2018 01:01:40 +0900 Subject: [PATCH 05/18] =?UTF-8?q?Nefry=20BT=20r3=E8=BF=BD=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- variants/nefrybt-r3/pins_arduino.h | 54 ++++++++++++++++++++++++++++++ 1 file changed, 54 insertions(+) create mode 100644 variants/nefrybt-r3/pins_arduino.h diff --git a/variants/nefrybt-r3/pins_arduino.h b/variants/nefrybt-r3/pins_arduino.h new file mode 100644 index 00000000000..e21ab6f0860 --- /dev/null +++ b/variants/nefrybt-r3/pins_arduino.h @@ -0,0 +1,54 @@ +#ifndef Pins_Arduino_h +#define Pins_Arduino_h + +#include + +#define EXTERNAL_NUM_INTERRUPTS 16 +#define NUM_DIGITAL_PINS 40 +#define NUM_ANALOG_INPUTS 16 + +#define analogInputToDigitalPin(p) (((p)<20)?(esp32_adc2gpio[(p)]):-1) +#define digitalPinToInterrupt(p) (((p)<40)?(p):-1) +#define digitalPinHasPWM(p) (p < 34) + +static const uint8_t TX = 1; +static const uint8_t RX = 3; + +static const uint8_t SDA = 21; +static const uint8_t SCL = 22; + +//Display +static const uint8_t SDA2 = 17; +static const uint8_t SCL2 = 5; + +static const uint8_t SS = 25; +static const uint8_t MOSI = 23; +static const uint8_t MISO = 19; +static const uint8_t SCK = 18; + +static const uint8_t D0 = 22; +static const uint8_t D1 = 21; +static const uint8_t D2 = 23; +static const uint8_t D3 = 18; +static const uint8_t D4 = 19; +static const uint8_t D5 = 25; +static const uint8_t D6 = 26; +static const uint8_t D7 = 13; +static const uint8_t D8 = 14; + +static const uint8_t A0 = 33; +static const uint8_t A1 = 32; +static const uint8_t A2 = 39; +static const uint8_t A3 = 36; + +static const uint8_t T0 = 13; +static const uint8_t T1 = 14; +static const uint8_t T2 = 33; +static const uint8_t T3 = 32; + +static const uint8_t DAC1 = 25; +static const uint8_t DAC2 = 26; + +static const uint8_t boardId = 3;//Nefry BT R3 + +#endif /* Pins_Arduino_h */ From f2a0875e343393e0ec1cb982452eac649dc2baea Mon Sep 17 00:00:00 2001 From: wamisnet Date: Tue, 13 Mar 2018 02:26:09 +0900 Subject: [PATCH 06/18] =?UTF-8?q?LED=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- cores/esp32/nefry/Nefry.cpp | 46 +- cores/esp32/nefry/Nefry.h | 5 +- cores/esp32/nefry/inc/SPI/keywords.txt | 36 + cores/esp32/nefry/inc/SPI/library.properties | 9 + cores/esp32/nefry/inc/SPI/src/SPI.cpp | 278 ++++++ cores/esp32/nefry/inc/SPI/src/SPI.h | 85 ++ .../esp32/nefry/inc/led/Adafruit_DotStar.cpp | 417 +++++++++ cores/esp32/nefry/inc/led/Adafruit_DotStar.h | 95 +++ cores/esp32/nefry/inc/led/COPYING | 794 ++++++++++++++++++ cores/esp32/nefry/inc/led/README.md | 2 + .../led/examples/strandtest/strandtest.ino | 58 ++ cores/esp32/nefry/inc/led/library.properties | 9 + libraries/Nefry/Nefry.h | 2 +- variants/esp32/pins_arduino.h | 3 + variants/nefrybt-r2/pins_arduino.h | 3 + variants/nefrybt-r3/pins_arduino.h | 3 + variants/nefrybt/pins_arduino.h | 3 + 17 files changed, 1832 insertions(+), 16 deletions(-) create mode 100644 cores/esp32/nefry/inc/SPI/keywords.txt create mode 100644 cores/esp32/nefry/inc/SPI/library.properties create mode 100644 cores/esp32/nefry/inc/SPI/src/SPI.cpp create mode 100644 cores/esp32/nefry/inc/SPI/src/SPI.h create mode 100644 cores/esp32/nefry/inc/led/Adafruit_DotStar.cpp create mode 100644 cores/esp32/nefry/inc/led/Adafruit_DotStar.h create mode 100644 cores/esp32/nefry/inc/led/COPYING create mode 100644 cores/esp32/nefry/inc/led/README.md create mode 100644 cores/esp32/nefry/inc/led/examples/strandtest/strandtest.ino create mode 100644 cores/esp32/nefry/inc/led/library.properties diff --git a/cores/esp32/nefry/Nefry.cpp b/cores/esp32/nefry/Nefry.cpp index 9867d177c40..10494935c22 100644 --- a/cores/esp32/nefry/Nefry.cpp +++ b/cores/esp32/nefry/Nefry.cpp @@ -27,15 +27,19 @@ BootMode #define LIBVERSION ("1.2.0") #include "Nefry.h" -Adafruit_NeoPixel _NefryLED[40]; - +Adafruit_NeoPixel _NefryLEDNeo; +Adafruit_DotStar _NefryLEDStar; //main void Nefry_lib::nefry_init() { /* Display設定 */ delay(10); NefryDisplay.begin();//logo表示 - beginLed((const int)1, (const int)16, (uint8_t)NEO_GRBW); + if (boardId == 3) { + beginLed((const int)1, (const int)LED_DO, (uint8_t)DOTSTAR_BRG, LED_CLK); + } else { + beginLed((const int)1, (const int)16, (uint8_t)NEO_GRBW); + } setLedBlink(0, 0, 0, false, 0); setLed(0x00, 0x0f, 0x00); enableSW(); @@ -289,18 +293,34 @@ bool Nefry_lib::getPollingSW() } //LED -void Nefry_lib::beginLed(const int num, const int pin, uint8_t t = NEO_GRB) { - _NefryLED[pin] = Adafruit_NeoPixel(num, pin, t); - _NefryLED[pin].begin(); +void Nefry_lib::beginLed(const int num, const int DataOut, uint8_t t ,const int clk) { + if (boardId == 3) { // Nefry BT r3 + _NefryLEDStar = Adafruit_DotStar(num, DataOut, clk, DOTSTAR_BRG); + _NefryLEDStar.begin(); + _NefryLEDStar.show(); + } + else { + _NefryLEDNeo = Adafruit_NeoPixel(num, DataOut, t); + _NefryLEDNeo.begin(); + _NefryLEDNeo.show(); + } } + void Nefry_lib::setLed(const int r, const int g, const int b, const char w, const int pin, const int num) { - _NefryLED[pin].setPixelColor(num,0, 0, 0); - delay(1); - _NefryLED[pin].show(); - _NefryLED[pin].setBrightness(w); - _NefryLED[pin].setPixelColor(num, map(r,0,255,0,150), g, b); - delay(1); - _NefryLED[pin].show(); + if (boardId == 3) { // Nefry BT r3 + _NefryLEDStar.setBrightness(w); + _NefryLEDStar.setPixelColor(num, r, g, b); + _NefryLEDStar.show(); + } + else { + _NefryLEDNeo.setPixelColor(num, 0, 0, 0); + delay(1); + _NefryLEDNeo.show(); + _NefryLEDNeo.setBrightness(w); + _NefryLEDNeo.setPixelColor(num, map(r, 0, 255, 0, 150), g, b); + delay(1); + _NefryLEDNeo.show(); + } } void Nefry_lib::setLed(String _colorStr, const char w, const int pin, const int num) { int _color[3]; diff --git a/cores/esp32/nefry/Nefry.h b/cores/esp32/nefry/Nefry.h index 8b556d38c5c..46c8b230e98 100644 --- a/cores/esp32/nefry/Nefry.h +++ b/cores/esp32/nefry/Nefry.h @@ -2,6 +2,7 @@ #define Nefry_h #include +#include "./inc/led/Adafruit_DotStar.h" #include "./inc/led/Adafruit_NeoPixel.h" #include "./inc/Preferences/src/Preferences.h" #include "NefryWiFi.h" @@ -65,8 +66,8 @@ class Nefry_lib void reset(), sleep(const int sec), - setProgramName(const char * pn), - beginLed(const int num, const int pin, uint8_t t), + setProgramName(const char * pn), + beginLed(const int num, const int dataOut, uint8_t t = 0, const int clk = -1), setLed(const int r, const int g, const int b, const char w = 80, const int pin = 16, const int num = 0), setLed(String _colorStr, const char w = 122, const int pin = 16, const int num = 0), addWiFi(String ssid, String pass), diff --git a/cores/esp32/nefry/inc/SPI/keywords.txt b/cores/esp32/nefry/inc/SPI/keywords.txt new file mode 100644 index 00000000000..fa7616581aa --- /dev/null +++ b/cores/esp32/nefry/inc/SPI/keywords.txt @@ -0,0 +1,36 @@ +####################################### +# Syntax Coloring Map SPI +####################################### + +####################################### +# Datatypes (KEYWORD1) +####################################### + +SPI KEYWORD1 + +####################################### +# Methods and Functions (KEYWORD2) +####################################### +begin KEYWORD2 +end KEYWORD2 +transfer KEYWORD2 +setBitOrder KEYWORD2 +setDataMode KEYWORD2 +setClockDivider KEYWORD2 + + +####################################### +# Constants (LITERAL1) +####################################### +SPI_CLOCK_DIV4 LITERAL1 +SPI_CLOCK_DIV16 LITERAL1 +SPI_CLOCK_DIV64 LITERAL1 +SPI_CLOCK_DIV128 LITERAL1 +SPI_CLOCK_DIV2 LITERAL1 +SPI_CLOCK_DIV8 LITERAL1 +SPI_CLOCK_DIV32 LITERAL1 +SPI_CLOCK_DIV64 LITERAL1 +SPI_MODE0 LITERAL1 +SPI_MODE1 LITERAL1 +SPI_MODE2 LITERAL1 +SPI_MODE3 LITERAL1 \ No newline at end of file diff --git a/cores/esp32/nefry/inc/SPI/library.properties b/cores/esp32/nefry/inc/SPI/library.properties new file mode 100644 index 00000000000..9e8f805da75 --- /dev/null +++ b/cores/esp32/nefry/inc/SPI/library.properties @@ -0,0 +1,9 @@ +name=SPI +version=1.0 +author=Hristo Gochkov +maintainer=Hristo Gochkov +sentence=Enables the communication with devices that use the Serial Peripheral Interface (SPI) Bus. For all Arduino boards, BUT Arduino DUE. +paragraph= +category=Signal Input/Output +url=http://arduino.cc/en/Reference/SPI +architectures=esp32 diff --git a/cores/esp32/nefry/inc/SPI/src/SPI.cpp b/cores/esp32/nefry/inc/SPI/src/SPI.cpp new file mode 100644 index 00000000000..e1e7a15c54f --- /dev/null +++ b/cores/esp32/nefry/inc/SPI/src/SPI.cpp @@ -0,0 +1,278 @@ +/* + SPI.cpp - SPI library for esp8266 + + Copyright (c) 2015 Hristo Gochkov. All rights reserved. + This file is part of the esp8266 core for Arduino environment. + + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + This library 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 + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with this library; if not, write to the Free Software + Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + */ + +#include "SPI.h" + +SPIClass::SPIClass(uint8_t spi_bus) + :_spi_num(spi_bus) + ,_spi(NULL) + ,_use_hw_ss(false) + ,_sck(-1) + ,_miso(-1) + ,_mosi(-1) + ,_ss(-1) + ,_div(0) + ,_freq(1000000) + , _inTransaction(false) +{} + +void SPIClass::begin(int8_t sck, int8_t miso, int8_t mosi, int8_t ss) +{ + if(_spi) { + return; + } + + if(!_div) { + _div = spiFrequencyToClockDiv(_freq); + } + + _spi = spiStartBus(_spi_num, _div, SPI_MODE0, SPI_MSBFIRST); + if(!_spi) { + return; + } + + _sck = sck; + _miso = miso; + _mosi = mosi; + _ss = ss; + + spiAttachSCK(_spi, _sck); + spiAttachMISO(_spi, _miso); + spiAttachMOSI(_spi, _mosi); + +} + +void SPIClass::end() +{ + if(!_spi) { + return; + } + spiDetachSCK(_spi, _sck); + spiDetachMISO(_spi, _miso); + spiDetachMOSI(_spi, _mosi); + setHwCs(false); + spiStopBus(_spi); + _spi = NULL; +} + +void SPIClass::setHwCs(bool use) +{ + if(use && !_use_hw_ss) { + spiAttachSS(_spi, 0, _ss); + spiSSEnable(_spi); + } else if(_use_hw_ss) { + spiSSDisable(_spi); + spiDetachSS(_spi, _ss); + } + _use_hw_ss = use; +} + +void SPIClass::setFrequency(uint32_t freq) +{ + //check if last freq changed + uint32_t cdiv = spiGetClockDiv(_spi); + if(_freq != freq || _div != cdiv) { + _freq = freq; + _div = spiFrequencyToClockDiv(_freq); + spiSetClockDiv(_spi, _div); + } +} + +void SPIClass::setClockDivider(uint32_t clockDiv) +{ + _div = clockDiv; + spiSetClockDiv(_spi, _div); +} + +void SPIClass::setDataMode(uint8_t dataMode) +{ + spiSetDataMode(_spi, dataMode); +} + +void SPIClass::setBitOrder(uint8_t bitOrder) +{ + spiSetBitOrder(_spi, bitOrder); +} + +void SPIClass::beginTransaction(SPISettings settings) +{ + //check if last freq changed + uint32_t cdiv = spiGetClockDiv(_spi); + if(_freq != settings._clock || _div != cdiv) { + _freq = settings._clock; + _div = spiFrequencyToClockDiv(_freq); + } + spiTransaction(_spi, _div, settings._dataMode, settings._bitOrder); + _inTransaction = true; +} + +void SPIClass::endTransaction() +{ + if(_inTransaction){ + spiEndTransaction(_spi); + _inTransaction = false; + } +} + +void SPIClass::write(uint8_t data) +{ + if(_inTransaction){ + return spiWriteByteNL(_spi, data); + } + spiWriteByte(_spi, data); +} + +uint8_t SPIClass::transfer(uint8_t data) +{ + if(_inTransaction){ + return spiTransferByteNL(_spi, data); + } + return spiTransferByte(_spi, data); +} + +void SPIClass::write16(uint16_t data) +{ + if(_inTransaction){ + return spiWriteShortNL(_spi, data); + } + spiWriteWord(_spi, data); +} + +uint16_t SPIClass::transfer16(uint16_t data) +{ + if(_inTransaction){ + return spiTransferShortNL(_spi, data); + } + return spiTransferWord(_spi, data); +} + +void SPIClass::write32(uint32_t data) +{ + if(_inTransaction){ + return spiWriteLongNL(_spi, data); + } + spiWriteLong(_spi, data); +} + +uint32_t SPIClass::transfer32(uint32_t data) +{ + if(_inTransaction){ + return spiTransferLongNL(_spi, data); + } + return spiTransferLong(_spi, data); +} + +void SPIClass::transferBits(uint32_t data, uint32_t * out, uint8_t bits) +{ + if(_inTransaction){ + return spiTransferBitsNL(_spi, data, out, bits); + } + spiTransferBits(_spi, data, out, bits); +} + +/** + * @param data uint8_t * + * @param size uint32_t + */ +void SPIClass::writeBytes(uint8_t * data, uint32_t size) +{ + if(_inTransaction){ + return spiWriteNL(_spi, data, size); + } + spiSimpleTransaction(_spi); + spiWriteNL(_spi, data, size); + spiEndTransaction(_spi); +} + +/** + * @param data void * + * @param size uint32_t + */ +void SPIClass::writePixels(const void * data, uint32_t size) +{ + if(_inTransaction){ + return spiWritePixelsNL(_spi, data, size); + } + spiSimpleTransaction(_spi); + spiWritePixelsNL(_spi, data, size); + spiEndTransaction(_spi); +} + +/** + * @param data uint8_t * data buffer. can be NULL for Read Only operation + * @param out uint8_t * output buffer. can be NULL for Write Only operation + * @param size uint32_t + */ +void SPIClass::transferBytes(uint8_t * data, uint8_t * out, uint32_t size) +{ + if(_inTransaction){ + return spiTransferBytesNL(_spi, data, out, size); + } + spiTransferBytes(_spi, data, out, size); +} + +/** + * @param data uint8_t * + * @param size uint8_t max for size is 64Byte + * @param repeat uint32_t + */ +void SPIClass::writePattern(uint8_t * data, uint8_t size, uint32_t repeat) +{ + if(size > 64) { + return; //max Hardware FIFO + } + + uint32_t byte = (size * repeat); + uint8_t r = (64 / size); + const uint8_t max_bytes_FIFO = r * size; // Max number of whole patterns (in bytes) that can fit into the hardware FIFO + + while(byte) { + if(byte > max_bytes_FIFO) { + writePattern_(data, size, r); + byte -= max_bytes_FIFO; + } else { + writePattern_(data, size, (byte / size)); + byte = 0; + } + } +} + +void SPIClass::writePattern_(uint8_t * data, uint8_t size, uint8_t repeat) +{ + uint8_t bytes = (size * repeat); + uint8_t buffer[64]; + uint8_t * bufferPtr = &buffer[0]; + uint8_t * dataPtr; + uint8_t dataSize = bytes; + for(uint8_t i = 0; i < repeat; i++) { + dataSize = size; + dataPtr = data; + while(dataSize--) { + *bufferPtr = *dataPtr; + dataPtr++; + bufferPtr++; + } + } + + writeBytes(&buffer[0], bytes); +} + +SPIClass SPI(VSPI); diff --git a/cores/esp32/nefry/inc/SPI/src/SPI.h b/cores/esp32/nefry/inc/SPI/src/SPI.h new file mode 100644 index 00000000000..e232e1628e4 --- /dev/null +++ b/cores/esp32/nefry/inc/SPI/src/SPI.h @@ -0,0 +1,85 @@ +/* + SPI.h - SPI library for esp8266 + + Copyright (c) 2015 Hristo Gochkov. All rights reserved. + This file is part of the esp8266 core for Arduino environment. + + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + This library 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 + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with this library; if not, write to the Free Software + Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA +*/ +#ifndef _SPI_H_INCLUDED +#define _SPI_H_INCLUDED + +#include +#include "pins_arduino.h" +#include "esp32-hal-spi.h" + +class SPISettings +{ +public: + SPISettings() :_clock(1000000), _bitOrder(SPI_MSBFIRST), _dataMode(SPI_MODE0) {} + SPISettings(uint32_t clock, uint8_t bitOrder, uint8_t dataMode) :_clock(clock), _bitOrder(bitOrder), _dataMode(dataMode) {} + uint32_t _clock; + uint8_t _bitOrder; + uint8_t _dataMode; +}; + +class SPIClass +{ +private: + int8_t _spi_num; + spi_t * _spi; + bool _use_hw_ss; + int8_t _sck; + int8_t _miso; + int8_t _mosi; + int8_t _ss; + uint32_t _div; + uint32_t _freq; + bool _inTransaction; + void writePattern_(uint8_t * data, uint8_t size, uint8_t repeat); + +public: + SPIClass(uint8_t spi_bus=HSPI); + void begin(int8_t sck=SCK, int8_t miso=MISO, int8_t mosi=MOSI, int8_t ss=-1); + void end(); + + void setHwCs(bool use); + void setBitOrder(uint8_t bitOrder); + void setDataMode(uint8_t dataMode); + void setFrequency(uint32_t freq); + void setClockDivider(uint32_t clockDiv); + + void beginTransaction(SPISettings settings); + void endTransaction(void); + + uint8_t transfer(uint8_t data); + uint16_t transfer16(uint16_t data); + uint32_t transfer32(uint32_t data); + void transferBytes(uint8_t * data, uint8_t * out, uint32_t size); + void transferBits(uint32_t data, uint32_t * out, uint8_t bits); + + void write(uint8_t data); + void write16(uint16_t data); + void write32(uint32_t data); + void writeBytes(uint8_t * data, uint32_t size); + void writePixels(const void * data, uint32_t size);//ili9341 compatible + void writePattern(uint8_t * data, uint8_t size, uint32_t repeat); + + spi_t * bus(){ return _spi; } +}; + +extern SPIClass SPI; + +#endif diff --git a/cores/esp32/nefry/inc/led/Adafruit_DotStar.cpp b/cores/esp32/nefry/inc/led/Adafruit_DotStar.cpp new file mode 100644 index 00000000000..b31d3cbe40b --- /dev/null +++ b/cores/esp32/nefry/inc/led/Adafruit_DotStar.cpp @@ -0,0 +1,417 @@ +/*------------------------------------------------------------------------ + Arduino library to control Adafruit Dot Star addressable RGB LEDs. + + Written by Limor Fried and Phil Burgess for Adafruit Industries. + + Adafruit invests time and resources providing this open source code, + please support Adafruit and open-source hardware by purchasing products + from Adafruit! + + ------------------------------------------------------------------------ + This file is part of the Adafruit Dot Star library. + + Adafruit Dot Star is free software: you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public License + as published by the Free Software Foundation, either version 3 of + the License, or (at your option) any later version. + + Adafruit Dot Star 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 Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with DotStar. If not, see . + ------------------------------------------------------------------------*/ + +#include "Adafruit_DotStar.h" +#if !defined(__AVR_ATtiny85__) + #include "./../SPI/src/SPI.h" +#endif + +#define USE_HW_SPI 255 // Assign this to dataPin to indicate 'hard' SPI + + // Constructor for hardware SPI -- must connect to MOSI, SCK pins +Adafruit_DotStar::Adafruit_DotStar() : + numLEDs(0), dataPin(USE_HW_SPI), brightness(0), pixels(NULL), + rOffset(3), gOffset((2) & 3), bOffset((4) & 3) +{ + updateLength(0); +} + +// Constructor for hardware SPI -- must connect to MOSI, SCK pins +Adafruit_DotStar::Adafruit_DotStar(uint16_t n, uint8_t o) : + numLEDs(n), dataPin(USE_HW_SPI), brightness(0), pixels(NULL), + rOffset(o & 3), gOffset((o >> 2) & 3), bOffset((o >> 4) & 3) +{ + updateLength(n); +} + +// Constructor for 'soft' (bitbang) SPI -- any two pins can be used +Adafruit_DotStar::Adafruit_DotStar(uint16_t n, uint8_t data, uint8_t clock, + uint8_t o) : + dataPin(data), clockPin(clock), brightness(0), pixels(NULL), + rOffset(o & 3), gOffset((o >> 2) & 3), bOffset((o >> 4) & 3) +{ + updateLength(n); +} + +Adafruit_DotStar::~Adafruit_DotStar(void) { // Destructor + if(pixels) free(pixels); + if(dataPin == USE_HW_SPI) hw_spi_end(); + else sw_spi_end(); +} + +void Adafruit_DotStar::begin(void) { // Initialize SPI + if(dataPin == USE_HW_SPI) hw_spi_init(); + else sw_spi_init(); +} + +// Pins may be reassigned post-begin(), so a sketch can store hardware +// config in flash, SD card, etc. rather than hardcoded. Also permits +// "recycling" LED ram across multiple strips: set pins to first strip, +// render & write all data, reassign pins to next strip, render & write, +// etc. They won't update simultaneously, but usually unnoticeable. + +// Change to hardware SPI -- must connect to MOSI, SCK pins +void Adafruit_DotStar::updatePins(void) { + sw_spi_end(); + dataPin = USE_HW_SPI; + hw_spi_init(); +} + +// Change to 'soft' (bitbang) SPI -- any two pins can be used +void Adafruit_DotStar::updatePins(uint8_t data, uint8_t clock) { + hw_spi_end(); + dataPin = data; + clockPin = clock; + sw_spi_init(); +} + +// Length can be changed post-constructor for similar reasons (sketch +// config not hardcoded). But DON'T use this for "recycling" strip RAM... +// all that reallocation is likely to fragment and eventually fail. +// Instead, set length once to longest strip. +void Adafruit_DotStar::updateLength(uint16_t n) { + if(pixels) free(pixels); + uint16_t bytes = (rOffset == gOffset) ? + n + ((n + 3) / 4) : // MONO: 10 bits/pixel, round up to next byte + n * 3; // COLOR: 3 bytes/pixel + if((pixels = (uint8_t *)malloc(bytes))) { + numLEDs = n; + clear(); + } else { + numLEDs = 0; + } +} + +// SPI STUFF --------------------------------------------------------------- + +void Adafruit_DotStar::hw_spi_init(void) { // Initialize hardware SPI +#ifdef __AVR_ATtiny85__ + PORTB &= ~(_BV(PORTB1) | _BV(PORTB2)); // Outputs + DDRB |= _BV(PORTB1) | _BV(PORTB2); // DO (NOT MOSI) + SCK +#elif (SPI_INTERFACES_COUNT > 0) || !defined(SPI_INTERFACES_COUNT) + SPI.begin(); + #if defined(__AVR__) || defined(CORE_TEENSY) || defined(__ARDUINO_ARC__) || defined(__ARDUINO_X86__) + SPI.setClockDivider(SPI_CLOCK_DIV2); // 8 MHz (6 MHz on Pro Trinket 3V) + #else + #if defined(ESP8266) || defined(ESP31B) || defined(ESP32) + SPI.setFrequency(8000000L); + #elif defined(PIC32) + // Use begin/end transaction to set SPI clock rate + SPI.beginTransaction(SPISettings(8000000, MSBFIRST, SPI_MODE0)); + SPI.endTransaction(); + #else + SPI.setClockDivider((F_CPU + 4000000L) / 8000000L); // 8-ish MHz on Due + #endif + #endif + SPI.setBitOrder(MSBFIRST); + SPI.setDataMode(SPI_MODE0); +#endif +} + +void Adafruit_DotStar::hw_spi_end(void) { // Stop hardware SPI +#ifdef __AVR_ATtiny85__ + DDRB &= ~(_BV(PORTB1) | _BV(PORTB2)); // Inputs +#elif (SPI_INTERFACES_COUNT > 0) || !defined(SPI_INTERFACES_COUNT) + SPI.end(); +#endif +} + +void Adafruit_DotStar::sw_spi_init(void) { // Init 'soft' (bitbang) SPI + pinMode(dataPin , OUTPUT); + pinMode(clockPin, OUTPUT); +#ifdef __AVR__ + dataPort = portOutputRegister(digitalPinToPort(dataPin)); + clockPort = portOutputRegister(digitalPinToPort(clockPin)); + dataPinMask = digitalPinToBitMask(dataPin); + clockPinMask = digitalPinToBitMask(clockPin); + *dataPort &= ~dataPinMask; + *clockPort &= ~clockPinMask; +#else + digitalWrite(dataPin , LOW); + digitalWrite(clockPin, LOW); +#endif +} + +void Adafruit_DotStar::sw_spi_end() { // Stop 'soft' SPI + pinMode(dataPin , INPUT); + pinMode(clockPin, INPUT); +} + +#ifdef __AVR_ATtiny85__ + +// Teensy/Gemma-specific stuff for hardware-half-assisted SPI + +#define SPIBIT \ + USICR = ((1< 0) || !defined(SPI_INTERFACES_COUNT) + +// All other boards have full-featured hardware support for SPI + +#define spi_out(n) (void)SPI.transfer(n) +// Pipelining reads next byte while current byte is clocked out +#if (defined(__AVR__) && !defined(__AVR_ATtiny85__)) || defined(CORE_TEENSY) + #define SPI_PIPELINE +#endif + +#else // no hardware spi +#define spi_out(n) sw_spi_out(n) + +#endif + +void Adafruit_DotStar::sw_spi_out(uint8_t n) { // Bitbang SPI write + for(uint8_t i=8; i--; n <<= 1) { +#ifdef __AVR__ + if(n & 0x80) *dataPort |= dataPinMask; + else *dataPort &= ~dataPinMask; + *clockPort |= clockPinMask; + *clockPort &= ~clockPinMask; +#else + if(n & 0x80) digitalWrite(dataPin, HIGH); + else digitalWrite(dataPin, LOW); + digitalWrite(clockPin, HIGH); + digitalWrite(clockPin, LOW); +#endif + } +} + +/* ISSUE DATA TO LED STRIP ------------------------------------------------- + + Although the LED driver has an additional per-pixel 5-bit brightness + setting, it is NOT used or supported here because it's a brain-dead + misfeature that's counter to the whole point of Dot Stars, which is to + have a much faster PWM rate than NeoPixels. It gates the high-speed + PWM output through a second, much slower PWM (about 400 Hz), rendering + it useless for POV. This brings NOTHING to the table that can't be + already handled better in one's sketch code. If you really can't live + without this abomination, you can fork the library and add it for your + own use, but any pull requests for this will NOT be merged, nuh uh! +*/ + +void Adafruit_DotStar::show(void) { + + if(!pixels) return; + + uint8_t *ptr = pixels, i; // -> LED data + uint16_t n = numLEDs; // Counter + uint16_t b16 = (uint16_t)brightness; // Type-convert for fixed-point math + + if(dataPin == USE_HW_SPI) { + +#ifdef SPI_PIPELINE + uint8_t next; + for(i=0; i<3; i++) spi_out(0x00); // First 3 start-frame bytes + SPDR = 0x00; // 4th is pipelined + do { // For each pixel... + while(!(SPSR & _BV(SPIF))); // Wait for prior byte out + SPDR = 0xFF; // Pixel start + for(i=0; i<3; i++) { // For R,G,B... + next = brightness ? (*ptr++ * b16) >> 8 : *ptr++; // Read, scale + while(!(SPSR & _BV(SPIF))); // Wait for prior byte out + SPDR = next; // Write scaled color + } + } while(--n); + while(!(SPSR & _BV(SPIF))); // Wait for last byte out +#else + for(i=0; i<4; i++) spi_out(0x00); // 4 byte start-frame marker + if(brightness) { // Scale pixel brightness on output + do { // For each pixel... + spi_out(0xFF); // Pixel start + for(i=0; i<3; i++) spi_out((*ptr++ * b16) >> 8); // Scale, write RGB + } while(--n); + } else { // Full brightness (no scaling) + do { // For each pixel... + spi_out(0xFF); // Pixel start + for(i=0; i<3; i++) spi_out(*ptr++); // Write R,G,B + } while(--n); + } +#endif + // Four end-frame bytes are seemingly indistinguishable from a white + // pixel, and empirical testing suggests it can be left out...but it's + // always a good idea to follow the datasheet, in case future hardware + // revisions are more strict (e.g. might mandate use of end-frame + // before start-frame marker). i.e. let's not remove this. But after + // testing a bit more the suggestion is to use at least (numLeds+1)/2 + // high values (1) or (numLeds+15)/16 full bytes as EndFrame. For details see also: + // https://cpldcpu.wordpress.com/2014/11/30/understanding-the-apa102-superled/ + for(i=0; i<((numLEDs + 15) / 16); i++) spi_out(0xFF); + + } else { // Soft (bitbang) SPI + + for(i=0; i<4; i++) sw_spi_out(0); // Start-frame marker + if(brightness) { // Scale pixel brightness on output + do { // For each pixel... + sw_spi_out(0xFF); // Pixel start + for(i=0; i<3; i++) sw_spi_out((*ptr++ * b16) >> 8); // Scale, write + } while(--n); + } else { // Full brightness (no scaling) + do { // For each pixel... + sw_spi_out(0xFF); // Pixel start + for(i=0; i<3; i++) sw_spi_out(*ptr++); // R,G,B + } while(--n); + } + for(i=0; i<((numLEDs + 15) / 16); i++) sw_spi_out(0xFF); // End-frame marker (see note above) + } +} + +void Adafruit_DotStar::clear() { // Write 0s (off) to full pixel buffer + memset(pixels, 0, (rOffset == gOffset) ? + numLEDs + ((numLEDs + 3) / 4) : // MONO: 10 bits/pixel + numLEDs * 3); // COLOR: 3 bytes/pixel +} + +// Set pixel color, separate R,G,B values (0-255 ea.) +void Adafruit_DotStar::setPixelColor( + uint16_t n, uint8_t r, uint8_t g, uint8_t b) { + if(n < numLEDs) { + uint8_t *p = &pixels[n * 3]; + p[rOffset] = r; + p[gOffset] = g; + p[bOffset] = b; + } +} + +// Set pixel color, 'packed' RGB value (0x000000 - 0xFFFFFF) +void Adafruit_DotStar::setPixelColor(uint16_t n, uint32_t c) { + if(n < numLEDs) { + uint8_t *p = &pixels[n * 3]; + p[rOffset] = (uint8_t)(c >> 16); + p[gOffset] = (uint8_t)(c >> 8); + p[bOffset] = (uint8_t)c; + } +} + +// Convert separate R,G,B to packed value +uint32_t Adafruit_DotStar::Color(uint8_t r, uint8_t g, uint8_t b) { + return ((uint32_t)r << 16) | ((uint32_t)g << 8) | b; +} + +// Read color from previously-set pixel, returns packed RGB value. +uint32_t Adafruit_DotStar::getPixelColor(uint16_t n) const { + if(n >= numLEDs) return 0; + uint8_t *p = &pixels[n * 3]; + return ((uint32_t)p[rOffset] << 16) | + ((uint32_t)p[gOffset] << 8) | + (uint32_t)p[bOffset]; +} + +uint16_t Adafruit_DotStar::numPixels(void) { // Ret. strip length + return numLEDs; +} + +// Set global strip brightness. This does not have an immediate effect; +// must be followed by a call to show(). Not a fan of this...for various +// reasons I think it's better handled in one's sketch, but it's here for +// parity with the NeoPixel library. Good news is that brightness setting +// in this library is 'non destructive' -- it's applied as color data is +// being issued to the strip, not during setPixel(), and also means that +// getPixelColor() returns the exact value originally stored. +void Adafruit_DotStar::setBrightness(uint8_t b) { + // Stored brightness value is different than what's passed. This + // optimizes the actual scaling math later, allowing a fast 8x8-bit + // multiply and taking the MSB. 'brightness' is a uint8_t, adding 1 + // here may (intentionally) roll over...so 0 = max brightness (color + // values are interpreted literally; no scaling), 1 = min brightness + // (off), 255 = just below max brightness. + brightness = b + 1; +} + +uint8_t Adafruit_DotStar::getBrightness(void) const { + return brightness - 1; // Reverse above operation +} + +// Return pointer to the library's pixel data buffer. Use carefully, +// much opportunity for mayhem. It's mostly for code that needs fast +// transfers, e.g. SD card to LEDs. Color data is in BGR order. +uint8_t *Adafruit_DotStar::getPixels(void) const { + return pixels; +} + +/* A PROGMEM (flash mem) table containing 8-bit unsigned sine wave (0-255). + Copy & paste this snippet into a Python REPL to regenerate: +import math +for x in range(256): + print("{:3},".format(int((math.sin(x/128.0*math.pi)+1.0)*127.5+0.5))), + if x&15 == 15: print +*/ +static const uint8_t PROGMEM _sineTable[256] = { + 128,131,134,137,140,143,146,149,152,155,158,162,165,167,170,173, + 176,179,182,185,188,190,193,196,198,201,203,206,208,211,213,215, + 218,220,222,224,226,228,230,232,234,235,237,238,240,241,243,244, + 245,246,248,249,250,250,251,252,253,253,254,254,254,255,255,255, + 255,255,255,255,254,254,254,253,253,252,251,250,250,249,248,246, + 245,244,243,241,240,238,237,235,234,232,230,228,226,224,222,220, + 218,215,213,211,208,206,203,201,198,196,193,190,188,185,182,179, + 176,173,170,167,165,162,158,155,152,149,146,143,140,137,134,131, + 128,124,121,118,115,112,109,106,103,100, 97, 93, 90, 88, 85, 82, + 79, 76, 73, 70, 67, 65, 62, 59, 57, 54, 52, 49, 47, 44, 42, 40, + 37, 35, 33, 31, 29, 27, 25, 23, 21, 20, 18, 17, 15, 14, 12, 11, + 10, 9, 7, 6, 5, 5, 4, 3, 2, 2, 1, 1, 1, 0, 0, 0, + 0, 0, 0, 0, 1, 1, 1, 2, 2, 3, 4, 5, 5, 6, 7, 9, + 10, 11, 12, 14, 15, 17, 18, 20, 21, 23, 25, 27, 29, 31, 33, 35, + 37, 40, 42, 44, 47, 49, 52, 54, 57, 59, 62, 65, 67, 70, 73, 76, + 79, 82, 85, 88, 90, 93, 97,100,103,106,109,112,115,118,121,124}; + +/* Similar to above, but for an 8-bit gamma-correction table. + Copy & paste this snippet into a Python REPL to regenerate: +import math +gamma=2.6 +for x in range(256): + print("{:3},".format(int(math.pow((x)/255.0,gamma)*255.0+0.5))), + if x&15 == 15: print +*/ +static const uint8_t PROGMEM _gammaTable[256] = { + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 2, 2, 2, 2, 2, 2, 2, 2, 3, 3, 3, 3, + 3, 3, 4, 4, 4, 4, 5, 5, 5, 5, 5, 6, 6, 6, 6, 7, + 7, 7, 8, 8, 8, 9, 9, 9, 10, 10, 10, 11, 11, 11, 12, 12, + 13, 13, 13, 14, 14, 15, 15, 16, 16, 17, 17, 18, 18, 19, 19, 20, + 20, 21, 21, 22, 22, 23, 24, 24, 25, 25, 26, 27, 27, 28, 29, 29, + 30, 31, 31, 32, 33, 34, 34, 35, 36, 37, 38, 38, 39, 40, 41, 42, + 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, + 58, 59, 60, 61, 62, 63, 64, 65, 66, 68, 69, 70, 71, 72, 73, 75, + 76, 77, 78, 80, 81, 82, 84, 85, 86, 88, 89, 90, 92, 93, 94, 96, + 97, 99,100,102,103,105,106,108,109,111,112,114,115,117,119,120, + 122,124,125,127,129,130,132,134,136,137,139,141,143,145,146,148, + 150,152,154,156,158,160,162,164,166,168,170,172,174,176,178,180, + 182,184,186,188,191,193,195,197,199,202,204,206,209,211,213,215, + 218,220,223,225,227,230,232,235,237,240,242,245,247,250,252,255}; + +uint8_t Adafruit_DotStar::sine8(uint8_t x) const { + return pgm_read_byte(&_sineTable[x]); // 0-255 in, 0-255 out +} + +uint8_t Adafruit_DotStar::gamma8(uint8_t x) const { + return pgm_read_byte(&_gammaTable[x]); // 0-255 in, 0-255 out +} + diff --git a/cores/esp32/nefry/inc/led/Adafruit_DotStar.h b/cores/esp32/nefry/inc/led/Adafruit_DotStar.h new file mode 100644 index 00000000000..8e4dc2d9946 --- /dev/null +++ b/cores/esp32/nefry/inc/led/Adafruit_DotStar.h @@ -0,0 +1,95 @@ +/*------------------------------------------------------------------------ + This file is part of the Adafruit Dot Star library. + + Adafruit Dot Star is free software: you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public License + as published by the Free Software Foundation, either version 3 of + the License, or (at your option) any later version. + + Adafruit Dot Star 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 Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with DotStar. If not, see . + ------------------------------------------------------------------------*/ + +#ifndef _ADAFRUIT_DOT_STAR_H_ +#define _ADAFRUIT_DOT_STAR_H_ + +#if (ARDUINO >= 100) + #include +#else + #include + #include +#endif + +// Color-order flag for LED pixels (optional extra parameter to constructor): +// Bits 0,1 = R index (0-2), bits 2,3 = G index, bits 4,5 = B index +#define DOTSTAR_RGB (0 | (1 << 2) | (2 << 4)) +#define DOTSTAR_RBG (0 | (2 << 2) | (1 << 4)) +#define DOTSTAR_GRB (1 | (0 << 2) | (2 << 4)) +#define DOTSTAR_GBR (2 | (0 << 2) | (1 << 4)) +#define DOTSTAR_BRG (1 | (2 << 2) | (0 << 4)) +#define DOTSTAR_BGR (2 | (1 << 2) | (0 << 4)) +#define DOTSTAR_MONO 0 // Single-color strip WIP DO NOT USE YET + +class Adafruit_DotStar { + + public: + Adafruit_DotStar(); + Adafruit_DotStar(uint16_t n, uint8_t o=DOTSTAR_BRG); + Adafruit_DotStar(uint16_t n, uint8_t d, uint8_t c, uint8_t o=DOTSTAR_BRG); + ~Adafruit_DotStar(void); + void + begin(void), // Prime pins/SPI for output + clear(), // Set all pixel data to zero + setBrightness(uint8_t), // Set global brightness 0-255 + setPixelColor(uint16_t n, uint32_t c), + setPixelColor(uint16_t n, uint8_t r, uint8_t g, uint8_t b), + show(void), // Issue color data to strip + updatePins(void), // Change pin assignments (HW) + updatePins(uint8_t d, uint8_t c), // Change pin assignments (SW) + updateLength(uint16_t n); // Change length + uint32_t + Color(uint8_t r, uint8_t g, uint8_t b), // R,G,B to 32-bit color + getPixelColor(uint16_t n) const; // Return 32-bit pixel color + uint16_t + numPixels(void); // Return number of pixels + uint8_t + getBrightness(void) const, // Return global brightness + *getPixels(void) const, // Return pixel data pointer + sine8(uint8_t) const, + gamma8(uint8_t) const; + + private: + + uint16_t + numLEDs; // Number of pixels + uint8_t + dataPin, // If soft SPI, data pin # + clockPin, // If soft SPI, clock pin # + brightness, // Global brightness setting + *pixels, // LED RGB values (3 bytes ea.) + rOffset, // Index of red in 3-byte pixel + gOffset, // Index of green byte + bOffset; // Index of blue byte +#ifdef __AVR__ + uint8_t + dataPinMask, // If soft SPI, data pin bitmask + clockPinMask; // If soft SPI, clock pin bitmask + volatile uint8_t + *dataPort, // If soft SPI, data PORT + *clockPort; // If soft SPI, clock PORT +#endif + void + hw_spi_init(void), // Start hardware SPI + hw_spi_end(void), // Stop hardware SPI + sw_spi_init(void), // Start bitbang SPI + sw_spi_out(uint8_t n), // Bitbang SPI write + sw_spi_end(void); // Stop bitbang SPI + +}; + +#endif // _ADAFRUIT_DOT_STAR_H_ diff --git a/cores/esp32/nefry/inc/led/COPYING b/cores/esp32/nefry/inc/led/COPYING new file mode 100644 index 00000000000..7dcf8e8ae44 --- /dev/null +++ b/cores/esp32/nefry/inc/led/COPYING @@ -0,0 +1,794 @@ + + GNU GENERAL PUBLIC LICENSE + Version 3, 29 June 2007 + + Copyright (C) 2007 Free Software Foundation, Inc. + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The GNU General Public License is a free, copyleft license for +software and other kinds of works. + + The licenses for most software and other practical works are designed +to take away your freedom to share and change the works. By contrast, +the GNU General Public License is intended to guarantee your freedom to +share and change all versions of a program--to make sure it remains free +software for all its users. We, the Free Software Foundation, use the +GNU General Public License for most of our software; it applies also to +any other work released this way by its authors. You can apply it to +your programs, too. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +them if you wish), that you receive source code or can get it if you +want it, that you can change the software or use pieces of it in new +free programs, and that you know you can do these things. + + To protect your rights, we need to prevent others from denying you +these rights or asking you to surrender the rights. Therefore, you have +certain responsibilities if you distribute copies of the software, or if +you modify it: responsibilities to respect the freedom of others. + + For example, if you distribute copies of such a program, whether +gratis or for a fee, you must pass on to the recipients the same +freedoms that you received. You must make sure that they, too, receive +or can get the source code. And you must show them these terms so they +know their rights. + + Developers that use the GNU GPL protect your rights with two steps: +(1) assert copyright on the software, and (2) offer you this License +giving you legal permission to copy, distribute and/or modify it. + + For the developers' and authors' protection, the GPL clearly explains +that there is no warranty for this free software. For both users' and +authors' sake, the GPL requires that modified versions be marked as +changed, so that their problems will not be attributed erroneously to +authors of previous versions. + + Some devices are designed to deny users access to install or run +modified versions of the software inside them, although the manufacturer +can do so. This is fundamentally incompatible with the aim of +protecting users' freedom to change the software. The systematic +pattern of such abuse occurs in the area of products for individuals to +use, which is precisely where it is most unacceptable. Therefore, we +have designed this version of the GPL to prohibit the practice for those +products. If such problems arise substantially in other domains, we +stand ready to extend this provision to those domains in future versions +of the GPL, as needed to protect the freedom of users. + + Finally, every program is threatened constantly by software patents. +States should not allow patents to restrict development and use of +software on general-purpose computers, but in those that do, we wish to +avoid the special danger that patents applied to a free program could +make it effectively proprietary. To prevent this, the GPL assures that +patents cannot be used to render the program non-free. + + The precise terms and conditions for copying, distribution and +modification follow. + + TERMS AND CONDITIONS + + 0. Definitions. + + "This License" refers to version 3 of the GNU General Public License. + + "Copyright" also means copyright-like laws that apply to other kinds of +works, such as semiconductor masks. + + "The Program" refers to any copyrightable work licensed under this +License. Each licensee is addressed as "you". "Licensees" and +"recipients" may be individuals or organizations. + + To "modify" a work means to copy from or adapt all or part of the work +in a fashion requiring copyright permission, other than the making of an +exact copy. The resulting work is called a "modified version" of the +earlier work or a work "based on" the earlier work. + + A "covered work" means either the unmodified Program or a work based +on the Program. + + To "propagate" a work means to do anything with it that, without +permission, would make you directly or secondarily liable for +infringement under applicable copyright law, except executing it on a +computer or modifying a private copy. Propagation includes copying, +distribution (with or without modification), making available to the +public, and in some countries other activities as well. + + To "convey" a work means any kind of propagation that enables other +parties to make or receive copies. Mere interaction with a user through +a computer network, with no transfer of a copy, is not conveying. + + An interactive user interface displays "Appropriate Legal Notices" +to the extent that it includes a convenient and prominently visible +feature that (1) displays an appropriate copyright notice, and (2) +tells the user that there is no warranty for the work (except to the +extent that warranties are provided), that licensees may convey the +work under this License, and how to view a copy of this License. If +the interface presents a list of user commands or options, such as a +menu, a prominent item in the list meets this criterion. + + 1. Source Code. + + The "source code" for a work means the preferred form of the work +for making modifications to it. "Object code" means any non-source +form of a work. + + A "Standard Interface" means an interface that either is an official +standard defined by a recognized standards body, or, in the case of +interfaces specified for a particular programming language, one that +is widely used among developers working in that language. + + The "System Libraries" of an executable work include anything, other +than the work as a whole, that (a) is included in the normal form of +packaging a Major Component, but which is not part of that Major +Component, and (b) serves only to enable use of the work with that +Major Component, or to implement a Standard Interface for which an +implementation is available to the public in source code form. A +"Major Component", in this context, means a major essential component +(kernel, window system, and so on) of the specific operating system +(if any) on which the executable work runs, or a compiler used to +produce the work, or an object code interpreter used to run it. + + The "Corresponding Source" for a work in object code form means all +the source code needed to generate, install, and (for an executable +work) run the object code and to modify the work, including scripts to +control those activities. However, it does not include the work's +System Libraries, or general-purpose tools or generally available free +programs which are used unmodified in performing those activities but +which are not part of the work. For example, Corresponding Source +includes interface definition files associated with source files for +the work, and the source code for shared libraries and dynamically +linked subprograms that the work is specifically designed to require, +such as by intimate data communication or control flow between those +subprograms and other parts of the work. + + The Corresponding Source need not include anything that users +can regenerate automatically from other parts of the Corresponding +Source. + + The Corresponding Source for a work in source code form is that +same work. + + 2. Basic Permissions. + + All rights granted under this License are granted for the term of +copyright on the Program, and are irrevocable provided the stated +conditions are met. This License explicitly affirms your unlimited +permission to run the unmodified Program. The output from running a +covered work is covered by this License only if the output, given its +content, constitutes a covered work. This License acknowledges your +rights of fair use or other equivalent, as provided by copyright law. + + You may make, run and propagate covered works that you do not +convey, without conditions so long as your license otherwise remains +in force. You may convey covered works to others for the sole purpose +of having them make modifications exclusively for you, or provide you +with facilities for running those works, provided that you comply with +the terms of this License in conveying all material for which you do +not control copyright. Those thus making or running the covered works +for you must do so exclusively on your behalf, under your direction +and control, on terms that prohibit them from making any copies of +your copyrighted material outside their relationship with you. + + Conveying under any other circumstances is permitted solely under +the conditions stated below. Sublicensing is not allowed; section 10 +makes it unnecessary. + + 3. Protecting Users' Legal Rights From Anti-Circumvention Law. + + No covered work shall be deemed part of an effective technological +measure under any applicable law fulfilling obligations under article +11 of the WIPO copyright treaty adopted on 20 December 1996, or +similar laws prohibiting or restricting circumvention of such +measures. + + When you convey a covered work, you waive any legal power to forbid +circumvention of technological measures to the extent such circumvention +is effected by exercising rights under this License with respect to +the covered work, and you disclaim any intention to limit operation or +modification of the work as a means of enforcing, against the work's +users, your or third parties' legal rights to forbid circumvention of +technological measures. + + 4. Conveying Verbatim Copies. + + You may convey verbatim copies of the Program's source code as you +receive it, in any medium, provided that you conspicuously and +appropriately publish on each copy an appropriate copyright notice; +keep intact all notices stating that this License and any +non-permissive terms added in accord with section 7 apply to the code; +keep intact all notices of the absence of any warranty; and give all +recipients a copy of this License along with the Program. + + You may charge any price or no price for each copy that you convey, +and you may offer support or warranty protection for a fee. + + 5. Conveying Modified Source Versions. + + You may convey a work based on the Program, or the modifications to +produce it from the Program, in the form of source code under the +terms of section 4, provided that you also meet all of these conditions: + + a) The work must carry prominent notices stating that you modified + it, and giving a relevant date. + + b) The work must carry prominent notices stating that it is + released under this License and any conditions added under section + 7. This requirement modifies the requirement in section 4 to + "keep intact all notices". + + c) You must license the entire work, as a whole, under this + License to anyone who comes into possession of a copy. This + License will therefore apply, along with any applicable section 7 + additional terms, to the whole of the work, and all its parts, + regardless of how they are packaged. This License gives no + permission to license the work in any other way, but it does not + invalidate such permission if you have separately received it. + + d) If the work has interactive user interfaces, each must display + Appropriate Legal Notices; however, if the Program has interactive + interfaces that do not display Appropriate Legal Notices, your + work need not make them do so. + + A compilation of a covered work with other separate and independent +works, which are not by their nature extensions of the covered work, +and which are not combined with it such as to form a larger program, +in or on a volume of a storage or distribution medium, is called an +"aggregate" if the compilation and its resulting copyright are not +used to limit the access or legal rights of the compilation's users +beyond what the individual works permit. Inclusion of a covered work +in an aggregate does not cause this License to apply to the other +parts of the aggregate. + + 6. Conveying Non-Source Forms. + + You may convey a covered work in object code form under the terms +of sections 4 and 5, provided that you also convey the +machine-readable Corresponding Source under the terms of this License, +in one of these ways: + + a) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by the + Corresponding Source fixed on a durable physical medium + customarily used for software interchange. + + b) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by a + written offer, valid for at least three years and valid for as + long as you offer spare parts or customer support for that product + model, to give anyone who possesses the object code either (1) a + copy of the Corresponding Source for all the software in the + product that is covered by this License, on a durable physical + medium customarily used for software interchange, for a price no + more than your reasonable cost of physically performing this + conveying of source, or (2) access to copy the + Corresponding Source from a network server at no charge. + + c) Convey individual copies of the object code with a copy of the + written offer to provide the Corresponding Source. This + alternative is allowed only occasionally and noncommercially, and + only if you received the object code with such an offer, in accord + with subsection 6b. + + d) Convey the object code by offering access from a designated + place (gratis or for a charge), and offer equivalent access to the + Corresponding Source in the same way through the same place at no + further charge. You need not require recipients to copy the + Corresponding Source along with the object code. If the place to + copy the object code is a network server, the Corresponding Source + may be on a different server (operated by you or a third party) + that supports equivalent copying facilities, provided you maintain + clear directions next to the object code saying where to find the + Corresponding Source. Regardless of what server hosts the + Corresponding Source, you remain obligated to ensure that it is + available for as long as needed to satisfy these requirements. + + e) Convey the object code using peer-to-peer transmission, provided + you inform other peers where the object code and Corresponding + Source of the work are being offered to the general public at no + charge under subsection 6d. + + A separable portion of the object code, whose source code is excluded +from the Corresponding Source as a System Library, need not be +included in conveying the object code work. + + A "User Product" is either (1) a "consumer product", which means any +tangible personal property which is normally used for personal, family, +or household purposes, or (2) anything designed or sold for incorporation +into a dwelling. In determining whether a product is a consumer product, +doubtful cases shall be resolved in favor of coverage. For a particular +product received by a particular user, "normally used" refers to a +typical or common use of that class of product, regardless of the status +of the particular user or of the way in which the particular user +actually uses, or expects or is expected to use, the product. A product +is a consumer product regardless of whether the product has substantial +commercial, industrial or non-consumer uses, unless such uses represent +the only significant mode of use of the product. + + "Installation Information" for a User Product means any methods, +procedures, authorization keys, or other information required to install +and execute modified versions of a covered work in that User Product from +a modified version of its Corresponding Source. The information must +suffice to ensure that the continued functioning of the modified object +code is in no case prevented or interfered with solely because +modification has been made. + + If you convey an object code work under this section in, or with, or +specifically for use in, a User Product, and the conveying occurs as +part of a transaction in which the right of possession and use of the +User Product is transferred to the recipient in perpetuity or for a +fixed term (regardless of how the transaction is characterized), the +Corresponding Source conveyed under this section must be accompanied +by the Installation Information. But this requirement does not apply +if neither you nor any third party retains the ability to install +modified object code on the User Product (for example, the work has +been installed in ROM). + + The requirement to provide Installation Information does not include a +requirement to continue to provide support service, warranty, or updates +for a work that has been modified or installed by the recipient, or for +the User Product in which it has been modified or installed. Access to a +network may be denied when the modification itself materially and +adversely affects the operation of the network or violates the rules and +protocols for communication across the network. + + Corresponding Source conveyed, and Installation Information provided, +in accord with this section must be in a format that is publicly +documented (and with an implementation available to the public in +source code form), and must require no special password or key for +unpacking, reading or copying. + + 7. Additional Terms. + + "Additional permissions" are terms that supplement the terms of this +License by making exceptions from one or more of its conditions. +Additional permissions that are applicable to the entire Program shall +be treated as though they were included in this License, to the extent +that they are valid under applicable law. If additional permissions +apply only to part of the Program, that part may be used separately +under those permissions, but the entire Program remains governed by +this License without regard to the additional permissions. + + When you convey a copy of a covered work, you may at your option +remove any additional permissions from that copy, or from any part of +it. (Additional permissions may be written to require their own +removal in certain cases when you modify the work.) You may place +additional permissions on material, added by you to a covered work, +for which you have or can give appropriate copyright permission. + + Notwithstanding any other provision of this License, for material you +add to a covered work, you may (if authorized by the copyright holders of +that material) supplement the terms of this License with terms: + + a) Disclaiming warranty or limiting liability differently from the + terms of sections 15 and 16 of this License; or + + b) Requiring preservation of specified reasonable legal notices or + author attributions in that material or in the Appropriate Legal + Notices displayed by works containing it; or + + c) Prohibiting misrepresentation of the origin of that material, or + requiring that modified versions of such material be marked in + reasonable ways as different from the original version; or + + d) Limiting the use for publicity purposes of names of licensors or + authors of the material; or + + e) Declining to grant rights under trademark law for use of some + trade names, trademarks, or service marks; or + + f) Requiring indemnification of licensors and authors of that + material by anyone who conveys the material (or modified versions of + it) with contractual assumptions of liability to the recipient, for + any liability that these contractual assumptions directly impose on + those licensors and authors. + + All other non-permissive additional terms are considered "further +restrictions" within the meaning of section 10. If the Program as you +received it, or any part of it, contains a notice stating that it is +governed by this License along with a term that is a further +restriction, you may remove that term. If a license document contains +a further restriction but permits relicensing or conveying under this +License, you may add to a covered work material governed by the terms +of that license document, provided that the further restriction does +not survive such relicensing or conveying. + + If you add terms to a covered work in accord with this section, you +must place, in the relevant source files, a statement of the +additional terms that apply to those files, or a notice indicating +where to find the applicable terms. + + Additional terms, permissive or non-permissive, may be stated in the +form of a separately written license, or stated as exceptions; +the above requirements apply either way. + + 8. Termination. + + You may not propagate or modify a covered work except as expressly +provided under this License. Any attempt otherwise to propagate or +modify it is void, and will automatically terminate your rights under +this License (including any patent licenses granted under the third +paragraph of section 11). + + However, if you cease all violation of this License, then your +license from a particular copyright holder is reinstated (a) +provisionally, unless and until the copyright holder explicitly and +finally terminates your license, and (b) permanently, if the copyright +holder fails to notify you of the violation by some reasonable means +prior to 60 days after the cessation. + + Moreover, your license from a particular copyright holder is +reinstated permanently if the copyright holder notifies you of the +violation by some reasonable means, this is the first time you have +received notice of violation of this License (for any work) from that +copyright holder, and you cure the violation prior to 30 days after +your receipt of the notice. + + Termination of your rights under this section does not terminate the +licenses of parties who have received copies or rights from you under +this License. If your rights have been terminated and not permanently +reinstated, you do not qualify to receive new licenses for the same +material under section 10. + + 9. Acceptance Not Required for Having Copies. + + You are not required to accept this License in order to receive or +run a copy of the Program. Ancillary propagation of a covered work +occurring solely as a consequence of using peer-to-peer transmission +to receive a copy likewise does not require acceptance. However, +nothing other than this License grants you permission to propagate or +modify any covered work. These actions infringe copyright if you do +not accept this License. Therefore, by modifying or propagating a +covered work, you indicate your acceptance of this License to do so. + + 10. Automatic Licensing of Downstream Recipients. + + Each time you convey a covered work, the recipient automatically +receives a license from the original licensors, to run, modify and +propagate that work, subject to this License. You are not responsible +for enforcing compliance by third parties with this License. + + An "entity transaction" is a transaction transferring control of an +organization, or substantially all assets of one, or subdividing an +organization, or merging organizations. If propagation of a covered +work results from an entity transaction, each party to that +transaction who receives a copy of the work also receives whatever +licenses to the work the party's predecessor in interest had or could +give under the previous paragraph, plus a right to possession of the +Corresponding Source of the work from the predecessor in interest, if +the predecessor has it or can get it with reasonable efforts. + + You may not impose any further restrictions on the exercise of the +rights granted or affirmed under this License. For example, you may +not impose a license fee, royalty, or other charge for exercise of +rights granted under this License, and you may not initiate litigation +(including a cross-claim or counterclaim in a lawsuit) alleging that +any patent claim is infringed by making, using, selling, offering for +sale, or importing the Program or any portion of it. + + 11. Patents. + + A "contributor" is a copyright holder who authorizes use under this +License of the Program or a work on which the Program is based. The +work thus licensed is called the contributor's "contributor version". + + A contributor's "essential patent claims" are all patent claims +owned or controlled by the contributor, whether already acquired or +hereafter acquired, that would be infringed by some manner, permitted +by this License, of making, using, or selling its contributor version, +but do not include claims that would be infringed only as a +consequence of further modification of the contributor version. For +purposes of this definition, "control" includes the right to grant +patent sublicenses in a manner consistent with the requirements of +this License. + + Each contributor grants you a non-exclusive, worldwide, royalty-free +patent license under the contributor's essential patent claims, to +make, use, sell, offer for sale, import and otherwise run, modify and +propagate the contents of its contributor version. + + In the following three paragraphs, a "patent license" is any express +agreement or commitment, however denominated, not to enforce a patent +(such as an express permission to practice a patent or covenant not to +sue for patent infringement). To "grant" such a patent license to a +party means to make such an agreement or commitment not to enforce a +patent against the party. + + If you convey a covered work, knowingly relying on a patent license, +and the Corresponding Source of the work is not available for anyone +to copy, free of charge and under the terms of this License, through a +publicly available network server or other readily accessible means, +then you must either (1) cause the Corresponding Source to be so +available, or (2) arrange to deprive yourself of the benefit of the +patent license for this particular work, or (3) arrange, in a manner +consistent with the requirements of this License, to extend the patent +license to downstream recipients. "Knowingly relying" means you have +actual knowledge that, but for the patent license, your conveying the +covered work in a country, or your recipient's use of the covered work +in a country, would infringe one or more identifiable patents in that +country that you have reason to believe are valid. + + If, pursuant to or in connection with a single transaction or +arrangement, you convey, or propagate by procuring conveyance of, a +covered work, and grant a patent license to some of the parties +receiving the covered work authorizing them to use, propagate, modify +or convey a specific copy of the covered work, then the patent license +you grant is automatically extended to all recipients of the covered +work and works based on it. + + A patent license is "discriminatory" if it does not include within +the scope of its coverage, prohibits the exercise of, or is +conditioned on the non-exercise of one or more of the rights that are +specifically granted under this License. You may not convey a covered +work if you are a party to an arrangement with a third party that is +in the business of distributing software, under which you make payment +to the third party based on the extent of your activity of conveying +the work, and under which the third party grants, to any of the +parties who would receive the covered work from you, a discriminatory +patent license (a) in connection with copies of the covered work +conveyed by you (or copies made from those copies), or (b) primarily +for and in connection with specific products or compilations that +contain the covered work, unless you entered into that arrangement, +or that patent license was granted, prior to 28 March 2007. + + Nothing in this License shall be construed as excluding or limiting +any implied license or other defenses to infringement that may +otherwise be available to you under applicable patent law. + + 12. No Surrender of Others' Freedom. + + If conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot convey a +covered work so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you may +not convey it at all. For example, if you agree to terms that obligate you +to collect a royalty for further conveying from those to whom you convey +the Program, the only way you could satisfy both those terms and this +License would be to refrain entirely from conveying the Program. + + 13. Use with the GNU Affero General Public License. + + Notwithstanding any other provision of this License, you have +permission to link or combine any covered work with a work licensed +under version 3 of the GNU Affero General Public License into a single +combined work, and to convey the resulting work. The terms of this +License will continue to apply to the part which is the covered work, +but the special requirements of the GNU Affero General Public License, +section 13, concerning interaction through a network will apply to the +combination as such. + + 14. Revised Versions of this License. + + The Free Software Foundation may publish revised and/or new versions of +the GNU General Public License from time to time. Such new versions will +be similar in spirit to the present version, but may differ in detail to +address new problems or concerns. + + Each version is given a distinguishing version number. If the +Program specifies that a certain numbered version of the GNU General +Public License "or any later version" applies to it, you have the +option of following the terms and conditions either of that numbered +version or of any later version published by the Free Software +Foundation. If the Program does not specify a version number of the +GNU General Public License, you may choose any version ever published +by the Free Software Foundation. + + If the Program specifies that a proxy can decide which future +versions of the GNU General Public License can be used, that proxy's +public statement of acceptance of a version permanently authorizes you +to choose that version for the Program. + + Later license versions may give you additional or different +permissions. However, no additional obligations are imposed on any +author or copyright holder as a result of your choosing to follow a +later version. + + 15. Disclaimer of Warranty. + + THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY +APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT +HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY +OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, +THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM +IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF +ALL NECESSARY SERVICING, REPAIR OR CORRECTION. + + 16. Limitation of Liability. + + IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS +THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY +GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE +USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF +DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD +PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), +EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF +SUCH DAMAGES. + + 17. Interpretation of Sections 15 and 16. + + If the disclaimer of warranty and limitation of liability provided +above cannot be given local legal effect according to their terms, +reviewing courts shall apply local law that most closely approximates +an absolute waiver of all civil liability in connection with the +Program, unless a warranty or assumption of liability accompanies a +copy of the Program in return for a fee. + + END OF TERMS AND CONDITIONS + + + +LGPL ADDENDUM: + + + + GNU LESSER GENERAL PUBLIC LICENSE + Version 3, 29 June 2007 + + Copyright (C) 2007 Free Software Foundation, Inc. + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + + This version of the GNU Lesser General Public License incorporates +the terms and conditions of version 3 of the GNU General Public +License, supplemented by the additional permissions listed below. + + 0. Additional Definitions. + + As used herein, "this License" refers to version 3 of the GNU Lesser +General Public License, and the "GNU GPL" refers to version 3 of the GNU +General Public License. + + "The Library" refers to a covered work governed by this License, +other than an Application or a Combined Work as defined below. + + An "Application" is any work that makes use of an interface provided +by the Library, but which is not otherwise based on the Library. +Defining a subclass of a class defined by the Library is deemed a mode +of using an interface provided by the Library. + + A "Combined Work" is a work produced by combining or linking an +Application with the Library. The particular version of the Library +with which the Combined Work was made is also called the "Linked +Version". + + The "Minimal Corresponding Source" for a Combined Work means the +Corresponding Source for the Combined Work, excluding any source code +for portions of the Combined Work that, considered in isolation, are +based on the Application, and not on the Linked Version. + + The "Corresponding Application Code" for a Combined Work means the +object code and/or source code for the Application, including any data +and utility programs needed for reproducing the Combined Work from the +Application, but excluding the System Libraries of the Combined Work. + + 1. Exception to Section 3 of the GNU GPL. + + You may convey a covered work under sections 3 and 4 of this License +without being bound by section 3 of the GNU GPL. + + 2. Conveying Modified Versions. + + If you modify a copy of the Library, and, in your modifications, a +facility refers to a function or data to be supplied by an Application +that uses the facility (other than as an argument passed when the +facility is invoked), then you may convey a copy of the modified +version: + + a) under this License, provided that you make a good faith effort to + ensure that, in the event an Application does not supply the + function or data, the facility still operates, and performs + whatever part of its purpose remains meaningful, or + + b) under the GNU GPL, with none of the additional permissions of + this License applicable to that copy. + + 3. Object Code Incorporating Material from Library Header Files. + + The object code form of an Application may incorporate material from +a header file that is part of the Library. You may convey such object +code under terms of your choice, provided that, if the incorporated +material is not limited to numerical parameters, data structure +layouts and accessors, or small macros, inline functions and templates +(ten or fewer lines in length), you do both of the following: + + a) Give prominent notice with each copy of the object code that the + Library is used in it and that the Library and its use are + covered by this License. + + b) Accompany the object code with a copy of the GNU GPL and this license + document. + + 4. Combined Works. + + You may convey a Combined Work under terms of your choice that, +taken together, effectively do not restrict modification of the +portions of the Library contained in the Combined Work and reverse +engineering for debugging such modifications, if you also do each of +the following: + + a) Give prominent notice with each copy of the Combined Work that + the Library is used in it and that the Library and its use are + covered by this License. + + b) Accompany the Combined Work with a copy of the GNU GPL and this license + document. + + c) For a Combined Work that displays copyright notices during + execution, include the copyright notice for the Library among + these notices, as well as a reference directing the user to the + copies of the GNU GPL and this license document. + + d) Do one of the following: + + 0) Convey the Minimal Corresponding Source under the terms of this + License, and the Corresponding Application Code in a form + suitable for, and under terms that permit, the user to + recombine or relink the Application with a modified version of + the Linked Version to produce a modified Combined Work, in the + manner specified by section 6 of the GNU GPL for conveying + Corresponding Source. + + 1) Use a suitable shared library mechanism for linking with the + Library. A suitable mechanism is one that (a) uses at run time + a copy of the Library already present on the user's computer + system, and (b) will operate properly with a modified version + of the Library that is interface-compatible with the Linked + Version. + + e) Provide Installation Information, but only if you would otherwise + be required to provide such information under section 6 of the + GNU GPL, and only to the extent that such information is + necessary to install and execute a modified version of the + Combined Work produced by recombining or relinking the + Application with a modified version of the Linked Version. (If + you use option 4d0, the Installation Information must accompany + the Minimal Corresponding Source and Corresponding Application + Code. If you use option 4d1, you must provide the Installation + Information in the manner specified by section 6 of the GNU GPL + for conveying Corresponding Source.) + + 5. Combined Libraries. + + You may place library facilities that are a work based on the +Library side by side in a single library together with other library +facilities that are not Applications and are not covered by this +License, and convey such a combined library under terms of your +choice, if you do both of the following: + + a) Accompany the combined library with a copy of the same work based + on the Library, uncombined with any other library facilities, + conveyed under the terms of this License. + + b) Give prominent notice with the combined library that part of it + is a work based on the Library, and explaining where to find the + accompanying uncombined form of the same work. + + 6. Revised Versions of the GNU Lesser General Public License. + + The Free Software Foundation may publish revised and/or new versions +of the GNU Lesser General Public License from time to time. Such new +versions will be similar in spirit to the present version, but may +differ in detail to address new problems or concerns. + + Each version is given a distinguishing version number. If the +Library as you received it specifies that a certain numbered version +of the GNU Lesser General Public License "or any later version" +applies to it, you have the option of following the terms and +conditions either of that published version or of any later version +published by the Free Software Foundation. If the Library as you +received it does not specify a version number of the GNU Lesser +General Public License, you may choose any version of the GNU Lesser +General Public License ever published by the Free Software Foundation. + + If the Library as you received it specifies that a proxy can decide +whether future versions of the GNU Lesser General Public License shall +apply, that proxy's public statement of acceptance of any version is +permanent authorization for you to choose that version for the +Library. diff --git a/cores/esp32/nefry/inc/led/README.md b/cores/esp32/nefry/inc/led/README.md new file mode 100644 index 00000000000..305976b2786 --- /dev/null +++ b/cores/esp32/nefry/inc/led/README.md @@ -0,0 +1,2 @@ +Adafruit_DotStar +================ diff --git a/cores/esp32/nefry/inc/led/examples/strandtest/strandtest.ino b/cores/esp32/nefry/inc/led/examples/strandtest/strandtest.ino new file mode 100644 index 00000000000..87b6f2a3cc0 --- /dev/null +++ b/cores/esp32/nefry/inc/led/examples/strandtest/strandtest.ino @@ -0,0 +1,58 @@ +// Simple strand test for Adafruit Dot Star RGB LED strip. +// This is a basic diagnostic tool, NOT a graphics demo...helps confirm +// correct wiring and tests each pixel's ability to display red, green +// and blue and to forward data down the line. By limiting the number +// and color of LEDs, it's reasonably safe to power a couple meters off +// the Arduino's 5V pin. DON'T try that with other code! + +#include +// Because conditional #includes don't work w/Arduino sketches... +#include // COMMENT OUT THIS LINE FOR GEMMA OR TRINKET +//#include // ENABLE THIS LINE FOR GEMMA OR TRINKET + +#define NUMPIXELS 30 // Number of LEDs in strip + +// Here's how to control the LEDs from any two pins: +#define DATAPIN 4 +#define CLOCKPIN 5 +Adafruit_DotStar strip = Adafruit_DotStar( + NUMPIXELS, DATAPIN, CLOCKPIN, DOTSTAR_BRG); +// The last parameter is optional -- this is the color data order of the +// DotStar strip, which has changed over time in different production runs. +// Your code just uses R,G,B colors, the library then reassigns as needed. +// Default is DOTSTAR_BRG, so change this if you have an earlier strip. + +// Hardware SPI is a little faster, but must be wired to specific pins +// (Arduino Uno = pin 11 for data, 13 for clock, other boards are different). +//Adafruit_DotStar strip = Adafruit_DotStar(NUMPIXELS, DOTSTAR_BRG); + +void setup() { + +#if defined(__AVR_ATtiny85__) && (F_CPU == 16000000L) + clock_prescale_set(clock_div_1); // Enable 16 MHz on Trinket +#endif + + strip.begin(); // Initialize pins for output + strip.show(); // Turn all LEDs off ASAP +} + +// Runs 10 LEDs at a time along strip, cycling through red, green and blue. +// This requires about 200 mA for all the 'on' pixels + 1 mA per 'off' pixel. + +int head = 0, tail = -10; // Index of first 'on' and 'off' pixels +uint32_t color = 0xFF0000; // 'On' color (starts red) + +void loop() { + + strip.setPixelColor(head, color); // 'On' pixel at head + strip.setPixelColor(tail, 0); // 'Off' pixel at tail + strip.show(); // Refresh strip + delay(20); // Pause 20 milliseconds (~50 FPS) + + if(++head >= NUMPIXELS) { // Increment head index. Off end of strip? + head = 0; // Yes, reset head index to start + if((color >>= 8) == 0) // Next color (R->G->B) ... past blue now? + color = 0xFF0000; // Yes, reset to red + } + if(++tail >= NUMPIXELS) tail = 0; // Increment, reset tail index +} diff --git a/cores/esp32/nefry/inc/led/library.properties b/cores/esp32/nefry/inc/led/library.properties new file mode 100644 index 00000000000..ce31bb69f4e --- /dev/null +++ b/cores/esp32/nefry/inc/led/library.properties @@ -0,0 +1,9 @@ +name=Adafruit DotStar +version=1.0.4 +author=Adafruit +maintainer=Adafruit +sentence=Adafruit DotStar LED Library +paragraph=Adafruit DotStar LED Library +category=Display +url=https://github.com/adafruit/Adafruit_DotStar +architectures=* diff --git a/libraries/Nefry/Nefry.h b/libraries/Nefry/Nefry.h index 3a5db543945..d46ae821b91 100644 --- a/libraries/Nefry/Nefry.h +++ b/libraries/Nefry/Nefry.h @@ -46,7 +46,7 @@ class Nefry_lib reset(), sleep(const int sec), setProgramName(const char * pn), - beginLed(const int num, const int pin, uint8_t t), + beginLed(const int num, const int dataOut, uint8_t t = 0, const int clk = -1), setLed(const int r, const int g, const int b, const char w = 122, const int pin = 16, const int num = 0), setLed(String _colorStr, const char w = 122, const int pin = 16, const int num = 0), addWiFi(String ssid, String pass), diff --git a/variants/esp32/pins_arduino.h b/variants/esp32/pins_arduino.h index e9e62055530..8d82042da9f 100644 --- a/variants/esp32/pins_arduino.h +++ b/variants/esp32/pins_arduino.h @@ -57,6 +57,9 @@ static const uint8_t T9 = 32; static const uint8_t DAC1 = 25; static const uint8_t DAC2 = 26; +static const uint8_t LED_CLK = -1; +static const uint8_t LED_DO = 16; + static const uint8_t boardId = 0;//ESP32 #endif /* Pins_Arduino_h */ diff --git a/variants/nefrybt-r2/pins_arduino.h b/variants/nefrybt-r2/pins_arduino.h index f9323c08f1e..df0a13a5636 100644 --- a/variants/nefrybt-r2/pins_arduino.h +++ b/variants/nefrybt-r2/pins_arduino.h @@ -50,6 +50,9 @@ static const uint8_t T4 = 27; static const uint8_t DAC1 = 25; static const uint8_t DAC2 = 26; +static const uint8_t LED_CLK = -1; +static const uint8_t LED_DO = 16; + static const uint8_t boardId = 2;//Nefry BT R2 #endif /* Pins_Arduino_h */ diff --git a/variants/nefrybt-r3/pins_arduino.h b/variants/nefrybt-r3/pins_arduino.h index e21ab6f0860..51d736943a2 100644 --- a/variants/nefrybt-r3/pins_arduino.h +++ b/variants/nefrybt-r3/pins_arduino.h @@ -49,6 +49,9 @@ static const uint8_t T3 = 32; static const uint8_t DAC1 = 25; static const uint8_t DAC2 = 26; +static const uint8_t LED_CLK = 35; +static const uint8_t LED_DO = 34; + static const uint8_t boardId = 3;//Nefry BT R3 #endif /* Pins_Arduino_h */ diff --git a/variants/nefrybt/pins_arduino.h b/variants/nefrybt/pins_arduino.h index 5201c50d4d3..0d5e53ebedc 100644 --- a/variants/nefrybt/pins_arduino.h +++ b/variants/nefrybt/pins_arduino.h @@ -50,6 +50,9 @@ static const uint8_t T4 = 13; static const uint8_t DAC1 = 25; static const uint8_t DAC2 = 26; +static const uint8_t LED_CLK = -1; +static const uint8_t LED_DO = 16; + static const uint8_t boardId = 1;//Nefry BT #endif /* Pins_Arduino_h */ From c25bfab21133d4b92f6400a133a41b69c3b80aad Mon Sep 17 00:00:00 2001 From: wamisnet Date: Tue, 13 Mar 2018 02:27:33 +0900 Subject: [PATCH 07/18] =?UTF-8?q?=E3=83=90=E3=83=BC=E3=82=B8=E3=83=A7?= =?UTF-8?q?=E3=83=B3=E6=83=85=E5=A0=B1=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- cores/esp32/nefry/Nefry.cpp | 2 +- libraries/Nefry/library.properties | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/cores/esp32/nefry/Nefry.cpp b/cores/esp32/nefry/Nefry.cpp index 10494935c22..3411f7ea102 100644 --- a/cores/esp32/nefry/Nefry.cpp +++ b/cores/esp32/nefry/Nefry.cpp @@ -24,7 +24,7 @@ BootMode 1 : WriteMode切替をする */ -#define LIBVERSION ("1.2.0") +#define LIBVERSION ("1.2.1") #include "Nefry.h" Adafruit_NeoPixel _NefryLEDNeo; diff --git a/libraries/Nefry/library.properties b/libraries/Nefry/library.properties index 42a7fd485c8..97fea9a1d3f 100644 --- a/libraries/Nefry/library.properties +++ b/libraries/Nefry/library.properties @@ -1,5 +1,5 @@ name=Nefry -version=1.2.0 +version=1.2.1 author=Nefry community maintainer= sentence=nefry. From 3e27da257dfdb970a78765dc2b141aa7b1d0eefe Mon Sep 17 00:00:00 2001 From: wamisnet Date: Tue, 13 Mar 2018 20:27:41 +0900 Subject: [PATCH 08/18] =?UTF-8?q?ThingSpeak=E3=83=A9=E3=82=A4=E3=83=96?= =?UTF-8?q?=E3=83=A9=E3=83=AA=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../examples/MultiSend/MultiSend.ino | 4 +++ .../ReadPrivateChannel/ReadPrivateChannel.ino | 4 +++ .../ReadPublicChannel/ReadPublicChannel.ino | 4 +++ .../examples/SimpleSend/SimpleSend.ino | 4 +++ .../Nefry_ThingSpeak/src/NefryThingSpeak.cpp | 35 ++++++++++++++++--- .../Nefry_ThingSpeak/src/NefryThingSpeak.h | 10 ++++-- 6 files changed, 53 insertions(+), 8 deletions(-) diff --git a/libraries/Nefry_ThingSpeak/examples/MultiSend/MultiSend.ino b/libraries/Nefry_ThingSpeak/examples/MultiSend/MultiSend.ino index fbffcfedfad..e08320e15a2 100644 --- a/libraries/Nefry_ThingSpeak/examples/MultiSend/MultiSend.ino +++ b/libraries/Nefry_ThingSpeak/examples/MultiSend/MultiSend.ino @@ -7,8 +7,12 @@ void setup() { //ThingSpeakの初期設定を行います。WriteKeyも設定します + //DataStoreで設定するパターン NefryThingSpeak.begin(); NefryThingSpeak.setWriteAPIKey(); + //直接キー情報を入力するパターン + // NefryThingSpeak.begin(100);//channel番号 + // NefryThingSpeak.setWriteAPIKey("WriteKey");//WriteKey情報を入力します } void loop() { diff --git a/libraries/Nefry_ThingSpeak/examples/ReadPrivateChannel/ReadPrivateChannel.ino b/libraries/Nefry_ThingSpeak/examples/ReadPrivateChannel/ReadPrivateChannel.ino index 60fe025a609..40df822208c 100644 --- a/libraries/Nefry_ThingSpeak/examples/ReadPrivateChannel/ReadPrivateChannel.ino +++ b/libraries/Nefry_ThingSpeak/examples/ReadPrivateChannel/ReadPrivateChannel.ino @@ -5,8 +5,12 @@ */ void setup() { //初期設定 + //DataStoreで設定するパターン NefryThingSpeak.begin(); NefryThingSpeak.setReadAPIKey(); + //直接キー情報を入力するパターン + // NefryThingSpeak.begin(100);//channel番号 + // NefryThingSpeak.setReadAPIKey("ReadKey");//ReadKey情報を入力します } void loop() { diff --git a/libraries/Nefry_ThingSpeak/examples/ReadPublicChannel/ReadPublicChannel.ino b/libraries/Nefry_ThingSpeak/examples/ReadPublicChannel/ReadPublicChannel.ino index e92c40f6c93..9a026de4e3a 100644 --- a/libraries/Nefry_ThingSpeak/examples/ReadPublicChannel/ReadPublicChannel.ino +++ b/libraries/Nefry_ThingSpeak/examples/ReadPublicChannel/ReadPublicChannel.ino @@ -5,8 +5,12 @@ */ void setup() { //初期設定 + //DataStoreで設定するパターン NefryThingSpeak.begin(); NefryThingSpeak.setReadAPIKey(); + //直接キー情報を入力するパターン + // NefryThingSpeak.begin(100);//channel番号 + // NefryThingSpeak.setReadAPIKey("ReadKey");//ReadKey情報を入力します } void loop() { diff --git a/libraries/Nefry_ThingSpeak/examples/SimpleSend/SimpleSend.ino b/libraries/Nefry_ThingSpeak/examples/SimpleSend/SimpleSend.ino index 1abee96e51c..c0426e28d94 100644 --- a/libraries/Nefry_ThingSpeak/examples/SimpleSend/SimpleSend.ino +++ b/libraries/Nefry_ThingSpeak/examples/SimpleSend/SimpleSend.ino @@ -7,8 +7,12 @@ void setup() { //ThingSpeakの初期設定を行います。WriteKeyも設定します + //DataStoreで設定するパターン NefryThingSpeak.begin(); NefryThingSpeak.setWriteAPIKey(); + //直接キー情報を入力するパターン + // NefryThingSpeak.begin(100);//channel番号 + // NefryThingSpeak.setWriteAPIKey("WriteKey");//WriteKey情報を入力します } void loop() { diff --git a/libraries/Nefry_ThingSpeak/src/NefryThingSpeak.cpp b/libraries/Nefry_ThingSpeak/src/NefryThingSpeak.cpp index 57643186fbe..58858212d5a 100644 --- a/libraries/Nefry_ThingSpeak/src/NefryThingSpeak.cpp +++ b/libraries/Nefry_ThingSpeak/src/NefryThingSpeak.cpp @@ -11,6 +11,7 @@ NefryThingSpeakClass NefryThingSpeak; void NefryThingSpeakClass::begin(int nefryConfigChannelNumber, const char* hint) { + _nefryThingsChannelAPIKey = 0; ThingSpeak.begin(_nefryThingClient); _nefryConfigChannelNumber = nefryConfigChannelNumber; Nefry.setStoreTitleValue(hint, _nefryConfigChannelNumber); @@ -18,31 +19,55 @@ void NefryThingSpeakClass::begin(int nefryConfigChannelNumber, const char* hint) void NefryThingSpeakClass::setWriteAPIKey(int nefryConfigWriteApikey, const char* hint) { + _nefryThingsWriteAPIKey = ""; _nefryConfigWriteApikey = nefryConfigWriteApikey; Nefry.setStoreTitleStr(hint, _nefryConfigWriteApikey); } void NefryThingSpeakClass::setReadAPIKey(int nefryConfigReadApikey, const char* hint) { + _nefryThingsReadAPIKey = ""; _nefryConfigReadApikey = nefryConfigReadApikey; Nefry.setStoreTitleStr(hint, _nefryConfigReadApikey); } +void NefryThingSpeakClass::begin(unsigned long thingsChannelNum) +{ + _nefryThingsChannelAPIKey = thingsChannelNum; +} + +void NefryThingSpeakClass::setWriteAPIKey(String thingsWriteAPIKey) +{ + _nefryThingsWriteAPIKey = thingsWriteAPIKey; +} + +void NefryThingSpeakClass::setReadAPIKey(String thingsReadAPIKey) +{ + _nefryThingsReadAPIKey = thingsReadAPIKey; +} + const char * NefryThingSpeakClass::getWriteAPIKey() { - _nefryWriteAPIKey = Nefry.getStoreStr(_nefryConfigWriteApikey); - return _nefryWriteAPIKey.c_str(); + if (_nefryThingsWriteAPIKey.equals("")) { + _nefryThingsWriteAPIKey = Nefry.getStoreStr(_nefryConfigWriteApikey); + } + return _nefryThingsWriteAPIKey.c_str(); } const char * NefryThingSpeakClass::getReadAPIKey() { - _nefryReadAPIKey = Nefry.getStoreStr(_nefryConfigReadApikey); - return _nefryReadAPIKey.c_str(); + if (_nefryThingsReadAPIKey.equals("")) { + _nefryThingsReadAPIKey = Nefry.getStoreStr(_nefryConfigReadApikey); + } + return _nefryThingsReadAPIKey.c_str(); } unsigned long NefryThingSpeakClass::getChannelNumber() { - return Nefry.getStoreValue(_nefryConfigChannelNumber); + if (_nefryThingsChannelAPIKey == 0) { + _nefryThingsChannelAPIKey = Nefry.getStoreValue(_nefryConfigChannelNumber); + } + return _nefryThingsChannelAPIKey; } int NefryThingSpeakClass::writeField( unsigned int field, int value) diff --git a/libraries/Nefry_ThingSpeak/src/NefryThingSpeak.h b/libraries/Nefry_ThingSpeak/src/NefryThingSpeak.h index 23891988e45..129d49b7c43 100644 --- a/libraries/Nefry_ThingSpeak/src/NefryThingSpeak.h +++ b/libraries/Nefry_ThingSpeak/src/NefryThingSpeak.h @@ -8,8 +8,11 @@ class NefryThingSpeakClass:public ThingSpeakClass { public: void begin(int nefryConfigChannelNumber = 0, const char* hint = "ChannelNum"); - void setWriteAPIKey(int nefryConfigWriteApikey = 0, const char* hint = "WriteKey"); - void setReadAPIKey(int nefryConfigReadApikey = 1, const char* hint = "ReadKey"); + void setWriteAPIKey(int nefryConfigWriteApikey = 1, const char* hint = "WriteKey"); + void setReadAPIKey(int nefryConfigReadApikey = 2, const char* hint = "ReadKey"); + void begin(unsigned long thingsChannelNum); + void setWriteAPIKey(String thingsWriteAPIKey); + void setReadAPIKey(String thingsReadAPIKey); const char * getWriteAPIKey(); const char * getReadAPIKey(); unsigned long getChannelNumber(); @@ -23,7 +26,8 @@ class NefryThingSpeakClass:public ThingSpeakClass private: WiFiClient _nefryThingClient; int _nefryConfigChannelNumber, _nefryConfigWriteApikey, _nefryConfigReadApikey; - String _nefryWriteAPIKey, _nefryReadAPIKey; + unsigned long _nefryThingsChannelAPIKey = 0; + String _nefryThingsWriteAPIKey, _nefryThingsReadAPIKey; }; extern NefryThingSpeakClass NefryThingSpeak; #endif From e5d4af0421af8f00687c98733028bb8ecc47a3e1 Mon Sep 17 00:00:00 2001 From: wamisnet Date: Tue, 13 Mar 2018 20:28:04 +0900 Subject: [PATCH 09/18] =?UTF-8?q?SPI=E5=88=B6=E5=BE=A1=E3=82=A4=E3=83=B3?= =?UTF-8?q?=E3=82=B9=E3=82=BF=E3=83=B3=E3=82=B9=E3=82=92=E5=A4=89=E6=9B=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../esp32/nefry/inc/led/Adafruit_DotStar.cpp | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/cores/esp32/nefry/inc/led/Adafruit_DotStar.cpp b/cores/esp32/nefry/inc/led/Adafruit_DotStar.cpp index b31d3cbe40b..6950fbce670 100644 --- a/cores/esp32/nefry/inc/led/Adafruit_DotStar.cpp +++ b/cores/esp32/nefry/inc/led/Adafruit_DotStar.cpp @@ -28,7 +28,7 @@ #if !defined(__AVR_ATtiny85__) #include "./../SPI/src/SPI.h" #endif - +SPIClass SPI2; #define USE_HW_SPI 255 // Assign this to dataPin to indicate 'hard' SPI // Constructor for hardware SPI -- must connect to MOSI, SCK pins @@ -112,22 +112,22 @@ void Adafruit_DotStar::hw_spi_init(void) { // Initialize hardware SPI PORTB &= ~(_BV(PORTB1) | _BV(PORTB2)); // Outputs DDRB |= _BV(PORTB1) | _BV(PORTB2); // DO (NOT MOSI) + SCK #elif (SPI_INTERFACES_COUNT > 0) || !defined(SPI_INTERFACES_COUNT) - SPI.begin(); + SPI2.begin(); #if defined(__AVR__) || defined(CORE_TEENSY) || defined(__ARDUINO_ARC__) || defined(__ARDUINO_X86__) - SPI.setClockDivider(SPI_CLOCK_DIV2); // 8 MHz (6 MHz on Pro Trinket 3V) + SPI2.setClockDivider(SPI_CLOCK_DIV2); // 8 MHz (6 MHz on Pro Trinket 3V) #else #if defined(ESP8266) || defined(ESP31B) || defined(ESP32) - SPI.setFrequency(8000000L); + SPI2.setFrequency(8000000L); #elif defined(PIC32) // Use begin/end transaction to set SPI clock rate - SPI.beginTransaction(SPISettings(8000000, MSBFIRST, SPI_MODE0)); - SPI.endTransaction(); + SPI2.beginTransaction(SPISettings(8000000, MSBFIRST, SPI_MODE0)); + SPI2.endTransaction(); #else - SPI.setClockDivider((F_CPU + 4000000L) / 8000000L); // 8-ish MHz on Due + SPI2.setClockDivider((F_CPU + 4000000L) / 8000000L); // 8-ish MHz on Due #endif #endif - SPI.setBitOrder(MSBFIRST); - SPI.setDataMode(SPI_MODE0); + SPI2.setBitOrder(MSBFIRST); + SPI2.setDataMode(SPI_MODE0); #endif } @@ -135,7 +135,7 @@ void Adafruit_DotStar::hw_spi_end(void) { // Stop hardware SPI #ifdef __AVR_ATtiny85__ DDRB &= ~(_BV(PORTB1) | _BV(PORTB2)); // Inputs #elif (SPI_INTERFACES_COUNT > 0) || !defined(SPI_INTERFACES_COUNT) - SPI.end(); + SPI2.end(); #endif } @@ -177,7 +177,7 @@ static void spi_out(uint8_t n) { // Clock out one byte // All other boards have full-featured hardware support for SPI -#define spi_out(n) (void)SPI.transfer(n) +#define spi_out(n) (void)SPI2.transfer(n) // Pipelining reads next byte while current byte is clocked out #if (defined(__AVR__) && !defined(__AVR_ATtiny85__)) || defined(CORE_TEENSY) #define SPI_PIPELINE From 5b22c56884a2ef668c6a3ff8508814f008a29117 Mon Sep 17 00:00:00 2001 From: wamisnet Date: Tue, 13 Mar 2018 20:28:35 +0900 Subject: [PATCH 10/18] =?UTF-8?q?=E3=82=BF=E3=83=83=E3=83=81=E3=83=94?= =?UTF-8?q?=E3=83=B3=E3=82=92=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- variants/nefrybt-r2/pins_arduino.h | 4 ++-- variants/nefrybt/pins_arduino.h | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/variants/nefrybt-r2/pins_arduino.h b/variants/nefrybt-r2/pins_arduino.h index df0a13a5636..4b6d2bdb7cf 100644 --- a/variants/nefrybt-r2/pins_arduino.h +++ b/variants/nefrybt-r2/pins_arduino.h @@ -43,8 +43,8 @@ static const uint8_t A3 = 36; static const uint8_t T0 = 13; static const uint8_t T1 = 14; -static const uint8_t T2 = 32; -static const uint8_t T3 = 33; +static const uint8_t T2 = 33; +static const uint8_t T3 = 32; static const uint8_t T4 = 27; static const uint8_t DAC1 = 25; diff --git a/variants/nefrybt/pins_arduino.h b/variants/nefrybt/pins_arduino.h index 0d5e53ebedc..6a820831233 100644 --- a/variants/nefrybt/pins_arduino.h +++ b/variants/nefrybt/pins_arduino.h @@ -41,8 +41,8 @@ static const uint8_t A5 = 14; static const uint8_t A6 = 13; static const uint8_t A7 = 35; -static const uint8_t T0 = 33; -static const uint8_t T1 = 32; +static const uint8_t T0 = 32; +static const uint8_t T1 = 33; static const uint8_t T2 = 27; static const uint8_t T3 = 14; static const uint8_t T4 = 13; From a61066d213bb17b8e5742f9a00a1ce6ade780648 Mon Sep 17 00:00:00 2001 From: wamisnet Date: Wed, 14 Mar 2018 18:22:18 +0900 Subject: [PATCH 11/18] =?UTF-8?q?Nefry=20BT=20r3=E8=BF=BD=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- boards.txt | 52 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 52 insertions(+) diff --git a/boards.txt b/boards.txt index d082b4e2c5f..f8c1b2bfa40 100644 --- a/boards.txt +++ b/boards.txt @@ -6,6 +6,58 @@ menu.DebugLevel=Core Debug Level ############################################################## +nefrybtr3.name=Nefry BT R3 + +nefrybtr3.upload.tool=esptool +nefrybtr3.upload.maximum_size=1703936 +nefrybtr3.upload.maximum_data_size=294912 +nefrybtr3.upload.wait_for_upload_port=true + +nefrybtr3.serial.disableDTR=true +nefrybtr3.serial.disableRTS=true + +nefrybtr3.build.mcu=esp32 +nefrybtr3.build.core=esp32 +nefrybtr3.build.variant=nefrybt-r3 +nefrybtr3.build.board=Nefry_BT_R3 +nefrybtr3.build.partitions=default + +nefrybtr3.build.f_cpu=240000000L +nefrybtr3.build.flash_mode=dio +nefrybtr3.build.flash_size=4MB +nefrybtr3.build.boot=bootloader +nefrybtr3.build.flash_freq=80m + +nefrybtr3.menu.UploadSpeed.921600=921600 +nefrybtr3.menu.UploadSpeed.921600.upload.speed=921600 +nefrybtr3.menu.UploadSpeed.115200=115200 +nefrybtr3.menu.UploadSpeed.115200.upload.speed=115200 +nefrybtr3.menu.UploadSpeed.256000.windows=256000 +nefrybtr3.menu.UploadSpeed.256000.upload.speed=256000 +nefrybtr3.menu.UploadSpeed.230400.windows.upload.speed=256000 +nefrybtr3.menu.UploadSpeed.230400=230400 +nefrybtr3.menu.UploadSpeed.230400.upload.speed=230400 +nefrybtr3.menu.UploadSpeed.460800.linux=460800 +nefrybtr3.menu.UploadSpeed.460800.macosx=460800 +nefrybtr3.menu.UploadSpeed.460800.upload.speed=460800 +nefrybtr3.menu.UploadSpeed.512000.windows=512000 +nefrybtr3.menu.UploadSpeed.512000.upload.speed=512000 + +nefrybtr3.menu.DebugLevel.none=None +nefrybtr3.menu.DebugLevel.none.build.code_debug=0 +nefrybtr3.menu.DebugLevel.error=Error +nefrybtr3.menu.DebugLevel.error.build.code_debug=1 +nefrybtr3.menu.DebugLevel.warn=Warn +nefrybtr3.menu.DebugLevel.warn.build.code_debug=2 +nefrybtr3.menu.DebugLevel.info=Info +nefrybtr3.menu.DebugLevel.info.build.code_debug=3 +nefrybtr3.menu.DebugLevel.debug=Debug +nefrybtr3.menu.DebugLevel.debug.build.code_debug=4 +nefrybtr3.menu.DebugLevel.verbose=Verbose +nefrybtr3.menu.DebugLevel.verbose.build.code_debug=5 + +############################################################## + nefrybtr2.name=Nefry BT R2 nefrybtr2.upload.tool=esptool From 2448488411486b66ce0a58cc9b8f06c35e416bbf Mon Sep 17 00:00:00 2001 From: wamisnet Date: Thu, 15 Mar 2018 02:37:09 +0900 Subject: [PATCH 12/18] =?UTF-8?q?=E3=82=A2=E3=83=8A=E3=83=AA=E3=83=86?= =?UTF-8?q?=E3=82=A3=E3=82=AF=E3=82=B9=E8=BF=BD=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- cores/esp32/nefry/Nefry.cpp | 82 +++++++++++++++++++++++++++++++++++++ cores/esp32/nefry/Nefry.h | 4 ++ 2 files changed, 86 insertions(+) diff --git a/cores/esp32/nefry/Nefry.cpp b/cores/esp32/nefry/Nefry.cpp index 3411f7ea102..3fa8ecfde30 100644 --- a/cores/esp32/nefry/Nefry.cpp +++ b/cores/esp32/nefry/Nefry.cpp @@ -29,10 +29,12 @@ BootMode Adafruit_NeoPixel _NefryLEDNeo; Adafruit_DotStar _NefryLEDStar; +bool connectAnFlg = false; //main void Nefry_lib::nefry_init() { /* Display設定 */ + connectAnFlg = false; delay(10); NefryDisplay.begin();//logo表示 if (boardId == 3) { @@ -96,6 +98,9 @@ void Nefry_lib::nefry_loop() { if (_nefryWifiWait > 1000) {//WiFiに接続する間隔を10秒ごとに修正 _nefryWifiWait = 0; NefryWiFi.run(); + if (connectAnFlg != true) { + connectAnFlg = setAnalyticsData("connect"); + } } } } @@ -459,4 +464,81 @@ bool Nefry_lib::getDisplayStatusEnabled() { return _displayStatusFlg; } +bool Nefry_lib::setAnalyticsData(String action) { + bool state = false; + if (WiFi.status() == WL_CONNECTED) { + WiFiClient client; + const int httpPort = 80; + if (!client.connect("google-analytics.com", httpPort)) { + //Serial.println("connection failed"); + return state; + } + + // We now create a URI for the request + String url = "/collect?v=1&t=event&tid=UA-78080011-2&cid=NefryBT&ec="; + url += "NefryBT"; + switch (boardId) { + case 1: + url += "r1"; + break; + case 2: + url += "r2"; + break; + case 3: + url += "r3"; + break; + default: + url += "error"; + break; + } + url += "&el=v"; + url += getVersion(); + url += "&ea="; + url += action; + + + //Serial.print("Requesting URL: "); + //Serial.println(url); + + // This will send the request to the server + client.print(String("GET ") + url + " HTTP/1.1\r\n" + + "Host: google-analytics.com\r\n" + + "Connection: close\r\n\r\n"); + unsigned long timeout = millis(); + while (client.available() == 0) { + if (millis() - timeout > 5000) { + //Serial.println(">>> Client Timeout !"); + client.stop(); + return state; + } + } + + // Read all the lines of the reply from server and print them to Serial + while (client.available()) { + size_t len = client.available(); + if (len > 0) { + String headerLine = client.readStringUntil('\n'); + headerLine.trim(); // remove \r + //Serial.print(headerLine); + log_d("[HTTP-Client][handleHeaderResponse] RX: '%s'", headerLine.c_str()); + + if (headerLine.startsWith("HTTP/1.")) { + int _returnCode = headerLine.substring(9, headerLine.indexOf(' ', 9)).toInt(); + //Serial.printf("[HTTP] GET... code: %d\n", _returnCode); + if (_returnCode == 200) { + state = true; + break; + } + else { + state = false; + break; + } + } + } + } + client.stop(); + } + return state; +} + Nefry_lib Nefry; \ No newline at end of file diff --git a/cores/esp32/nefry/Nefry.h b/cores/esp32/nefry/Nefry.h index 46c8b230e98..c9f95954664 100644 --- a/cores/esp32/nefry/Nefry.h +++ b/cores/esp32/nefry/Nefry.h @@ -12,6 +12,8 @@ #include "NefryDisplay.h" #include "NefryWeb.h" #include "NefryWebServer.h" +#include "./inc/WiFi/src/WiFiClient.h" + // Offset: W R G B #define NEO_RGB ((0 << 6) | (0 << 4) | (1 << 2) | (2)) @@ -160,6 +162,8 @@ class Nefry_lib _swPushingflg = false, _wifiEnableFlg = true,/* Wi-Fiの有効無効化 */ _displayStatusFlg = true;/* ディスプレイの状態表示の有効無効化 */ + + bool setAnalyticsData(String action); int _bootMode = -1, /* Boot状態を管理　-1:初期化中 0:起動中 1:通常起動 2:書き込みモード */ From 041fbcd320c647a97ea3b9a4a7f1b99ebcbca96c Mon Sep 17 00:00:00 2001 From: wamisnet Date: Thu, 15 Mar 2018 20:08:51 +0900 Subject: [PATCH 13/18] =?UTF-8?q?LED=E5=88=B6=E5=BE=A1=E3=83=94=E3=83=B3?= =?UTF-8?q?=E5=A4=89=E6=9B=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- variants/nefrybt-r3/pins_arduino.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/variants/nefrybt-r3/pins_arduino.h b/variants/nefrybt-r3/pins_arduino.h index 51d736943a2..369e197366f 100644 --- a/variants/nefrybt-r3/pins_arduino.h +++ b/variants/nefrybt-r3/pins_arduino.h @@ -49,8 +49,8 @@ static const uint8_t T3 = 32; static const uint8_t DAC1 = 25; static const uint8_t DAC2 = 26; -static const uint8_t LED_CLK = 35; -static const uint8_t LED_DO = 34; +static const uint8_t LED_CLK = 27; +static const uint8_t LED_DO = 12; static const uint8_t boardId = 3;//Nefry BT R3 From 61b6307b18137acc85237607c6f8d7499c34004f Mon Sep 17 00:00:00 2001 From: wamisnet Date: Thu, 15 Mar 2018 20:09:12 +0900 Subject: [PATCH 14/18] =?UTF-8?q?=E3=83=9C=E3=83=BC=E3=83=89=E3=83=8D?= =?UTF-8?q?=E3=83=BC=E3=83=A0=E3=83=90=E3=82=B0=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- cores/esp32/nefry/Nefry.cpp | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/cores/esp32/nefry/Nefry.cpp b/cores/esp32/nefry/Nefry.cpp index 3fa8ecfde30..9fd59df8569 100644 --- a/cores/esp32/nefry/Nefry.cpp +++ b/cores/esp32/nefry/Nefry.cpp @@ -368,7 +368,10 @@ String Nefry_lib::getDefaultModuleId() { String _devstr,ms; switch (boardId) { - case 0:case 1: + case 0: + case 1: + case 2: + case 3: moduleName = "NefryBT"; break; } From a739fa2cba19b8b97b033aa4fe561523f473c8b8 Mon Sep 17 00:00:00 2001 From: wamisnet Date: Thu, 15 Mar 2018 20:10:02 +0900 Subject: [PATCH 15/18] =?UTF-8?q?=E6=83=85=E5=A0=B1=E8=BF=BD=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- cores/esp32/nefry/Nefry.cpp | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/cores/esp32/nefry/Nefry.cpp b/cores/esp32/nefry/Nefry.cpp index 9fd59df8569..e69d5e8a9ff 100644 --- a/cores/esp32/nefry/Nefry.cpp +++ b/cores/esp32/nefry/Nefry.cpp @@ -498,8 +498,12 @@ bool Nefry_lib::setAnalyticsData(String action) { url += getVersion(); url += "&ea="; url += action; + url += "&ds="; - + String _devstr; + _devstr = WiFi.macAddress(); + _devstr.replace(":", ""); + url += (String)"NefryBT-" + _devstr.substring(8); //Serial.print("Requesting URL: "); //Serial.println(url); From 289930356cb6bfb4737126ba5fa9011466ce2212 Mon Sep 17 00:00:00 2001 From: wamisnet Date: Thu, 15 Mar 2018 20:35:24 +0900 Subject: [PATCH 16/18] =?UTF-8?q?Nefry=E3=83=81=E3=83=A5=E3=83=BC=E3=83=88?= =?UTF-8?q?=E3=83=AA=E3=82=A2=E3=83=AB=E6=9C=AC=E3=82=B5=E3=83=B3=E3=83=97?= =?UTF-8?q?=E3=83=AB=E3=82=B3=E3=83=BC=E3=83=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitmodules | 5 ++++- libraries/TutorialBookExample | 1 + 2 files changed, 5 insertions(+), 1 deletion(-) create mode 160000 libraries/TutorialBookExample diff --git a/.gitmodules b/.gitmodules index 3db86353940..7ba55883ce5 100644 --- a/.gitmodules +++ b/.gitmodules @@ -3,4 +3,7 @@ url = https://github.com/wamisnet/ConfigurableFirmata.git [submodule "libraries/Nefry_ThingSpeak/src/include"] path = libraries/Nefry_ThingSpeak/src/include -url=https://github.com/wamisnet/thingspeak-arduino.git \ No newline at end of file +url=https://github.com/wamisnet/thingspeak-arduino.git +[submodule "libraries/TutorialBookExample"] + path = libraries/TutorialBookExample + url = git@github.com:Nefry-Community/TutorialExample.git diff --git a/libraries/TutorialBookExample b/libraries/TutorialBookExample new file mode 160000 index 00000000000..834aaeb2af2 --- /dev/null +++ b/libraries/TutorialBookExample @@ -0,0 +1 @@ +Subproject commit 834aaeb2af24be423b77fb6ed46f46e85d81f969 From 8a514fadf346a5009313234bf700875f1dfd45ce Mon Sep 17 00:00:00 2001 From: wamisnet Date: Thu, 15 Mar 2018 20:37:27 +0900 Subject: [PATCH 17/18] =?UTF-8?q?=E3=82=B5=E3=83=B3=E3=83=97=E3=83=AB?= =?UTF-8?q?=E3=82=B3=E3=83=BC=E3=83=89=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- libraries/TutorialBookExample | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libraries/TutorialBookExample b/libraries/TutorialBookExample index 834aaeb2af2..60a5540e2e2 160000 --- a/libraries/TutorialBookExample +++ b/libraries/TutorialBookExample @@ -1 +1 @@ -Subproject commit 834aaeb2af24be423b77fb6ed46f46e85d81f969 +Subproject commit 60a5540e2e2a9a7780a5b08bd74e9659d4dd4d6f From 1abbd00f746859e99d6009cf2dc9323fb6ce7d04 Mon Sep 17 00:00:00 2001 From: wamisnet Date: Thu, 15 Mar 2018 20:48:39 +0900 Subject: [PATCH 18/18] =?UTF-8?q?=E3=82=B5=E3=83=96=E3=83=A2=E3=82=B8?= =?UTF-8?q?=E3=83=A5=E3=83=BC=E3=83=ABURL=E3=82=92=E5=A4=89=E6=9B=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitmodules | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitmodules b/.gitmodules index 7ba55883ce5..e7c7a93b06f 100644 --- a/.gitmodules +++ b/.gitmodules @@ -3,7 +3,7 @@ url = https://github.com/wamisnet/ConfigurableFirmata.git [submodule "libraries/Nefry_ThingSpeak/src/include"] path = libraries/Nefry_ThingSpeak/src/include -url=https://github.com/wamisnet/thingspeak-arduino.git + url=https://github.com/wamisnet/thingspeak-arduino.git [submodule "libraries/TutorialBookExample"] path = libraries/TutorialBookExample - url = git@github.com:Nefry-Community/TutorialExample.git + url = https://github.com/Nefry-Community/TutorialExample.git