vmario
/
doodle3d-firmware
mirror of https://github.com/Doodle3D/doodle3d-firmware.git
0
0
Fork 0
Code Issues Releases Wiki Activity

Change require statements in code to reflect new structure; rename autowifi -> wifibox everywhere.

This commit is contained in:
Wouter R 2013-07-04 17:26:13 +02:00
parent f298fbf0db
commit 0b298b5e46
8 changed files with 28 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
post-install.sh
View File

@ -54,21 +54,28 @@ if [ $? -eq 1 ]; then
cat <<-EOM >> /root/.profile cat <<-EOM >> /root/.profile
# DO NOT MODIFY - this block of lines has been added by the wifibox package. # DO NOT MODIFY - this block of lines has been added by the wifibox package.
alias wfcfr='/usr/share/lua/autowifi/ext/wfcf' alias d3dapi='/usr/share/lua/wifibox/script/d3dapi'
alias encore='ulimit -c unlimited' alias encore='ulimit -c unlimited'
EOM EOM
fi fi
### Finally make sure basic configuration is set correctly ### Finally make sure basic configuration is set correctly
echo "Enabling wifi device..." echo "s_$IPKG_INSTROOT_"
uci set wireless.@wifi-device[0].disabled=0; uci commit wireless; wifi echo "ss_$$IPKG_INSTROOT_"
echo "ssa_$${IPKG_INSTROOT}_"
if [ -z "$IPKG_INSTROOT" ]; then
echo "Enabling wifi device..."
uci set wireless.@wifi-device[0].disabled=0; uci commit wireless; wifi
addFirewallNet addFirewallNet
echo "Adding network interface 'wlan'..." echo "Adding network interface 'wlan'..."
uci set network.wlan=interface; uci commit network; /etc/init.d/network reload uci set network.wlan=interface; uci commit network; /etc/init.d/network reload
[ -z "$$IPKG_INSTROOT" ] || { /etc/init.d/autowifi_init enable; } /etc/init.d/wifibox_init enable
else
echo "WARNING: WiFiBox network configuration can only be prepared when installing on real device"
fi
exit 0 exit 0

4
pre-remove.sh
View File

@ -1,5 +1,7 @@
#!/bin/sh #!/bin/sh
[ -z "$$IPKG_INSTROOT" ] || { /etc/init.d/autowifi_init disable; } if [ -z "$$IPKG_INSTROOT" ]; then
/etc/init.d/autowifi_init disable
fi
exit 0 exit 0

6
src/main.lua
View File

@ -18,10 +18,10 @@ io.write ("Content-type: text/plain\r\n\r\n")
local u = require("util") local u = require("util")
local l = require("logger") local l = require("logger")
local wifi = require("wifihelper") local wifi = require("network.wlanconfig")
local reconf = require("reconf") local reconf = require("network.netconf")
local urlcode = require("util.urlcode")
local uci = require("uci").cursor() local uci = require("uci").cursor()
local urlcode = require("urlcode")
local iwinfo = require("iwinfo") local iwinfo = require("iwinfo")
local argOperation, argDevice, argSsid, argPhrase, argRecreate local argOperation, argDevice, argSsid, argPhrase, argRecreate

4
src/network/netconfig.lua
View File

@ -7,8 +7,8 @@ local reconf = {}
local wifi local wifi
local reloadSilent local reloadSilent
M.WWW_CAPTIVE_PATH = "/usr/share/lua/autowifi/ext/www" M.WWW_CAPTIVE_PATH = "/usr/share/lua/wifibox/ext/www"
M.WWW_CAPTIVE_INDICATOR = "/www/.autowifi-inplace" M.WWW_CAPTIVE_INDICATOR = "/www/.wifibox-inplace"
M.WWW_RENAME_NAME = "/www-regular" M.WWW_RENAME_NAME = "/www-regular"

2
src/network/wlanconfig.lua
View File

@ -1,4 +1,4 @@
local reconf = require("reconf") local reconf = require("network.netconf")
local util = require("util") local util = require("util")
local l = require("logger") local l = require("logger")
local uci = require("uci").cursor() local uci = require("uci").cursor()

4
src/www/captive.keep/index.html
View File

@ -2,9 +2,9 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd"> <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml"> <html xmlns="http://www.w3.org/1999/xhtml">
<head> <head>
<meta http-equiv="refresh" content="0; URL=/admin/autowifi.html" /> <meta http-equiv="refresh" content="0; URL=/admin/wifibox.html" />
</head> </head>
<body style="background-color: black"> <body style="background-color: black">
<a style="color: white; text-decoration: none" href="/admin/autowifi.html">Doodle 3D - Wireless Network Configuration</a> <a style="color: white; text-decoration: none" href="/admin/wifibox.html">Doodle 3D - Wireless Network Configuration</a>
</body> </body>
</html> </html>

2
src/www/wifibox/index.html
View File

@ -3,5 +3,5 @@
</head> </head>
<html><body> <html><body>
<a href="updater.html">Updates</a><br /> <a href="updater.html">Updates</a><br />
<a href="autowifi.html">Wireless network management</a><br /> <a href="wifibox.html">Wireless network management</a><br />
</body></html> </body></html>

4
src/www/wifibox/wifibox.html
View File

@ -4,8 +4,8 @@
<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-15" /> <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-15" />
<title>Wireless configuration</title> <title>Wireless configuration</title>
<script type="text/javascript" src="/admin/jquery-1.9.1.min.js"></script> <script type="text/javascript" src="/admin/jquery-1.9.1.min.js"></script>
<script type="text/javascript" src="/admin/autowifi.js"></script> <script type="text/javascript" src="/admin/wifibox.js"></script>
<link href="/admin/autowifi.css" rel="stylesheet" type="text/css" /> <link href="/admin/wifibox.css" rel="stylesheet" type="text/css" />
</head> </head>
<body> <body>