diff --git a/M5StickCPlus_FactoryTest2022.ino b/M5StickCPlus_FactoryTest2022.ino index 96da1f7..13bbb94 100644 --- a/M5StickCPlus_FactoryTest2022.ino +++ b/M5StickCPlus_FactoryTest2022.ino @@ -1594,7 +1594,7 @@ #ifdef ENABLE_OTA const char *ssid = "miura2g"; -const char *password = "jikkenICS"; +const char *password = "jikkenics"; void OTA_Setup() { WiFi.softAPdisconnect(true); diff --git a/SampleSrc/Upload.sh b/SampleSrc/Upload.sh index e8cbde2..9fc6e91 100755 --- a/SampleSrc/Upload.sh +++ b/SampleSrc/Upload.sh @@ -1,6 +1,6 @@ #!/bin/bash -### (1) mosi hikisuu ga areba, suguni jikkou +### (2) mosi hikisuu ga niko areba, file,port to site jikkou if [ $# -eq 2 ] ; then file=$1 port=$2 @@ -12,7 +12,19 @@ exit fi -### (2) hikisuu ga nakereba, list and select +### (1) mosi hikisuu ga ikko areba, sono file wo jikkou + +if [ $# -eq 1 ] ; then + file=$1 + echo "compile ${file} and upload" + cp ${file} TestBuild/TestBuild.ino + cd TestBuild + ./compile.sh 2>&1 && ./upload.sh + cd .. + exit +fi + +### (0) hikisuu ga nakereba, list and select ary=() diff --git a/SampleSrc/httpclient01.ino b/SampleSrc/httpclient01.ino index 4da4385..bd28bd7 100644 --- a/SampleSrc/httpclient01.ino +++ b/SampleSrc/httpclient01.ino @@ -3,7 +3,7 @@ #include // ステータスコードの定義もここにある const char* ssid = "miura2g"; -const char* password = "jikkenICS"; +const char* password = "jikkenics"; void setup() { diff --git a/SampleSrc/httpserver01.ino b/SampleSrc/httpserver01.ino index ae1a0ed..1fb09c7 100644 --- a/SampleSrc/httpserver01.ino +++ b/SampleSrc/httpserver01.ino @@ -1,7 +1,7 @@ #include const char* ssid = "miura2g"; -const char* password = "jikkenICS"; +const char* password = "jikkenics"; WiFiServer server(80); diff --git a/SampleSrc/line01.ino b/SampleSrc/line01.ino index ddf82e7..e0f7c04 100644 --- a/SampleSrc/line01.ino +++ b/SampleSrc/line01.ino @@ -8,7 +8,7 @@ void setup() { Serial.begin(115200); WiFi.mode(WIFI_STA); - WiFiMulti.addAP("miura2g", "jikkenICS"); + WiFiMulti.addAP("miura2g", "jikkenics"); // wait for WiFi connection Serial.print("Waiting for WiFi to connect..."); diff --git a/SampleSrc/mqtt01pub.ino b/SampleSrc/mqtt01pub.ino index 787d771..dad8d18 100644 --- a/SampleSrc/mqtt01pub.ino +++ b/SampleSrc/mqtt01pub.ino @@ -5,7 +5,7 @@ #include const char* ssid = "miura2g"; -const char* password = "jikkenICS"; +const char* password = "jikkenics"; const char* server = "192.168.11.11"; // "mqtt.istlab.info"; const int port = 1883; // 注：学内ネットワークはポート制限あり。 diff --git a/SampleSrc/mqtt01sub.ino b/SampleSrc/mqtt01sub.ino index 5961bdf..0c4d2e5 100644 --- a/SampleSrc/mqtt01sub.ino +++ b/SampleSrc/mqtt01sub.ino @@ -8,7 +8,7 @@ #include const char* ssid = "miura2g"; -const char* password = "jikkenICS"; +const char* password = "jikkenics"; const char* server = "192.168.11.11"; // "mqtt.istlab.info"; const int port = 1883; // 注：学内ネットワークはポート制限あり。 diff --git a/SampleSrc/ntp01.ino b/SampleSrc/ntp01.ino index 86158eb..22487b6 100644 --- a/SampleSrc/ntp01.ino +++ b/SampleSrc/ntp01.ino @@ -1,7 +1,7 @@ #include const char* ssid = "miura2g"; -const char* password = "jikkenICS"; +const char* password = "jikkenics"; void setup() { Serial.begin(115200); diff --git a/SampleSrc/ota01.ino b/SampleSrc/ota01.ino index 5c34820..307dab3 100644 --- a/SampleSrc/ota01.ino +++ b/SampleSrc/ota01.ino @@ -3,7 +3,7 @@ #include const char *ssid = "miura2g"; -const char *password = "jikkenICS"; +const char *password = "jikkenics"; void setup() { diff --git a/SampleSrc/rtc01.ino b/SampleSrc/rtc01.ino index fe11620..fc1fead 100644 --- a/SampleSrc/rtc01.ino +++ b/SampleSrc/rtc01.ino @@ -36,7 +36,7 @@ if (USE_NTP) { const char* ssid = "miura2g"; - const char* password = "jikkenICS"; + const char* password = "jikkenics"; const char* ntpserver = "192.168.11.11"; // or ntp.nict.jp"; // or 10.64.7.184 for CIT-ap1x WiFi.begin(ssid, password); while (WiFi.status() != WL_CONNECTED) { // 接続中... diff --git a/SampleSrc/telnet01.ino b/SampleSrc/telnet01.ino index 2ce2995..558b8e4 100644 --- a/SampleSrc/telnet01.ino +++ b/SampleSrc/telnet01.ino @@ -27,7 +27,7 @@ //how many clients should be able to telnet to this ESP32 #define MAX_SRV_CLIENTS 3 const char* ssid = "miura2g"; -const char* password = "jikkenICS"; +const char* password = "jikkenics"; WiFiServer server(23); WiFiClient serverClients[MAX_SRV_CLIENTS]; diff --git a/SampleSrc/wifi01.ino b/SampleSrc/wifi01.ino index 082539b..71b26f6 100644 --- a/SampleSrc/wifi01.ino +++ b/SampleSrc/wifi01.ino @@ -2,7 +2,7 @@ #include const char* ssid = "miura2g"; -const char* password = "jikkenICS"; +const char* password = "jikkenics"; void setup() { M5.begin(); @@ -13,7 +13,7 @@ WiFi.begin(ssid, password); // 接続開始 while (WiFi.status() != WL_CONNECTED) { // 接続中... M5.Beep.tone(2000); delay(200); - M5.Beep.mute(); delay(300); + M5.Beep.mute(); delay(1000); M5.Lcd.print("."); } // 接続完了！！ diff --git a/SampleSrc/wifi02.ino b/SampleSrc/wifi02.ino new file mode 100644 index 0000000..f34f7b5 --- /dev/null +++ b/SampleSrc/wifi02.ino @@ -0,0 +1,47 @@ +// 複数のアクセスポイント(AP)を同時に探索し、強いAPに接続する +#include +#include +#include + +WiFiMulti wifiMulti; +const char *ssid1 = "miura2g"; // 2.4GHzのみ。5GHzはNG +const char *password1 = "jikkenics"; +const char *ssid2 = "your_wifi"; +const char *password2 = "xxxxx"; + +void setup() +{ + M5.begin(); + M5.Lcd.setRotation(3); + M5.Lcd.fillScreen(ORANGE); + M5.Lcd.setCursor(10, 50, 4); + + // wifiMulti.addAP(ssid1, password1); // 上で設定した変数で設定 + // wifiMulti.addAP(ssid2, password2); + wifiMulti.addAP("third_one", "xxxxx"); // 直接文字列で設定。どちらも同じ。 + + M5.Lcd.print("connecting..."); + + while (wifiMulti.run() != WL_CONNECTED) // 接続成功するまで時間がかかる + { // 接続中... + M5.Beep.tone(2000); + delay(200); + M5.Beep.mute(); + delay(300); + M5.Lcd.print("."); + } + // 接続完了！！ + M5.Beep.tone(4000); + M5.Lcd.fillScreen(GREEN); + M5.Lcd.setCursor(0, 40, 4); + M5.Lcd.setTextColor(BLACK, GREEN); + M5.Lcd.print(" Wifi Connected!\n "); + String gotip = WiFi.localIP().toString(); // m5デバイスのIPアドレス + M5.Lcd.println(gotip); + delay(1500); + M5.Beep.mute(); +} + +void loop() +{ +} diff --git a/SampleSrc/wifimac.ino b/SampleSrc/wifimac.ino index d72a769..af5db73 100644 --- a/SampleSrc/wifimac.ino +++ b/SampleSrc/wifimac.ino @@ -2,7 +2,7 @@ #include const char *ssid = "miura2g"; -const char *password = "jikkenICS"; +const char *password = "jikkenics"; void setup() { diff --git a/wifi.ino b/wifi.ino index fa99cf8..1e4f976 100644 --- a/wifi.ino +++ b/wifi.ino @@ -2,7 +2,7 @@ #include const char *ssid = "miura2g"; // 802.11b/g (2.4GHz)only. 5GHz is not supported. -const char *password = "jikkenICS"; +const char *password = "jikkenics"; // const char *ntpserver = "192.168.11.11"; //実験室ローカルNTPサーバ const char *ntpserver = "ntp.nict.jp";