Merge pull request OpenHD#10 from HD-Fpv/refactor

Refactor Names to reflect OpenHD

RemoteSettings/RemoteSettings.py

@@ -17,7 +17,7 @@
 from time import sleep
 import threading
 
-WFBCSettingsFile = "/boot/wifibroadcast-1.txt"
+WFBCSettingsFile = "/boot/openhd-settings-1.txt"
 OSDSettingsFile = "/boot/osdconfig.txt"
 JoystickSettingsFile = "/boot/joyconfig.txt"
 IPAndroidClient = ""

RemoteSettings/RemoteSettingsAir.py

@@ -18,7 +18,7 @@
 from time import sleep
 
 
-WFBCSettingsFile = "/boot/wifibroadcast-1.txt"
+WFBCSettingsFile = "/boot/openhd-settings-1.txt"
 OSDSettingsFile = "/boot/osdconfig.txt"
 JoystickSettingsFile = "/boot/joyconfig.txt"
 IsTerminateRemoteSettingsPath = "/tmp/IsTerminateRemoteSettingsPath.txt"
@@ -37,7 +37,6 @@
 
 
 wbc_settings_blacklist = [""]
-
 def replace_OSD_config(LookFor, NewLine):
     os.system('mount -o remount,rw /boot')
 #example: #define COPTER true

RemoteSettings/RemoteSettingsWFBC_UDP_Air.sh

@@ -5,11 +5,11 @@ if [ -e "/tmp/settings.sh" ]; then
     if [ "$?" == "0" ]; then
         source /tmp/settings.sh
     else
-        echo "ERROR: wifobroadcast config file contains syntax error(s)!"
+        echo "ERROR: openhd settings file contains syntax error(s)!"
         collect_errorlog
         sleep 365d
     fi else
-    echo "ERROR: wifobroadcast config file not found!"
+    echo "ERROR: openhd settings file not found!"
     collect_errorlog
     sleep 365d
 fi

wifibroadcast-scripts/global_functions.sh

@@ -87,12 +87,12 @@ function read_config_file {
 		if [ "$?" == "0" ]; then
 			source /tmp/settings.sh
 		else
-			echo "ERROR: wifibroadcast config file contains syntax error(s)!"
+			echo "ERROR: openhd-settings file contains syntax error(s)!"
 			collect_errorlog
 			sleep 365d
 		fi
 	else
-		echo "ERROR: wifibroadcast config file not found!"
+		echo "ERROR: openhd-settings file not found!"
 		collect_errorlog
 		sleep 365d
 	fi

wifibroadcast-scripts/main.sh

@@ -1,5 +1,5 @@
 ###############################################################################
-# The main entrypoint for the Wifibroadcast system.							
+# The main entrypoint for the OpendHD system.							
 # Based heavily on the EZ-Wifibroadcast .profile script.
 ###############################################################################
 
@@ -108,9 +108,9 @@ case $TTY in
 	# sleep until everything else is loaded (atheros cards and usb flakyness ...)
 	sleep 6
 	if [ "$CAM" == "0" ]; then
-	    EZHOSTNAME="wifibrdcast-rx"
+	    EZHOSTNAME="openhd-GroundPi"
 	else
-	    EZHOSTNAME="wifibrdcast-tx"
+	    EZHOSTNAME="openhd-AirPi"
 	fi
 	# only configure ethernet network interface via DHCP if ethernet hotspot is disabled
 	if [ "$ETHERNET_HOTSPOT" == "N" ]; then
@@ -167,22 +167,22 @@ case $TTY in
     /dev/tty12) # tty for local interactive login
 	echo
 	if [ "$CAM" == "0" ]; then
-	    echo -n "Welcome to EZ-Wifibroadcast 1.6 (RX) - "
+	    echo -n "Welcome to OpenHD"
 	    read -p "Press <enter> to login"
 	    killall osd
 	    rw
 	else
-	    echo -n "Welcome to EZ-Wifibroadcast 1.6 (TX) - "
+	    echo -n "Welcome to OpenHD"
 	    read -p "Press <enter> to login"
 	    rw
 	fi
     ;;
     *) # all other ttys used for interactive login
 	if [ "$CAM" == "0" ]; then
-	    echo "Welcome to EZ-Wifibroadcast 1.6 (RX) - type 'ro' to switch filesystems back to read-only"
+	    echo "Welcome to OpenHD (GroundPi) - type 'ro' to switch filesystems back to read-only"
 	    rw
 	else
-	    echo "Welcome to EZ-Wifibroadcast 1.6 (TX) - type 'ro' to switch filesystems back to read-only"
+	    echo "Welcome to OpenHD (AirPi) - type 'ro' to switch filesystems back to read-only"
 	    rw
 	fi
     ;;