Merge branch 'master' into master

Honey-Pi · Mar 10, 2020 · 0fbc808 · 0fbc808
2 parents 67f6286 + c3e359f
commit 0fbc808
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/backend/check_thingspeak.php b/backend/check_thingspeak.php
@@ -5,7 +5,7 @@
 
     function is_channel_correct($writeKey)
     {
-        $filename = 'https://api.thingspeak.com/update?api_key='.$writeKey.'&field1=0';
+        $filename = 'http://api.thingspeak.com/update?api_key='.$writeKey.'&field1=0';
         $check = "0";
         try {
             $content = @file_get_contents($filename);

diff --git a/backend/shell-scripts/change_router_ssidpw.sh b/backend/shell-scripts/change_router_ssidpw.sh
@@ -5,3 +5,6 @@ pw=$2;
 
 sudo sed -i "s/psk=.*/psk=\"$pw\"/" /etc/wpa_supplicant/wpa_supplicant.conf;
 sudo sed -i "s/^[[:blank:]]*ssid=.*/ssid=\"$ssid\"/" /etc/wpa_supplicant/wpa_supplicant.conf;
+
+# connect to wifi without reboot
+sudo wpa_cli -i wlan0 reconfigure