Merge pull request #66 from YogoGit/main

Fix spelling errors
redakker · Apr 15, 2024 · 49c3f17 · 49c3f17
2 parents aacb27a + aabd586
commit 49c3f17
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 25 deletions.
diff --git a/html/index.html b/html/index.html
@@ -101,7 +101,7 @@ <h5 class="grey hrborder">Network settings</h5>
 					<div style="display: none" id="networkmore_presence">
 						<div class="row">					
 							<div class="six columns">
-								<label for="present">Presence string (avalilable)</label>
+								<label for="present">Presence string (available)</label>
 								<input type="text" class="u-full-width" name="present" id="present" placeholder="present">
 							</div>
 							<div class="six columns">
@@ -114,7 +114,7 @@ <h5 class="grey hrborder">Network settings</h5>
 					<div style="display: none" id="networkmore_presence_retain">
 						<div class="row">					
 							<div class="six columns">
-								<label for="status_on">Presence status retian</label>								
+								<label for="status_on">Presence status retain</label>								
 								<select class="u-full-width" name="presence_retain" id="presence_retain">
 									<option value="0">no</option>
 									<option value="1">yes</option>							
@@ -140,7 +140,7 @@ <h5 class="grey hrborder">Network settings</h5>
 					<div style="display: none" id="networkmore_retain">
 						<div class="row">					
 							<div class="six columns">
-								<label for="status_on">Device status retian</label>								
+								<label for="status_on">Device status retain</label>								
 								<select class="u-full-width" name="status_retain" id="status_retain">
 									<option value="0">no</option>
 									<option value="1">yes</option>							

diff --git a/pre_build.py b/pre_build.py
@@ -16,14 +16,6 @@
 except:
     print ("No Git installed. Version number will be skipped in a filename")
 
-defFile = open("src/definitions.h")
-for line in defFile:
-    if line.startswith("#define MAJOR_VERSION"):
-        version = line.replace("#define MAJOR_VERSION ", "")
-        version = version.strip()
-defFile.close()
-
-
 defFile = open("src/definitions.h")
 for line in defFile:
     if line.startswith("#define MAJOR_VERSION"):

diff --git a/pre_build_web.py b/pre_build_web.py
@@ -39,13 +39,6 @@
 defFile.close()
 
 
-defFile = open("src/definitions.h")
-for line in defFile:
-    if line.startswith("#define MAJOR_VERSION"):
-        version = line.replace("#define MAJOR_VERSION ", "")
-        version = version.strip()
-defFile.close()
-
 ##############################################
 
 f_output = open(output_file, "w")
@@ -113,7 +106,8 @@ def minify_css(input_file):
     return data
 
 for root, dirs, files in os.walk(input_dir, topdown=False):
-    for name in files:   # for files
+    for name in sorted(files):   # for files
+        print("Processing %s" % (name))
         if name.endswith(".js"):
             print(os.path.join(root, name))
             minified = minify_js(os.path.join(root, name))          # minify javascript
@@ -129,4 +123,4 @@ def minify_css(input_file):
             minified = minify_css(os.path.join(root, name))         # minify css
             write_to_file(name, minified, os.path.join(root, name)) # write to file
 
-f_output.close()
+f_output.close()
diff --git a/src/webcontent.h b/src/webcontent.h
@@ -394,7 +394,7 @@ BLEcker
 <a class="button w100" href="/">home</a>
 <a class="button w100" href="/update">update</a>
 <!--<a class="button w100 button-danger" id="reset" href="#">reset</a>-->
-<div class="version" id="version">v1.11 - 192</div>
+<div class="version" id="version">v1.11 - 196</div>
 <div class="version" id="chip"></div>
 <div id="footer">
 <div><a href="https://github.com/redakker/blecker" target="_blank">blecker</a></div>
@@ -455,7 +455,7 @@ BLEcker
 <div style="display: none" id="networkmore_presence">
 <div class="row">
 <div class="six columns">
-<label for="present">Presence string (avalilable)</label>
+<label for="present">Presence string (available)</label>
 <input type="text" class="u-full-width" name="present" id="present" placeholder="present">
 </div>
 <div class="six columns">
@@ -467,7 +467,7 @@ BLEcker
 <div style="display: none" id="networkmore_presence_retain">
 <div class="row">
 <div class="six columns">
-<label for="status_on">Presence status retian</label>
+<label for="status_on">Presence status retain</label>
 <select class="u-full-width" name="presence_retain" id="presence_retain">
 <option value="0">no</option>
 <option value="1">yes</option>
@@ -491,7 +491,7 @@ BLEcker
 <div style="display: none" id="networkmore_retain">
 <div class="row">
 <div class="six columns">
-<label for="status_on">Device status retian</label>
+<label for="status_on">Device status retain</label>
 <select class="u-full-width" name="status_retain" id="status_retain">
 <option value="0">no</option>
 <option value="1">yes</option>
@@ -1580,7 +1580,7 @@ BLEcker
 <a class="button w100" href="/">home</a>
 <a class="button w100" href="/update">update</a>
 <!--<a class="button w100 button-danger" id="reset" href="#">reset</a>-->
-<div class="version" id="version">v1.11 - 192</div>
+<div class="version" id="version">v1.11 - 196</div>
 <div id="footer">
 <div><a href="https://github.com/redakker/blecker" target="_blank">blecker</a></div>
 </div>