pushing changes for first release

Author: tonyp7

wifi_manager/main/code.js

@@ -54,7 +54,11 @@ $(function() {
 
 	function performConnect(){
 
-		$("#loadingButton").prop("disabled",true);
+		$( "#loadingButton" ).prop("disabled",true);
+		$( "#buttons" ).slideUp( "fast", function() {});
+		$( "#login-data" ).slideUp( "fast", function() {});
+		$( "#loading" ).slideDown( "fast", function() {});
+		$( "#app h2" ).text("Connecting to " + selectedSSID + "...");
 
 		//stop refreshing wifi list
 		if(refreshAPInterval != null){
@@ -82,19 +86,7 @@ $(function() {
 	}
 
 	$(document).on("click", "#join", function() {
-		
-		//disable buttons
-		//$("#join").prop("disabled", true);
-		//$("#join").prop("disabled", true);
-		$( "#buttons" ).slideUp( "fast", function() {});
-		$( "#login-data" ).slideUp( "fast", function() {});
-		$( "#loading" ).slideDown( "fast", function() {});
-		$( "#app h2" ).text("Connecting to " + selectedSSID + "...");
-		
 		performConnect();
-
-		
-		
 	});
 
 
@@ -108,9 +100,15 @@ $(function() {
 function check_if_connected(){
 	$.getJSON( "/status", function( data ) {
 		if(data.ip.length > 0){
-			//alert(data.ip);
 
-			$("#loadingButton").prop("disabled",false);
+			$( "#app h2" ).text("Connected to " + selectedSSID + "!");
+			$( "#ip").html(data.ip);
+			$( "#netmask").html(data.netmask);
+			$( "#gw").html(data.gw);
+			
+			$( "#status-wrap").slideDown( "fast", function() {});
+			$( "#loading" ).slideUp( "fast", function() {});
+			$( "#loadingButton").prop("disabled",false);
 			if(checkStatusInterval != null){
 				clearInterval(checkStatusInterval);
 				checkStatusInterval = null;

wifi_manager/main/index.html

@@ -19,21 +19,23 @@ <h2>Choose a network...</h2>
 					</div>
 
 					<div id="status">
-						<div id="ip" style="text-align:center">
+						<div id="status-wrap">
 							<strong>
-								IP Address: 192.168.1.47<br />
-								Subnet Mask: 192.168.1.47<br />
-								Gateway: 192.168.1.47<br />
+								IP Address: <span id="ip"></span><br />
+								Subnet Mask: <span id="netmask"></span><br />
+								Gateway: <span id="gw"></span><br />
 							</strong>
+							<div class="b1w">
+								<input id="loadingButton" type="button" value="OK" />
+							</div>
 						</div>
 						<div id="loading">
 							<div class="spinner"><div class="double-bounce1"></div><div class="double-bounce2"></div></div>
 						</div>
-						<input id="loadingButton" type="button" value="OK" />
 					</div>
 
 
-					<div id="buttons">
+					<div id="buttons" class="b1w">
 						<input id="join" type="button" value="Join" />
 						<input id="cancel" type="button" value="Cancel"/>
 					</div>

wifi_manager/main/style.css

@@ -70,7 +70,6 @@ label{
 input[type="button"]{
 	width:100px;
 	padding:5px;
-	margin:15px;
 	text-align:center;
 	display:block;
 }
@@ -82,9 +81,11 @@ input[type="button"]{
 	margin: 0 auto;
 }
 
-#buttons{
+.b1w{
 	border:1px solid #fff;
+	padding:15px;
 }
+
 #join{
 	float:right;
 }
@@ -94,6 +95,11 @@ input[type="button"]{
 	display:none;
 }
 
+#status-wrap{
+	display:none;
+	text-align:center
+}
+
 #credits{
 	display:none;
 	background-color:#fff;

wifi_manager/main/wifi_manager.c

@@ -138,6 +138,7 @@ void wifi_manager_generate_ip_info_json(){
 				ip4addr_ntoa(&ip_info.ip),
 				ip4addr_ntoa(&ip_info.netmask),
 				ip4addr_ntoa(&ip_info.gw));
+		printf("%s", ip_info_json);
 	}
 	else{
 		strcpy(ip_info_json, "{}\n");
@@ -381,6 +382,7 @@ void wifi_manager( void * pvParameters ){
 		xEventGroupWaitBits(wifi_manager_event_group, WIFI_MANAGER_AP_STARTED, pdFALSE, pdTRUE, portMAX_DELAY );
 
 
+		/*
 		wifi_config_t sta_config = {
 			.sta = {
 				.ssid = "a0308",
@@ -398,7 +400,7 @@ void wifi_manager( void * pvParameters ){
 		ESP_ERROR_CHECK(tcpip_adapter_get_ip_info(TCPIP_ADAPTER_IF_STA, &ip_info));
 		printf("IP Address:  %s\n", ip4addr_ntoa(&ip_info.ip));
 		printf("Subnet mask: %s\n", ip4addr_ntoa(&ip_info.netmask));
-		printf("Gateway:     %s\n", ip4addr_ntoa(&ip_info.gw));
+		printf("Gateway:     %s\n", ip4addr_ntoa(&ip_info.gw));*/
 
 
 
@@ -409,7 +411,7 @@ void wifi_manager( void * pvParameters ){
 		//keep scanning wifis until someone tries to connect to an AP
 		EventBits_t uxBits;
 		uint8_t tick = 0;
-		while(1){
+		for(;;){
 
 			/* someone tries to make a connection? if so: connect! */
 			uxBits = xEventGroupWaitBits(wifi_manager_event_group, WIFI_MANAGER_REQUEST_STA_CONNECT_BIT, pdFALSE, pdTRUE, 100 / portTICK_PERIOD_MS );
@@ -465,13 +467,13 @@ void wifi_manager( void * pvParameters ){
 
 				/* perform wifi scan */
 				if(tick == 0){
-					//safe guard against overflow
+					/* safe guard against overflow */
 					if(ap_num > MAX_AP_NUM) ap_num = MAX_AP_NUM;
 
 					ESP_ERROR_CHECK(esp_wifi_scan_start(&scan_config, true));
 					ESP_ERROR_CHECK(esp_wifi_scan_get_ap_records(&ap_num, accessp_records));
 
-					//make sure the http server isn't trying to access the list while it gets refreshed
+					/* make sure the http server isn't trying to access the list while it gets refreshed */
 					if(wifi_manager_lock_json_buffer( ( TickType_t ) 10 )){
 						wifi_manager_generate_acess_points_json();
 						wifi_manager_unlock_json_buffer();