offset2 added

Honey-Pi · Feb 18, 2024 · 59eb2bf · 59eb2bf
1 parent bb0fe01
commit 59eb2bf
Show file tree

Hide file tree

Showing 13 changed files with 115 additions and 25 deletions.
diff --git a/dist/assets/i18n/translations_de.json b/dist/assets/i18n/translations_de.json
@@ -9,6 +9,7 @@
     "gpio": "<b>GPIO:</b> Die Kontaktstifte auf dem Raspberry Pi Board haben zwei Nummerierungen. Eine physische von 1 bis 40 und eine für jeden frei programmierbaren GPIO. Bei der Angabe des Kontaktstiftes wird hier im Wartungsmodus immer die GPIO Nummerierung angegeben.",
     "hx711": {
       "offset": "<b>Offset:</b> Beeinflusst das Messergebnis indem das Offset vom Messwert abgezogen wird.\n<br />Kann auch eine negative Zahl sein. <b>Angabe in Gramm.</b> Standard ist \"0\".",
+      "offset2": "Kann auch eine negative Zahl sein. <b>Angabe in Gramm.</b> Standard ist \"0\". <b>Der Wert wird am Ende Wartungsmodus automatisch errechnet, indem die Gewichtsveränderung im Wartungsmodus automatisch erfasst und mit dem bisherigen Wert verrechnet wird.</b>",
       "scale": "<b>Skalierungswert:</b> Beeinflusst das Messergebnis indem (Messwert-Offset) durch den Skalierungswert geteilt wird.\n<br />Es sind vier Nachkommastellen erlaubt und die <b>Nachkommastellen werden mit Punkt</b> und nicht mit Komma getrennt. Standard ist \"1\"."
     },
     "noTempSensorFound": "Es konnte kein Temperatursensor am Gerät gefunden werden.",
@@ -172,6 +173,7 @@
       "measurementNone": "Keine Messdatenübertragung",
       "measurementOnce": "Einmalige Übertragung nach dem Anschalten (empfohlen für das WittyPi-Modul)",
       "offset": "Offset",
+      "offset2": "Summe Gewichtsänderungen",
       "power_cut_delay": "Verzögerung der Abschaltung [Sekunden]",
       "pressure": "Luftdruck",
       "pulsing_interval": "Intervall für LED blinken [Sekunden]",
@@ -203,6 +205,7 @@
       "title": "Angeschlossene Sensoren",
       "ts_field_absolutehumidity": "Absolute Luftfeuchte [g/mᵌ]",
       "ts_field_uncompensated": "Unkompensiertes Gewicht",
+      "ts_field_offset2": "Feld für Summe der Gewichtsänderungen",
       "use3V": "Einen GPIO als 3,3V Quelle vewenden",
       "version": "Version",
       "weightcell": "Wägezelle",

diff --git a/dist/assets/i18n/translations_el_GR.json b/dist/assets/i18n/translations_el_GR.json
@@ -120,6 +120,7 @@
       "measurementNone": "Υπολογισμός μετρήματος",
       "measurementOnce": "Ανεπανάληπτη μεταφορά μετά την ενεργοποίηση",
       "offset": "Offset",
+      "offset2": "Offset 2",
       "pressure": "Ατμοσφαιρική πίεση",
       "quality": "Ποιότητα αέρα εσωτερικού χώρου",
       "scale": "Μονάδα κλίμακας",

diff --git a/dist/assets/i18n/translations_en.json b/dist/assets/i18n/translations_en.json
@@ -9,6 +9,7 @@
     "gpio": "<b>GPIO:</b> The contact pins on the Raspberry Pi Board have two numberings. One physical from 1 to 40 and one for each freely programmable GPIO. Here in maintenance mode is always the GPIO numbering beeing used.",
     "hx711": {
       "offset": "<b>Offset:</b> Influences the measuring result by subtracting the offset from the measured value.\n<br />Can also be a negative number. Indication in grams. Default is \"0\".",
+      "offset2": "<br />Can also be a negative number. Indication in grams. Default is \"0\". <b>Changed automatically during maintenance mode. Any weight change in maintenance mode is automatoically measured and this value will be updated.</b>",
       "scale": "<b>Scaling value:</b> Influences the measurement result by dividing (measured value-offset) by the scaling value.\n<br /> Four decimal places are allowed and the decimal places are separated by a dot and not by a comma. The default is \"1\"."
     },
     "noTempSensorFound": "No temperature sensor could be found on the device.",
@@ -172,6 +173,7 @@
       "measurementNone": "No measurement data transfer",
       "measurementOnce": "One-time transfer after power-on (suggested for WittyPi module)",
       "offset": "Offset",
+      "offset2": "Sum of weight changes",
       "power_cut_delay": "Power cut delay [Seconds]",
       "pressure": "Air pressure",
       "pulsing_interval": "Interval for LED pulsing [Seconds]",
@@ -203,6 +205,7 @@
       "title": "Attached sensors",
       "ts_field_absolutehumidity": "Absolute humidity",
       "ts_field_uncompensated": "Non compensated weight",
+      "ts_field_offset2": "for Sum of weight changes",
       "use3V": "Using a GPIO as 3.3V power supply source",
       "version": "Version",
       "weightcell": "Weight cell",

diff --git a/dist/index.html b/dist/index.html
@@ -11,6 +11,6 @@
 <style>:root{--blue:#007bff;--indigo:#6610f2;--purple:#6f42c1;--pink:#e83e8c;--red:#dc3545;--orange:#fd7e14;--yellow:#ffc107;--green:#28a745;--teal:#20c997;--cyan:#17a2b8;--white:#fff;--gray:#6c757d;--gray-dark:#343a40;--primary:#007bff;--secondary:#6c757d;--success:#28a745;--info:#17a2b8;--warning:#ffc107;--danger:#dc3545;--light:#f8f9fa;--dark:#343a40;--breakpoint-xs:0;--breakpoint-sm:576px;--breakpoint-md:768px;--breakpoint-lg:992px;--breakpoint-xl:1200px;--font-family-sans-serif:-apple-system,BlinkMacSystemFont,"Segoe UI",Roboto,"Helvetica Neue",Arial,sans-serif,"Apple Color Emoji","Segoe UI Emoji","Segoe UI Symbol";--font-family-monospace:SFMono-Regular,Menlo,Monaco,Consolas,"Liberation Mono","Courier New",monospace}*,:after,:before{box-sizing:border-box}html{font-family:sans-serif;line-height:1.15;-webkit-text-size-adjust:100%;-ms-text-size-adjust:100%;-ms-overflow-style:scrollbar;-webkit-tap-highlight-color:transparent}body{margin:0;font-family:-apple-system,BlinkMacSystemFont,Segoe UI,Roboto,Helvetica Neue,Arial,sans-serif,"Apple Color Emoji","Segoe UI Emoji",Segoe UI Symbol;font-size:1rem;font-weight:400;line-height:1.5;color:#212529;text-align:left;background-color:#fff}@media print{*,:after,:before{text-shadow:none!important;box-shadow:none!important}@page{size:a3}body{min-width:992px!important}}html{position:relative;min-height:100%}body{margin-bottom:80px}</style><link rel="stylesheet" href="styles.f1c81461e89342f1.css" media="print" onload="this.media='all'"><noscript><link rel="stylesheet" href="styles.f1c81461e89342f1.css"></noscript></head>
 <body>
   <app-root></app-root>
-<script src="runtime.6c645301152a1cb6.js" type="module"></script><script src="polyfills.a8f7b07cd8d896a8.js" type="module"></script><script src="scripts.02bda0a137d78c36.js" defer></script><script src="main.accb7d29684e2779.js" type="module"></script>
+<script src="runtime.6c645301152a1cb6.js" type="module"></script><script src="polyfills.a8f7b07cd8d896a8.js" type="module"></script><script src="scripts.b52d7989fcb36b58.js" defer></script><script src="main.2ecea6d60b840f3c.js" type="module"></script>
 
 </body></html>
diff --git a/dist/main.2ecea6d60b840f3c.js b/dist/main.2ecea6d60b840f3c.js
diff --git a/dist/main.accb7d29684e2779.js b/dist/main.accb7d29684e2779.js
diff --git a/dist/scripts.02bda0a137d78c36.js → dist/scripts.b52d7989fcb36b58.js b/dist/scripts.02bda0a137d78c36.js → dist/scripts.b52d7989fcb36b58.js
diff --git a/package-lock.json b/package-lock.json
diff --git a/src/app/components/sensors/sensors.component.html b/src/app/components/sensors/sensors.component.html
@@ -229,6 +229,28 @@
             </div>
           </div>
         </div>
+        <div class="row">
+		  <div class="col-12 col-md-6">
+			<label for="offset2">{{'settings.sensors.offset2' | translate}}</label>
+			<input type="number" step="1" class="form-control" [(ngModel)]="sensor.offset2" id="offset2" name="offset2" placeholder="{{'settings.sensors.offset2' | translate }}" />
+		  </div>
+		  <div class="col-12 col-md-6">
+			<div class="col-12 col-sm-6">
+				<settings-ts-field [label]="'ThingSpeak ' + ('settings.sensors.ts_field_offset2' | translate)"
+								   [ts_field_id]="'ts_field_offset2'"
+								   (ts_fieldChanged)="sensor.ts_field_offset2 = $event"
+								   [ts_field]="sensor.ts_field_offset2" [channels]="settings.ts_channels" ></settings-ts-field>
+			</div>
+		  </div>
+        <div class="row">
+          <div class="col-12 col-md-6">
+            <div class="alert alert-info" [innerHTML]="'alerts.hx711.offset2' | translate"></div>
+          </div>
+          <div class="col-12 col-md-6">
+
+          </div>
+        </div>
+        </div>
         <div class="row">
           <div class="col-12">
             <div class="form-group form-check">