ThingSpeakライブラリ更新

Author: wamisnet

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() {

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() {

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() {

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() {

libraries/Nefry_ThingSpeak/src/NefryThingSpeak.cpp

@@ -11,38 +11,63 @@ NefryThingSpeakClass NefryThingSpeak;
 
 void NefryThingSpeakClass::begin(int nefryConfigChannelNumber, const char* hint)
 {
+	_nefryThingsChannelAPIKey = 0;
 	ThingSpeak.begin(_nefryThingClient);
 	_nefryConfigChannelNumber = nefryConfigChannelNumber;
 	Nefry.setStoreTitleValue(hint, _nefryConfigChannelNumber);
 }
 
 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)

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