From 9b21f0db36577169be8a736a4315ab2c764931ec Mon Sep 17 00:00:00 2001 From: ISA Date: Thu, 7 Nov 2024 14:20:08 +0100 Subject: [PATCH] Kommentare in Platzhalter --- pages/kabelueberwachung.js | 4 ++-- public/CPL/SERVICE/ae.js | 17 +++++++++++++++ public/CPL/SERVICE/de.js | 8 ++++--- public/CPL/SERVICE/kueData.js | 30 +++++++++++++-------------- public/CPLmockData/SERVICE/ae.js | 0 public/CPLmockData/SERVICE/kueData.js | 9 +++----- store/variablesSlice.js | 3 +-- utils/loadWindowVariables.js | 3 +-- 8 files changed, 43 insertions(+), 31 deletions(-) create mode 100644 public/CPL/SERVICE/ae.js create mode 100644 public/CPLmockData/SERVICE/ae.js diff --git a/pages/kabelueberwachung.js b/pages/kabelueberwachung.js index 4e0e4de..1d380b8 100644 --- a/pages/kabelueberwachung.js +++ b/pages/kabelueberwachung.js @@ -20,7 +20,7 @@ function Kabelueberwachung() { kueIso, kueAlarm1, kueAlarm2, - kueRes, + kueResidence, kueCableBreak, kueGroundFault, } = useSelector((state) => state.variables); @@ -48,7 +48,7 @@ function Kabelueberwachung() { // Modul- und Rack-Daten aufbereiten const allModules = kueIso.map((iso, index) => ({ isolationswert: iso, - schleifenwiderstand: kueRes[index], + schleifenwiderstand: kueResidence[index], modulName: kueID[index] || `Modul ${index + 1}`, // Eindeutiger Name pro Index kueOnlineStatus: kueOnline[index], alarmStatus: alarmStatus[index], diff --git a/public/CPL/SERVICE/ae.js b/public/CPL/SERVICE/ae.js new file mode 100644 index 0000000..5be933b --- /dev/null +++ b/public/CPL/SERVICE/ae.js @@ -0,0 +1,17 @@ +var AnalogeEingaenge = "<%AAV01%>"; +/* +Kontext: +Messwert +Hinweis: AE16 (-96V) +benötigt die aktuelle +Backplane + +Platzhalter: +AAVxx +xx = Nr. 1-8 +oder 9-16 für +Systemspannungen + +Ausgabeformat: +%0.6f +*/ diff --git a/public/CPL/SERVICE/de.js b/public/CPL/SERVICE/de.js index 2b89f13..20a90f3 100644 --- a/public/CPL/SERVICE/de.js +++ b/public/CPL/SERVICE/de.js @@ -1,3 +1,5 @@ -var win_de=[<%=DES80%>,<%=DES81%>,<%=DES82%>,<%=DES83%>]; -var win_counter=[<%=DEC80%>,<%=DEC81%>,<%=DEC82%>,<%=DEC83%>]; -var win_flutter=[<%=DEF80%>,<%=DEF81%>,<%=DEF82%>,<%=DEF83%>]; \ No newline at end of file +var win_de=[<%=DES80%>,<%=DES81%>,<%=DES82%>,<%=DES83%>];//Zustand des digitalen Eingangs 1 = EIN, 0 = AUS +//DESxx xx =Nr Eingang 1-32 81-84 = BGT 1 bis 4 +var win_counter=[<%=DEC80%>,<%=DEC81%>,<%=DEC82%>,<%=DEC83%>];//Zählerstand +//DECxx xx =Nr Eingang 1-32 81-84 = BGT 1 bis 4 +var win_flutter=[<%=DEF80%>,<%=DEF81%>,<%=DEF82%>,<%=DEF83%>];// noch nicht verwendet in Lastheft Oktober 2024 \ No newline at end of file diff --git a/public/CPL/SERVICE/kueData.js b/public/CPL/SERVICE/kueData.js index 7a1e4c6..77676e5 100644 --- a/public/CPL/SERVICE/kueData.js +++ b/public/CPL/SERVICE/kueData.js @@ -8,26 +8,24 @@ var win_kueOverflow=[<%=KIW80%>,<%=KIW81%>,<%=KIW82%>,<%=KIW83%>]; //Überlauf 1 //--------------------------------------------------- var win_kueIso=[<%=KIM80%>,<%=KIM81%>,<%=KIM82%>,<%=KIM83%>];//Isolationswerte in Display (isoDisplay) Einheit: MOhm var win_kueAlarm1=[<%=KIA80%>,<%=KIA81%>,<%=KIA82%>,<%=KIA83%>];//Isolationsfehler 1 = Fehler, 0 = kein Fehler, Alarm kommt wenn kueIso < kueLimit1 -var win_kueLimit1=[<%=KIG80%>,<%=KIG81%>,<%=KIG82%>,<%=KIG83%>];//Grenzwert (MOhm) für Isolationswiderstand +var win_kueLimit1=[<%=KIG80%>,<%=KIG81%>,<%=KIG82%>,<%=KIG83%>];//Grenzwert (MOhm) für Isolationswiderstand / wenn messwert < grenzwert dann Alarm //--------------------------------------------------- -var win_kueRes=[<%=KRM80%>,<%=KRM81%>,<%=KRM82%>,<%=KRM83%>];//Schleifenwiderstand in Display (resDisplay) Einheit: KOhm -var win_kueResidence=[<%=KSN80%>,<%=KSN81%>,<%=KSN82%>,<%=KSN83%>]; -var win_kueAlarm2=[<%=KRA80%>,<%=KRA81%>,<%=KRA82%>,<%=KRA83%>];//Schleifenfehler 1 = Fehler, 0 = kein Fehler, Alarm kommt wenn kueRes < kueLimit2Low -var win_kueLimit2Low=[<%=KRG80%>,<%=KRG81%>,<%=KRG82%>,<%=KRG83%>];//Schleifenmessung Unterer Grenzwert (KOhm) +var win_kueResidence=[<%=KRM80%>,<%=KRM81%>,<%=KRM82%>,<%=KRM83%>];//Schleifenwiderstand in Display (resDisplay) Einheit: KOhm +var win_kueAlarm2=[<%=KRA80%>,<%=KRA81%>,<%=KRA82%>,<%=KRA83%>];//Schleifenfehler 1 = Fehler, 0 = kein Fehler, Alarm kommt wenn win_kueResidence < win_kueLimit2Low +var win_kueLimit2Low=[<%=KRG80%>,<%=KRG81%>,<%=KRG82%>,<%=KRG83%>];//Schleifenmessung Unterer Grenzwert (KOhm) / wenn messwert < grenzwert dann Alarm var win_kueDelay1=[<%=KID80%>,<%=KID81%>,<%=KID82%>,<%=KID83%>]; var win_kueLoopInterval=[<%=KRI80%>,<%=KRI81%>,<%=KRI82%>,<%=KRI83%>]; -var win_kueID=[<%=KSI80%>,<%=KSI81%>,<%=KSI82%>,<%=KSI83%>]; +var win_kueID=[<%=KSI80%>,<%=KSI81%>,<%=KSI82%>,<%=KSI83%>];//Bezeichnung des Moduls in Browser /Variablenname kann geändert werden //TDR---------------------------- -var win_tdrAtten=[<%=KTD80%>,<%=KTD81%>,<%=KTD82%>,<%=KTD83%>]; -var win_tdrPulse=[<%=KTP80%>,<%=KTP81%>,<%=KTP82%>,<%=KTP83%>]; -var win_tdrSpeed=[<%=KTS80%>,<%=KTS81%>,<%=KTS82%>,<%=KTS83%>]; -var win_tdrAmp=[<%=KTA80%>,<%=KTA81%>,<%=KTA82%>,<%=KTA83%>]; -var win_tdrTrigger=[<%=KTE80%>,<%=KTE81%>,<%=KTE82%>,<%=KTE83%>]; -var win_tdrLocation=[<%=KTF80%>,<%=KTF81%>,<%=KTF82%>,<%=KTF83%>]; -var win_tdrActive=[<%=KTX80%>,<%=KTX81%>,<%=KTX82%>,<%=KTX83%>]; -var win_tdrLast=[<%=KTL80%>,<%=KTL81%>,<%=KTL82%>,<%=KTL83%>]; - - +var win_tdrLocation=[<%=KTF80%>,<%=KTF81%>,<%=KTF82%>,<%=KTF83%>];//Entfernung Bruchstelle Einheit Meter +var win_tdrAtten=[<%=KTD80%>,<%=KTD81%>,<%=KTD82%>,<%=KTD83%>];//Dämpfung in dB +var win_tdrSpeed=[<%=KTS80%>,<%=KTS81%>,<%=KTS82%>,<%=KTS83%>];//Kabelgeschwindigkeit Einheit Meter/µ Sekunde +var win_tdrPulse=[<%=KTP80%>,<%=KTP81%>,<%=KTP82%>,<%=KTP83%>];//Pulsweite der letzten Messung +var win_tdrAmp=[<%=KTA80%>,<%=KTA81%>,<%=KTA82%>,<%=KTA83%>]; //Verstärkung der letzten Messung +var win_tdrTrigger=[<%=KTE80%>,<%=KTE81%>,<%=KTE82%>,<%=KTE83%>];//Trigger der letzten Messung +var win_tdrActive=[<%=KTX80%>,<%=KTX81%>,<%=KTX82%>,<%=KTX83%>];//TDR-Funktion aktiviert 0=ausgeschaltet, 1=eingeschaltet +var win_tdrLast=[<%=KTL80%>,<%=KTL81%>,<%=KTL82%>,<%=KTL83%>];//Zeitpunkt der letzten TDR Messung +//--------------------------------------------------- diff --git a/public/CPLmockData/SERVICE/ae.js b/public/CPLmockData/SERVICE/ae.js new file mode 100644 index 0000000..e69de29 diff --git a/public/CPLmockData/SERVICE/kueData.js b/public/CPLmockData/SERVICE/kueData.js index 3ea22d6..5ccb59c 100644 --- a/public/CPLmockData/SERVICE/kueData.js +++ b/public/CPLmockData/SERVICE/kueData.js @@ -67,7 +67,7 @@ var win_kueDelay1 = [ ]; //--------------------------------------------------- //Schleifenwiderstand in Display (resDisplay) Einheit: KOhm -var win_kueRes = [ +var win_kueResidence = [ 0.0, 0.612, 0.0, 0.645, 0.822, 0.97, 0.0, 0.0, 1.452, 0.0, 0.734, 0.37, 0.566, 0.0, 0.738, 0.684, 1.166, 0.595, 0.0, 1.651, 1.18, 1.387, 1.214, 0.0, 1.475, 0.615, 0.494, 1.217, 65.0, 65.0, 65.0, 65.0, @@ -130,11 +130,6 @@ var win_kueID = [ //--------------------------------------------------- -var win_kueResidence = [ - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, -]; - //TDR--------------------------------------------------- var win_tdrAtten = [ 2.0, 2.0, 2.0, 2.0, 2.0, 2.0, 2.0, 2.0, 2.0, 2.0, 2.0, 2.0, 2.0, 2.0, 2.0, @@ -200,3 +195,5 @@ var win_tdrLast = [ "?", "?", ]; + +//--------------------------------------------------- diff --git a/store/variablesSlice.js b/store/variablesSlice.js index 35d00e6..00f9b93 100644 --- a/store/variablesSlice.js +++ b/store/variablesSlice.js @@ -23,7 +23,7 @@ const initialState = { kuePSTmMinus96V: [], kueAlarm1: [], kueAlarm2: [], - kueRes: [], + kueResidence: [], kueCableBreak: [], kueGroundFault: [], kueLimit1: null, @@ -39,7 +39,6 @@ const initialState = { tdrLocation: null, tdrActive: null, kueOverflow: null, - kueResidence: null, tdrLast: null, appVersion: null, }; diff --git a/utils/loadWindowVariables.js b/utils/loadWindowVariables.js index 813599a..830d374 100644 --- a/utils/loadWindowVariables.js +++ b/utils/loadWindowVariables.js @@ -24,7 +24,7 @@ export async function loadWindowVariables() { "win_kueAlarm1", "win_kueAlarm2", "win_kueIso", - "win_kueRes", + "win_kueResidence", "win_kueCableBreak", "win_kueGroundFault", "win_kueLimit1", @@ -40,7 +40,6 @@ export async function loadWindowVariables() { "win_tdrLocation", "win_tdrActive", "win_kueOverflow", - "win_kueResidence", "win_tdrLast", "win_appVersion", ];