Merge pull request #205 from jomjol/rolling

v6.7.2

Author: jomjol

README.md

@@ -45,7 +45,9 @@ In other cases you can contact the developer via email: <img src="https://raw.gi
 
 
 
-##### 6.7.1 Image Processing in Memory - (2021-01-05)
+##### 6.7.2 Image Processing in Memory - (2021-01-05)
+
+* NEW 6.7.2: Updated html for setup modus - remove reboot on edit configuration)
 
 * NEW 6.7.1: Improved stability of camera (back to v6.6.1) - remove black strips and areas
 

firmware/html.zip

@@ -683,9 +683,13 @@ <h4><input type="checkbox" id="Category_Analog_enabled" value="1"  onclick = 'Up
 	<p>
 
 	</p>
-	<p>
-		<button class="button" id="reboot" type="button" onclick="doReboot()">Reboot to activate updates</button>
-	</p>
+	<div id="doreboot">
+		<p>
+			<button class="button" id="Edit_Config_Direct" onclick="editConfigDirect()" style="display:none">Edit Config.ini direct</button>
+			
+			<button class="button" id="reboot" type="button" onclick="doReboot()">Reboot to activate updates</button>
+		</p>
+	</div>
 
 </div>
 
@@ -701,6 +705,14 @@ <h4><input type="checkbox" id="Category_Analog_enabled" value="1"  onclick = 'Up
 
 
 function LoadConfigNeu() {
+
+	var isInitialSetup = getParameterByName('InitialSetup');
+	if (isInitialSetup === 'true')
+	{
+		document.getElementById("reboot").style.display = "none";
+	}
+
+
 	basepath = getbasepath(); 
 	if (!loadConfig(basepath)) {
 		alert("Config.ini could not be loaded!\nPlease reload the page.");
@@ -715,6 +727,16 @@ <h4><input type="checkbox" id="Category_Analog_enabled" value="1"  onclick = 'Up
 	document.getElementById("divall").style.display = ''; 
 	}
 
+
+function getParameterByName(name, url = window.location.href) {
+    name = name.replace(/[\[\]]/g, '\\$&');
+    var regex = new RegExp('[?&]' + name + '(=([^&#]*)|&|#|$)'),
+        results = regex.exec(url);
+    if (!results) return null;
+    if (!results[2]) return '';
+    return decodeURIComponent(results[2].replace(/\+/g, ' '));
+}	
+
 function WriteParameter(_param, _category, _cat, _name, _optional, _select = false, _anzpara = 1){
 	if (_param[_cat][_name]["found"]){
 		if (_optional) {

sd-card/html/edit_config_param.html

@@ -9,7 +9,7 @@ function getbasepath(){
     {
 //        host = "http://192.168.2.118";          // jomjol interner test
 //        host = "http://192.168.178.26";          // jomjol interner test
-        host = "http://192.168.178.26";          // jomjol interner Real
+        host = "http://192.168.178.22";          // jomjol interner Real
 //        host = ".";                           // jomjol interner localhost   
 
     }

sd-card/html/gethost.js

@@ -111,7 +111,7 @@ <h1>Digitizer - Initial Setup</h1>
 
          break;
       case 5:
-         document.getElementById('maincontent').src = '/edit_config_param.html';
+         document.getElementById('maincontent').src = '/edit_config_param.html?InitialSetup=true';
          document.getElementById('explaincontent').src = '/explain_5.html';            
          document.getElementById('h_iframe_explain').style.display = "";           
          document.getElementById("previous").disabled = false;

sd-card/html/setup.html

@@ -1 +1 @@
-6.4.1
+6.5.0