Index: denali.pro.user =================================================================== diff -u -r0629dfe6bcc3e85047319284fa4c534efbf58594 -rd71990c79c75c613d781890c6f77505d409d6c64 --- denali.pro.user (.../denali.pro.user) (revision 0629dfe6bcc3e85047319284fa4c534efbf58594) +++ denali.pro.user (.../denali.pro.user) (revision d71990c79c75c613d781890c6f77505d409d6c64) @@ -1,6 +1,6 @@ - + EnvironmentId Index: scripts/run.sh =================================================================== diff -u -r0629dfe6bcc3e85047319284fa4c534efbf58594 -rd71990c79c75c613d781890c6f77505d409d6c64 --- scripts/run.sh (.../run.sh) (revision 0629dfe6bcc3e85047319284fa4c534efbf58594) +++ scripts/run.sh (.../run.sh) (revision d71990c79c75c613d781890c6f77505d409d6c64) @@ -73,21 +73,21 @@ # setup bluetooth mkdir -p "$HOME/settings" # Wait for drivers to initialize. TODO: Investigate what is needed to reduce/remove this -sleep 5 +sleep 7 killall connmand -/usr/share/silex-uart/silex-uart.sh start +/usr/share/silex-uart/silex-uart.sh start > $HOME/filesystem.out 2> $HOME/filesystem.err hciconfig hci0 up +cd $HOME + # setup wifi -killall wpa_supplicant -./wifi_reset_adapter.sh -if [[ -f "/etc/network/interfaces" && -f "/etc/wpa_supplicant.conf" ]]; then - $HOME/wifi_start_wpa_supplicant.sh wlan0 /etc/wpa_supplicant.conf - if [[ -f "$HOME/AUTO_IP" ]]; then - ./wifi_request_auto_assigned_ip.sh wlan0 & disown +killall wpa_supplicant > $HOME/filesystem.out 2> $HOME/filesystem.err +if [[ -f "/etc/wpa_supplicant.conf" ]]; then + ./wifi_start_wpa_supplicant.sh wlan0 /etc/wpa_supplicant.conf > $HOME/filesystem.out 2> $HOME/filesystem.err + if [[ -f "$HOME/AUTO_IP" ]]; then + ./wifi_request_auto_assigned_ip.sh wlan0 & disown > $HOME/filesystem.out 2> $HOME/filesystem.err fi fi #launching denali application, disable keep-alive $HOME/denali -u 2>> $HOME/filesystem.err & - Index: scripts/wifi_read_gateway.sh =================================================================== diff -u -r0629dfe6bcc3e85047319284fa4c534efbf58594 -rd71990c79c75c613d781890c6f77505d409d6c64 --- scripts/wifi_read_gateway.sh (.../wifi_read_gateway.sh) (revision 0629dfe6bcc3e85047319284fa4c534efbf58594) +++ scripts/wifi_read_gateway.sh (.../wifi_read_gateway.sh) (revision d71990c79c75c613d781890c6f77505d409d6c64) @@ -5,4 +5,5 @@ echo "Usage: ./$currentFile" exit 0 fi + ip route show | grep "default via" Index: scripts/wifi_request_auto_assigned_ip.sh =================================================================== diff -u -r0629dfe6bcc3e85047319284fa4c534efbf58594 -rd71990c79c75c613d781890c6f77505d409d6c64 --- scripts/wifi_request_auto_assigned_ip.sh (.../wifi_request_auto_assigned_ip.sh) (revision 0629dfe6bcc3e85047319284fa4c534efbf58594) +++ scripts/wifi_request_auto_assigned_ip.sh (.../wifi_request_auto_assigned_ip.sh) (revision d71990c79c75c613d781890c6f77505d409d6c64) @@ -7,5 +7,6 @@ fi iface=$1 +touch AUTO_IP killall udhcpc udhcpc --timeout=5 --retries=8 -n -i $iface Index: scripts/wifi_start_wpa_supplicant.sh =================================================================== diff -u -r0629dfe6bcc3e85047319284fa4c534efbf58594 -rd71990c79c75c613d781890c6f77505d409d6c64 --- scripts/wifi_start_wpa_supplicant.sh (.../wifi_start_wpa_supplicant.sh) (revision 0629dfe6bcc3e85047319284fa4c534efbf58594) +++ scripts/wifi_start_wpa_supplicant.sh (.../wifi_start_wpa_supplicant.sh) (revision d71990c79c75c613d781890c6f77505d409d6c64) @@ -8,6 +8,8 @@ iface=$1 wpa_supplicant_path=$2 -killall udhcpc wpa_cli terminate +killall udhcpc +killall wpa_supplicant +sleep 1 wpa_supplicant -B -i $iface -c $wpa_supplicant_path wext Index: sources/gui/qml/components/TextEntry.qml =================================================================== diff -u -re5a802bc26647388cfea4f1d46ae22570ec2dba3 -rd71990c79c75c613d781890c6f77505d409d6c64 --- sources/gui/qml/components/TextEntry.qml (.../TextEntry.qml) (revision e5a802bc26647388cfea4f1d46ae22570ec2dba3) +++ sources/gui/qml/components/TextEntry.qml (.../TextEntry.qml) (revision d71990c79c75c613d781890c6f77505d409d6c64) @@ -26,6 +26,9 @@ property alias label : _label property alias labelText : _label.text property alias validator : _input.validator + property bool enableInput : true + property color lineColor : Colors.textEntry + property bool lineVisible : true signal enterPressed() width: Variables.textInputWidth @@ -44,7 +47,9 @@ anchors { left: _label.right } - + enabled: _root.enableInput + autoScroll: false + clip: true color: Colors.textMain text: "" font.pixelSize: Fonts.fontPixelTextRectExtra @@ -68,7 +73,8 @@ } Line { id: _line - color: Colors.textEntry + color: _root.lineColor + visible: _root.lineVisible width: Variables.textInputLineWidth anchors { top: _input.bottom Index: sources/gui/qml/pages/SettingsWifi.qml =================================================================== diff -u -r13ac42cf8bdc5038dedd3302ba79dc387e5704b4 -rd71990c79c75c613d781890c6f77505d409d6c64 --- sources/gui/qml/pages/SettingsWifi.qml (.../SettingsWifi.qml) (revision 13ac42cf8bdc5038dedd3302ba79dc387e5704b4) +++ sources/gui/qml/pages/SettingsWifi.qml (.../SettingsWifi.qml) (revision d71990c79c75c613d781890c6f77505d409d6c64) @@ -133,6 +133,24 @@ } } + TextEntry { id: _networkSSID + enableInput: false + lineVisible: false + textInput.width: Variables.settingsWIFIInputWidth + line.width: Variables.settingsWIFIInputWidth + label.width: Variables.settingsWIFIInputWidth + anchors { + top: _dns.bottom + topMargin: Variables.settingsWIFISpacing + left: parent.left + } + labelText: qsTr("SSID: ") + textInput.text: vNetworkModel.ssid + onEnterPressed: { + _keyboard.setVisible(false) + } + } + TouchRect { id: _scan anchors { bottom: _rect.bottom Index: sources/view/VNetworkModel.cpp =================================================================== diff -u -r0629dfe6bcc3e85047319284fa4c534efbf58594 -rd71990c79c75c613d781890c6f77505d409d6c64 --- sources/view/VNetworkModel.cpp (.../VNetworkModel.cpp) (revision 0629dfe6bcc3e85047319284fa4c534efbf58594) +++ sources/view/VNetworkModel.cpp (.../VNetworkModel.cpp) (revision d71990c79c75c613d781890c6f77505d409d6c64) @@ -219,6 +219,7 @@ gateway(""); subnetMask(""); dns(""); + ssid(""); for (const Network &network : _networks) { if (network.macAddress() == vMacAddress) @@ -261,6 +262,7 @@ gateway(vNetwork.mIPSettings.mGateway); subnetMask(vNetwork.mIPSettings.mSubnetMask); dns(vNetwork.mIPSettings.mDNS); + ssid(vNetwork.ssid()); status(tr("Connected to %1.").arg(vNetwork.ssid())); } Index: sources/view/VNetworkModel.h =================================================================== diff -u -r13ac42cf8bdc5038dedd3302ba79dc387e5704b4 -rd71990c79c75c613d781890c6f77505d409d6c64 --- sources/view/VNetworkModel.h (.../VNetworkModel.h) (revision 13ac42cf8bdc5038dedd3302ba79dc387e5704b4) +++ sources/view/VNetworkModel.h (.../VNetworkModel.h) (revision d71990c79c75c613d781890c6f77505d409d6c64) @@ -32,6 +32,7 @@ PROPERTY(QString, gateway , "") PROPERTY(QString, subnetMask , "") PROPERTY(QString, dns , "") + PROPERTY(QString, ssid , "") public: // Note: VIEW_DEC_CLASS(VNetworkModel) requires QObject as the parent, so it's necessary to define it here