Skip to content

Commit fe67993

Browse files
previprevi
committed
-
1 parent ab21412 commit fe67993

File tree

3 files changed

+57
-19
lines changed

3 files changed

+57
-19
lines changed

‎coderbot.cfg

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
{"wifi_psk": "catoblepa catoblepa io ti dono le mie tepa", "move_tr_speed": "75", "move_fw_elapse": "1.5", "move_motor_mode": "dc", "show_page_program": "true", "load_at_start": "", "move_tr_elapse": "1", "sound_start": "$startup.mp3", "sound_stop": "$shutdown.mp3", "camera_exposure_mode": "auto", "prog_video_rec": "true", "prog_level": "basic_move", "prog_scrollbars": "true", "ctrl_fw_speed": "100", "move_fw_speed": "100", "sound_shutter": "$shutter.mp3", "show_page_prefs": "true", "prog_maxblocks": "5", "ctrl_hud_image": "coderbot_hud_2.png", "button_func": "none", "wifi_mode": "ap", "ctrl_fw_elapse": "-1", "ctrl_tr_elapse": "-1", "wifi_ssid": "kanaha", "show_page_control": "true", "ctrl_tr_speed": "80"}
1+
{"move_tr_speed": "75", "move_fw_elapse": "1.5", "move_motor_mode": "dc", "show_page_program": "true", "load_at_start": "", "move_tr_elapse": "1", "sound_start": "$startup.mp3", "sound_stop": "$shutdown.mp3", "camera_exposure_mode": "auto", "prog_video_rec": "true", "prog_level": "basic_move", "prog_scrollbars": "true", "ctrl_fw_speed": "100", "move_fw_speed": "100", "sound_shutter": "$shutter.mp3", "show_page_prefs": "true", "prog_maxblocks": "5", "ctrl_hud_image": "coderbot_hud_2.png", "button_func": "none", "wifi_mode": "ap", "ctrl_fw_elapse": "-1", "ctrl_tr_elapse": "-1", "show_page_control": "true", "ctrl_tr_speed": "80"}

‎static/js/control.js

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -112,10 +112,13 @@ $(document).on( "pagecreate", '#page-preferences', function( event ) {
112112
});
113113
$('#b_wifi_apply').on("click", function (){
114114
var form_data = $(this).parents("form").serialize();
115-
$.post(url='/wifi', form_data, success=function(data){
116-
alert(BotMessages.Saved);
117-
location.href=data;
118-
});
115+
$.post(url='/wifi', form_data);
116+
$('#popup-wifi').popup('close');
117+
if($("r_wifi_mode_a").attr('checked')==true){
118+
$('#popup-wifi-ap').popup('open');
119+
} else {
120+
$('#popup-wifi-client').popup('open');
121+
}
119122
return false;
120123
});
121124

‎templates/config.html

Lines changed: 49 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -130,25 +130,60 @@ <h1>CoderBot</h1>
130130
</fieldset>
131131
</div>
132132
<div id="t_wifi" class="ui-body-d ui-content">
133-
<fieldset data-role="controlgroup" data-mini="true">
134-
<legend>{% trans %}WiFi mode{% endtrans %}</legend>
135-
<input type="radio" name="wifi_mode" id="r_wifi_mode_a" value="ap" {%if config.wifi_mode=='ap'%}checked="checked"{%endif%}>
136-
<label for="r_wifi_mode_a">{% trans %}Access Point{% endtrans %}</label>
137-
<input type="radio" name="wifi_mode" id="r_wifi_mode_b" value="client" {%if config.wifi_mode=='client'%}checked="checked"{%endif%}>
138-
<label for="r_wifi_mode_b">{% trans %}Client{% endtrans %}</label>
139-
</fieldset>
140-
<legend>WiFi Client mode access data</legend>
141-
<label for="i_wifi_ssid">{% trans %}WiFi name{% endtrans %}</label>
142-
<input type="text" id="i_wifi_ssid" name="wifi_ssid" value="{{config.wifi_ssid}}">
143-
<label for="i_wifi_psk">{% trans %}WiFi password{% endtrans %}</label>
144-
<input type="text" id="i_wifi_psk" name="wifi_psk" value="{{config.wifi_psk}}">
145-
<button type="button" id="b_wifi_apply" class="ui-btn ui-shadow ui-corner-all ui-btn-a ui-mini">{% trans %}Apply Wifi config{% endtrans %}</button>
133+
<a href="#popup-wifi" data-rel="popup" id="b_wifi_access_mode" class="ui-btn ui-shadow ui-corner-all ui-btn-a ui-mini">{% trans %}WiFi Client access mode{% endtrans %}</a>
146134
</div>
147135
<div class="ui-grid-a">
148136
<div class="ui-block-a"><a href="#" data-rel="close" class="ui-btn ui-shadow ui-corner-all ui-btn-b ui-mini">{% trans %}Cancel{% endtrans %}</a></div>
149-
<div class="ui-block-b"><button type="submit" data-rel="close" class="ui-btn ui-shadow ui-corner-all ui-btn-a ui-mini">{% trans %}Save{% endtrans %}</button></div>
137+
<div class="ui-block-b"><button type="submit" id="b_config_save" data-rel="close" class="ui-btn ui-shadow ui-corner-all ui-btn-a ui-mini">{% trans %}Save{% endtrans %}</button></div>
150138
</div>
151139
</div>
152140
</form>
153141
</div>
142+
<div data-role="popup" id="popup-wifi" data-history="false" data-theme="a" class="ui-corner-all" data-dismissible="false" data-position-to="window">
143+
<div style="padding:10px 20px;">
144+
<form class="config" id="f_wifi">
145+
<h3>{% trans %}WiFi Client mode access data{% endtrans %}</h3>
146+
<fieldset data-role="controlgroup" data-mini="true">
147+
<legend>{% trans %}WiFi mode{% endtrans %}</legend>
148+
<input type="radio" name="wifi_mode" id="r_wifi_mode_a" value="ap" {%if config.wifi_mode=='ap'%}checked="checked"{%endif%}>
149+
<label for="r_wifi_mode_a">{% trans %}Access Point{% endtrans %}</label>
150+
<input type="radio" name="wifi_mode" id="r_wifi_mode_b" value="client" {%if config.wifi_mode=='client'%}checked="checked"{%endif%}>
151+
<label for="r_wifi_mode_b">{% trans %}Client{% endtrans %}</label>
152+
</fieldset>
153+
<label for="i_wifi_ssid">{% trans %}WiFi name{% endtrans %}</label>
154+
<input type="text" id="i_wifi_ssid" name="wifi_ssid" value="{{config.wifi_ssid}}">
155+
<label for="i_wifi_psk">{% trans %}WiFi password{% endtrans %}</label>
156+
<input type="text" id="i_wifi_psk" name="wifi_psk" value="{{config.wifi_psk}}">
157+
<div class="ui-grid-a">
158+
<div class="ui-block-a"><a href="#" data-rel="back" class="ui-btn ui-shadow ui-corner-all ui-btn-b ui-mini">{% trans %}Cancel{% endtrans %}</a></div>
159+
<div class="ui-block-b"><a href="#" id="b_wifi_apply" data-rel="back" class="ui-btn ui-shadow ui-corner-all ui-btn-a ui-mini">{% trans %}Apply Wifi config{% endtrans %}</a></div>
160+
</div>
161+
</form>
162+
</div>
163+
</div>
164+
<div data-role="popup" id="popup-wifi-ap" data-history="false" data-theme="a" class="ui-corner-all" data-dismissible="false" data-position-to="window">
165+
<div style="padding:10px 20px;">
166+
<h3>{% trans %}WiFi AP mode access{% endtrans %}</h3>
167+
<p>Access Point mode is being set:
168+
<ol>
169+
<li>Wait 30 seconds</li>
170+
<li>Connect your device to the "coderbot" named wifi</li>
171+
<li>Click on the following link: <a href="http://coderbot:8080">CoderBot local</a></li>
172+
</ol>
173+
</p>
174+
</div>
175+
</div>
176+
<div data-role="popup" id="popup-wifi-client" data-history="false" data-theme="a" class="ui-corner-all" data-dismissible="false" data-position-to="window">
177+
<div style="padding:10px 20px;">
178+
<h3>{% trans %}WiFi Client mode access{% endtrans %}</h3>
179+
<p>Client mode is being set:
180+
<ol>
181+
<li>Wait 30 seconds</li>
182+
<li>Connect your device to your own wifi (wifi network must be connected to internet)</li>
183+
<li>Click on the following link: <a href="http://coderbotsrv.appspot.com">CoderBot Server</a></li>
184+
</ol>
185+
</p>
186+
</div>
187+
</div>
154188
</div>
189+

0 commit comments

Comments
 (0)