Skip to content

Commit d9ed7e0

Browse files
wamisnetwamisnet
authored
Merge pull request #19 from Nefry-Community/develop
0.6.1 ライブラリー
2 parents 960f08c + b7c4d79 commit d9ed7e0

File tree

16 files changed

+236
-114
lines changed

16 files changed

+236
-114
lines changed

‎boards.txt

Lines changed: 40 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -58,43 +58,43 @@ esp32.menu.DebugLevel.verbose.build.code_debug=5
5858

5959
##############################################################
6060

61-
nefryicing.name=Nefry Icing
62-
63-
nefryicing.upload.tool=esptool
64-
nefryicing.upload.maximum_size=1044464
65-
nefryicing.upload.maximum_data_size=294912
66-
nefryicing.upload.wait_for_upload_port=true
67-
68-
nefryicing.serial.disableDTR=true
69-
nefryicing.serial.disableRTS=true
70-
71-
nefryicing.build.mcu=esp32
72-
nefryicing.build.core=esp32
73-
nefryicing.build.variant=esp32
74-
nefryicing.build.board=Nefry_Icing
75-
76-
nefryicing.build.f_cpu=240000000L
77-
nefryicing.build.flash_mode=dio
78-
nefryicing.build.flash_size=4MB
79-
80-
nefryicing.build.flash_freq=80m
81-
82-
nefryicing.menu.UploadSpeed.512000.windows=512000
83-
nefryicing.menu.UploadSpeed.512000.upload.speed=512000
84-
nefryicing.menu.UploadSpeed.115200=115200
85-
nefryicing.menu.UploadSpeed.115200.upload.speed=115200
86-
nefryicing.menu.UploadSpeed.921600=921600
87-
nefryicing.menu.UploadSpeed.921600.upload.speed=921600
88-
89-
nefryicing.menu.DebugLevel.none=None
90-
nefryicing.menu.DebugLevel.none.build.code_debug=0
91-
nefryicing.menu.DebugLevel.error=Error
92-
nefryicing.menu.DebugLevel.error.build.code_debug=1
93-
nefryicing.menu.DebugLevel.warn=Warn
94-
nefryicing.menu.DebugLevel.warn.build.code_debug=2
95-
nefryicing.menu.DebugLevel.info=Info
96-
nefryicing.menu.DebugLevel.info.build.code_debug=3
97-
nefryicing.menu.DebugLevel.debug=Debug
98-
nefryicing.menu.DebugLevel.debug.build.code_debug=4
99-
nefryicing.menu.DebugLevel.verbose=Verbose
100-
nefryicing.menu.DebugLevel.verbose.build.code_debug=5
61+
nefrybt.name=Nefry BT
62+
63+
nefrybt.upload.tool=esptool
64+
nefrybt.upload.maximum_size=1044464
65+
nefrybt.upload.maximum_data_size=294912
66+
nefrybt.upload.wait_for_upload_port=true
67+
68+
nefrybt.serial.disableDTR=true
69+
nefrybt.serial.disableRTS=true
70+
71+
nefrybt.build.mcu=esp32
72+
nefrybt.build.core=esp32
73+
nefrybt.build.variant=esp32
74+
nefrybt.build.board=Nefry_Icing
75+
76+
nefrybt.build.f_cpu=240000000L
77+
nefrybt.build.flash_mode=dio
78+
nefrybt.build.flash_size=4MB
79+
80+
nefrybt.build.flash_freq=80m
81+
82+
nefrybt.menu.UploadSpeed.512000.windows=512000
83+
nefrybt.menu.UploadSpeed.512000.upload.speed=512000
84+
nefrybt.menu.UploadSpeed.115200=115200
85+
nefrybt.menu.UploadSpeed.115200.upload.speed=115200
86+
nefrybt.menu.UploadSpeed.921600=921600
87+
nefrybt.menu.UploadSpeed.921600.upload.speed=921600
88+
89+
nefrybt.menu.DebugLevel.none=None
90+
nefrybt.menu.DebugLevel.none.build.code_debug=0
91+
nefrybt.menu.DebugLevel.error=Error
92+
nefrybt.menu.DebugLevel.error.build.code_debug=1
93+
nefrybt.menu.DebugLevel.warn=Warn
94+
nefrybt.menu.DebugLevel.warn.build.code_debug=2
95+
nefrybt.menu.DebugLevel.info=Info
96+
nefrybt.menu.DebugLevel.info.build.code_debug=3
97+
nefrybt.menu.DebugLevel.debug=Debug
98+
nefrybt.menu.DebugLevel.debug.build.code_debug=4
99+
nefrybt.menu.DebugLevel.verbose=Verbose
100+
nefrybt.menu.DebugLevel.verbose.build.code_debug=5

‎cores/esp32/nefry/Nefry.cpp

Lines changed: 17 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ BootMode
2424
1 : WriteMode切替をする
2525
*/
2626

27-
#define LIBVERSION ("0.6.0")
27+
#define LIBVERSION ("0.6.1")
2828
#include "Nefry.h"
2929

3030
Adafruit_NeoPixel _NefryLED[40];
@@ -117,21 +117,21 @@ bool Nefry_lib::setUserPass(String pass)
117117

118118
/* Storage */
119119
/* Value */
120-
bool Nefry_lib::setStorageValue(long value, int pointer)
120+
bool Nefry_lib::setStoreValue(long value, int pointer)
121121
{
122122
return NefryDataStore.setStorageValue(value, pointer);
123123
}
124-
long Nefry_lib::getStorageValue(int pointer)
124+
long Nefry_lib::getStoreValue(int pointer)
125125
{
126126
return NefryDataStore.getStorageValue(pointer);
127127
}
128128

129129
/* String */
130-
bool Nefry_lib::setStorageStr(String str, int pointer)
130+
bool Nefry_lib::setStoreStr(String str, int pointer)
131131
{
132132
return NefryDataStore.setStorageStr(str, pointer);
133133
}
134-
String Nefry_lib::getStorageStr(int pointer)
134+
String Nefry_lib::getStoreStr(int pointer)
135135
{
136136
return NefryDataStore.getStorageStr(pointer);
137137
}
@@ -214,19 +214,25 @@ bool Nefry_lib::readSW() {
214214
return false;
215215
}
216216
else {
217-
return digitalRead(4);
217+
return !digitalRead(4);
218218
}
219219
return false;
220220
}
221221

222222
/* SWを押されたときに割り込まれます */
223223
void Nefry_lib::pollingSW() {
224-
if (_swEnableFlg == true && _swflg != true && digitalRead(4) == LOW) {
225-
if (_bootMode == 0) {
226-
Nefry.setLed(0xff, 0x2f, 0x00);
224+
if (_swEnableFlg == true && _swflg != true) {
225+
if(digitalRead(4) == LOW){
226+
if (_bootMode == 0) {
227+
Nefry.setLed(0xff, 0x2f, 0x00);
228+
}
229+
_swPushingflg = true;
227230
}
228-
Serial.println("push SW");
229-
_swflg = true;
231+
if (digitalRead(4) == HIGH && _swPushingflg == true) {
232+
_swPushingflg = false;
233+
_swflg = true;
234+
}
235+
230236
}
231237
}
232238
bool Nefry_lib::getPollingSW()

‎cores/esp32/nefry/Nefry.h

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,8 @@ class Nefry_lib
2828
setModuleClass(String className),
2929
setUser(String user),
3030
setUserPass(String pass),
31-
setStorageValue(long value, int pointer),
32-
setStorageStr(String str, int pointer),
31+
setStoreValue(long value, int pointer),
32+
setStoreStr(String str, int pointer),
3333
getWriteMode(),
3434
readSW(),
3535
getPollingSW();
@@ -38,13 +38,13 @@ class Nefry_lib
3838
getModuleID(),
3939
getModuleClass(),
4040
getUser(),
41-
getStorageStr(int pointer),
41+
getStoreStr(int pointer),
4242
getVersion(),
4343
getProgramName(),
4444
getAddressStr(IPAddress ip);
4545

4646
long
47-
getStorageValue(int pointer);
47+
getStoreValue(int pointer);
4848

4949

5050
void
@@ -70,9 +70,10 @@ class Nefry_lib
7070
pollingSW();
7171

7272
private:
73-
bool
73+
bool
7474
_swEnableFlg = false,/* SWの有効無効化 */
75-
_swflg = false; /* SWの状態を保持 */
75+
_swflg = false, /* SWの状態を保持 */
76+
_swPushingflg = false;
7677

7778
int
7879
_bootMode = 0, /* Boot状態を管理　0:起動中 1:通常起動 2:書き込みモード */

‎cores/esp32/nefry/NefryConfig.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@ ModulePass : Nefryが発信するWiFiパスワード
1313
ModuleClass : Nefryのモジュールが属するクラス
1414
user : Nefryでログイン機能を使うときに使用するユーザ名
1515
userPass : Nefryでログイン機能を使うときに使用するパスワード
16-
StorageValue: Nefryの環境変数を保存するときに使用する。(0-7)の範囲で保存する。末端に数字が追加される long型
17-
StorageStr : Nefryの環境変数を保存するときに使用する。(0-7)の範囲で保存する。末端に数字が追加される String型
16+
StoreValue : Nefryの環境変数を保存するときに使用する。(0-7)の範囲で保存する。末端に数字が追加される long型
17+
StoreStr : Nefryの環境変数を保存するときに使用する。(0-7)の範囲で保存する。末端に数字が追加される String型
1818
*/
1919

2020
#include "NefryConfig.h"
@@ -26,7 +26,7 @@ String Nefry_Conf::beginWeb(String link) {
2626
if (link.equals("config")) {
2727
String content = F("<h1>Nefry DataStore Setup</h1><p>このページはプログラム内から読み書きした値を表示、編集することができます。</p>"
2828
"<p>わざわざプログラムを書き換えずに値を変更できるためWebサービスでアクセスキーが必要になる場合など環境変数として扱うことができます。</p>"
29-
"<ul><li>setStorageValue or setStorageStr : 値の保存</li><li>getStorageValue or getStorageStr : 値の取得</li><li>setStoreTitle : 内容の表示</li></ul>"
29+
"<ul><li>setStoreValue or setStoreStr : 値の保存</li><li>getStoreValue or getStoreStr : 値の取得</li><li>setStoreTitle : 内容の表示</li></ul>"
3030
"<p>それぞれの関数の使い方はNefry公式サイトをご覧になるか、サンプルプログラムを参考にしてください。</p><form method='get'action='set_config'>");
3131
int formNumber,printCounter = 0;
3232
for (formNumber = 0; formNumber < 10; formNumber++) {

‎cores/esp32/nefry/NefryWebServer.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -145,7 +145,7 @@ void Nefry_webserver::run() {
145145
NefryDataStore.setStorageValue(s.toInt(),i);
146146
}
147147
resetTimer(2);
148-
send(200, "text/html", NefryWeb.createHtml(F("Nefry DataStore Set"), "", F("<h1>Nefry Module Set</h1><p>Restart...</p><a href=\"/\">Back to top</a>")));
148+
send(200, "text/html", NefryWeb.createHtml(F("Nefry DataStore Set"), "", F("<h1>Nefry Module Set</h1><p>Saveing & Restart...</p><a href=\"/\">Back to top</a>")));
149149
resetTimer(2);
150150
}
151151
/* "/"は必ず一番下にすること */

‎libraries/Nefry/Nefry.h

Lines changed: 27 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
1-
#ifndef Nefry_h
1+
#ifndef Nefry_h
22
#define Nefry_h
33

4-
5-
4+
#include <Arduino.h>
65

76

87
class Nefry_lib
@@ -15,17 +14,23 @@ class Nefry_lib
1514
setModuleClass(String className),
1615
setUser(String user),
1716
setUserPass(String pass),
18-
setStorageValue(long value, int pointer),
19-
setStorageStr(String str, int pointer);
17+
setStoreValue(long value, int pointer),
18+
setStoreStr(String str, int pointer),
19+
getWriteMode(),
20+
readSW(),
21+
getPollingSW();
2022

2123
String
2224
getModuleID(),
2325
getModuleClass(),
2426
getUser(),
25-
getStorageStr(int pointer);
27+
getStoreStr(int pointer),
28+
getVersion(),
29+
getProgramName(),
30+
getAddressStr(IPAddress ip);
2631

2732
long
28-
getStorageValue(int pointer);
33+
getStoreValue(int pointer);
2934

3035

3136
void
@@ -38,54 +43,28 @@ class Nefry_lib
3843
addWiFi(String ssid, String pass),
3944
deleteWiFi(int id),
4045
saveWiFi(),
41-
/*
42-
println(float text),
43-
println(double text),
44-
println(char text),
45-
println(int text),
46-
println(long text),
47-
println(unsigned char text),
48-
println(unsigned int text),
49-
println(unsigned long text),
50-
print(float text),
51-
print(double text),
52-
print(char text),
53-
print(int text),
54-
print(long text),
55-
print(unsigned char text),
56-
print(unsigned int text),
57-
print(unsigned long text),
58-
print(String text, int ln = 0),
59-
println(String text),
60-
*/
6146
nefry_init(),
6247
nefry_loop(),
63-
ndelay(unsigned long ms);
48+
ndelay(unsigned long ms),
6449

65-
void enableSW();
50+
setStoreTitle(const char set[15], const int num),
6651

67-
void disableSW();
68-
69-
bool
70-
readSW();
71-
72-
void pollingSW();
73-
bool getBootFlg();
74-
75-
76-
String
77-
getVersion(),
78-
getProgramName(),
79-
getAddressStr(IPAddress ip);
52+
enableSW(),
53+
disableSW(),
8054

55+
/* Pollingでスイッチの状態をチェック */
56+
pollingSW();
8157

8258
private:
83-
bool _swEnableFlg;
84-
bool _bootMode = true, _swflg = false;
85-
int hextonum(char c);
59+
bool
60+
_swEnableFlg = false,/* SWの有効無効化 */
61+
_swflg = false; /* SWの状態を保持 */
8662

63+
int
64+
_bootMode = 0, /* Boot状態を管理　0:起動中 1:通常起動 2:書き込みモード */
65+
hextonum(char c);
66+
67+
const char * program;
8768
};
8869
extern Nefry_lib Nefry;
89-
#endif
90-
91-
void _swcallback_function();
70+
#endif

‎libraries/Nefry/keywords.txt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@ setModulePass KEYWORD2
1919
setModuleClass KEYWORD2
2020
setUser KEYWORD2
2121
setUserPass KEYWORD2
22-
setStorageValue KEYWORD2
23-
setStorageStr KEYWORD2
22+
setStoreValue KEYWORD2
23+
setStoreStr KEYWORD2
2424
setUser KEYWORD2
2525

2626
#######################################
@@ -30,8 +30,8 @@ setUser KEYWORD2
3030
getModuleID KEYWORD2
3131
getModuleClass KEYWORD2
3232
getUser KEYWORD2
33-
getStorageStr KEYWORD2
34-
getStorageValue KEYWORD2
33+
getStoreStr KEYWORD2
34+
getStoreValue KEYWORD2
3535
getBootFlg KEYWORD2
3636

3737
#######################################

‎libraries/Nefry/library.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
name=Nefry
2-
version=0.6.0
2+
version=0.6.1
33
author=Nefry community
44
maintainer=
55
sentence=nefry.

‎libraries/Nefy_IFTTT/NefryIFTTT.cpp

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
/**
2+
Nefry IFTTT lib
3+
4+
Copyright (c) 2015 wami
5+
6+
This software is released under the MIT License.
7+
http://opensource.org/licenses/mit-license.php
8+
*/
9+
10+
#include "NefryIFTTT.h"
11+
12+
bool Nefry_IFTTT::send(String event, String Secretkey, String data1, String data2, String data3)
13+
{
14+
String _data = "{\"value1\":\"";
15+
_data += data1;
16+
_data += "\",\"value2\":\"";
17+
_data += data2;
18+
_data += "\",\"value3\":\"";
19+
_data += data3;
20+
_data += "\"}";
21+
WiFiClient client;
22+
if (client.connect("maker.ifttt.com", 80)) {
23+
//Nefry.println("connection");
24+
client.println("POST /trigger/" + event + "/with/key/" + Secretkey + " HTTP/1.1");
25+
client.println("Host: maker.ifttt.com");
26+
client.println("User-Agent: ESP8266/1.0");
27+
client.println("Connection: close");
28+
client.println("Content-Type: application/json");
29+
client.print("Content-Length: ");
30+
client.println(_data.length());
31+
client.println();
32+
client.println(_data);
33+
delay(10);
34+
return true;
35+
}
36+
return false;
37+
}
38+
Nefry_IFTTT IFTTT;

0 commit comments

Comments
 (0)