Merge branch 'joembedded:master' into main

DECAF · Dec 24, 2024 · 40a97d0 · 40a97d0
2 parents f9c3dbf + 33cf393
commit 40a97d0
Show file tree

Hide file tree

Showing 6 changed files with 27 additions and 11 deletions.
diff --git a/ble_api/css/jodash.css b/ble_api/css/jodash.css
@@ -200,7 +200,16 @@ input[type=checkbox] {
         0 0 30px #f77,
         0 0 100px #f33;
   }
+
+  .back-white {
+    background-color: var(--white100);
+}
+
+.back-black {
+    background-color: var(--black0);
+}
 
+
 /* === Bei Icons Hintergrundfarb im ::before festgelegt, kann nur via class gesetzt werden (z.B. fuer Animationen) ===*/
 .jo-icon-back-white {
     &::before {

diff --git a/ble_api/index.html b/ble_api/index.html
@@ -4,8 +4,6 @@
 (C) JoEmbedded.de
 
 *todo*
-- Rahmen der Dialoge Default-Farbe
-- Bei Eingabe von CMDs an Offlin-Sensoren Read-ID viel zu lange
 
 -->
 
@@ -71,7 +69,6 @@
 </head>
 
 <body>
-
     <div class="jo-vcontainer">
 
         <header class="jo-menu-header">
@@ -200,6 +197,13 @@
                                 <br>
                                 <br>
 
+                                <span id="blxBadge" style="display:none">
+                                    <!-- print Badge only for Factory Setup-->
+                                    <button disabled id="blxBadgeButton">Print Badge</button>
+                                    <br>
+                                    <br>
+                                </span>
+
                                 <span id="blxPinEnter" style="display:none">
                                     <button id="blxSetPinButton">Set PIN</button>
                                     <button id="blxScanPinButton" class="green">
@@ -290,10 +294,13 @@
                     Offline</span>
             </div>
 
+            <div id="blxAutoPIN" class="red back-white" style="display:none">
+                &nbsp;<i class="bi-shield-fill-exclamation  jo-icon-ani-blink"></i> AutoPIN &nbsp;
+            </div>
             <!-- Debug-Button einfach mal da, bei Bedarf aktivieren -->
             <button hidden id="button-debug">(DEBUG)</button>
 
-            <!-- Buttun MUSS 'joInstallApp' heissen! Wird per Default von CSS zu hidden -->
+            <!-- Button MUSS 'joInstallApp' heissen! Wird per Default von CSS zu hidden -->
             <button id="joInstallApp" data-ll="Install APP">Install APP</button>
 
             <span class="jo-menu-right">

diff --git a/ble_api/js/blx.js b/ble_api/js/blx.js
diff --git a/ble_api/js/blxdash.js b/ble_api/js/blxdash.js
diff --git a/ble_api/sw.js b/ble_api/sw.js
diff --git a/ble_api/sw.js.map b/ble_api/sw.js.map