Browse Source

- Seitennamen IDs geändert (nicht !PAGE) für Kompatibilität mit IBUS App
- E46 M57N/Laufunruhe.ccpage - Variante ohne Code

FloKra 3 years ago
parent
commit
640dd39f01

+ 7 - 2
E46 M57N/DDEAbgleich.ccpage → E46 M57N/DDEAbgleich_D50M57E1.ccpage

@@ -1,8 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
 <fragment xmlns="http://www.holeschak.de/BmwDeepObd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.holeschak.de/BmwDeepObd BmwDeepObd.xsd">
-  <page name="!PAGE_NAME" display-mode="list" fontsize="medium" gauges-portrait="2" gauges-landscape="4" logfile="DDEAbgleich.log">
+  <page name="DDE5Abgleich" display-mode="list" fontsize="medium" gauges-portrait="2" gauges-landscape="4" logfile="DDE5E1_Abgleich.log">
     <strings>
-      <string name="!PAGE_NAME">DDE 5 Abgleich</string>
+      <string name="DDE5Abgleich">DDE5 adjustment</string>
+      <string name="!JOB#AGR_ABGLEICH_LESEN_WERT"> EGR (fresh air rate)</string>
+      <string name="!JOB#LLA_ABGLEICH_LESEN_WERT"> increase idle speed [rpm]</string>
+    </strings>
+	<strings lang="de">
+      <string name="DDE5Abgleich">DDE5 Abgleich</string>
       <string name="!JOB#AGR_ABGLEICH_LESEN_WERT"> AGR (Frischluftrate)</string>
       <string name="!JOB#LLA_ABGLEICH_LESEN_WERT"> Anhebung Leerlaufdrehzahl [u/min]</string>
     </strings>

+ 2 - 2
E46 M57N/DSC_MK60.ccpage

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <fragment xmlns="http://www.holeschak.de/BmwDeepObd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.holeschak.de/BmwDeepObd BmwDeepObd.xsd">
-  <page name="!PAGE_NAME" display-mode="list" fontsize="medium" gauges-portrait="2" gauges-landscape="4" logfile="DSC_MK60.log">
+  <page name="DSC" display-mode="list" fontsize="medium" gauges-portrait="2" gauges-landscape="4" logfile="DSC_MK60.log">
     <strings>
-      <string name="!PAGE_NAME">DSC</string>
+      <string name="DSC">DSC</string>
       <string name="!JOB#STATUS_RADGESCHWINDIGKEIT#STAT_RAD_GESCHW_VL_WERT">  Raddrehzahl VL [km/h]:</string>
       <string name="!JOB#STATUS_RADGESCHWINDIGKEIT#STAT_RAD_GESCHW_VR_WERT">  Raddrehzahl VR [km/h]:</string>
       <string name="!JOB#STATUS_RADGESCHWINDIGKEIT#STAT_RAD_GESCHW_HL_WERT">  Raddrehzahl HL [km/h]:</string>

+ 4 - 1
E46 M57N/IBUS_App.ccpage

@@ -14,6 +14,7 @@
       <string name="!JOB#STATUS_MESSWERTBLOCK_LESEN#STAT_ABGASTEMPERATUR_VOR_KATALYSATOR_WERT"> Abgastemp. vor Kat [°C]</string>
 	  <string name="!JOB#STATUS_MESSWERTBLOCK_LESEN#STAT_LADEDRUCK_WERT"> Ladedruck Ist [mbar]</string>
       <string name="!JOB#STATUS_MESSWERTBLOCK_LESEN#STAT_LADEDRUCK_SOLL_WERT"> Ladedruck Soll [mbar]</string>
+	  <string name="!JOB#STATUS_MESSWERTBLOCK_LESEN#STAT_UMGEBUNGSDRUCK_WERT"> Luftdruck [mbar]</string>
       <string name="!JOB#STATUS_MESSWERTBLOCK_LESEN#STAT_RAILDRUCK_WERT"> Raildruck Ist [bar]</string>
       <string name="!JOB#STATUS_MESSWERTBLOCK_LESEN#STAT_RAILDRUCK_SOLL_WERT"> Raildruck Soll [bar]</string>
       <string name="!JOB#STATUS_MESSWERTBLOCK_LESEN#STAT_FAHRZEUGBESCHLEUNIGUNG_WERT"> Beschleunigung [m/s²]</string>
@@ -34,6 +35,7 @@
       <string name="!JOB#STATUS_MESSWERTBLOCK_LESEN#STAT_ABGASTEMPERATUR_VOR_KATALYSATOR_WERT"> exhaust before cat [°C]</string>
 	  <string name="!JOB#STATUS_MESSWERTBLOCK_LESEN#STAT_LADEDRUCK_WERT"> act. boost pressure [mbar]</string>
       <string name="!JOB#STATUS_MESSWERTBLOCK_LESEN#STAT_LADEDRUCK_SOLL_WERT"> target boost pressure [mbar]</string>
+	  <string name="!JOB#STATUS_MESSWERTBLOCK_LESEN#STAT_UMGEBUNGSDRUCK_WERT"> air pressure [mbar]</string>
       <string name="!JOB#STATUS_MESSWERTBLOCK_LESEN#STAT_RAILDRUCK_WERT"> act. rail pressure [bar]</string>
       <string name="!JOB#STATUS_MESSWERTBLOCK_LESEN#STAT_RAILDRUCK_SOLL_WERT"> target rail pressure [bar]</string>
       <string name="!JOB#STATUS_MESSWERTBLOCK_LESEN#STAT_FAHRZEUGBESCHLEUNIGUNG_WERT"> acceleration [m/s²]</string>
@@ -42,7 +44,7 @@
       <string name="!JOB#STATUS_TOENS_IO#STAT_TOG_LOW_WERT">  TÖNS cooling time [ms]</string>
     </strings>	
     <jobs>
-      <job id="1" sgbd="D50M57E1" name="STATUS_MESSWERTBLOCK_LESEN" args="JA;ILMMG;IPLAD;IUBAT;ITKUM;IMOAK;INMOT;ITKRS;ITLAL;IMEIA;ITAVO;SPLAD;IPRDR;SPRDR;IAFZG;IVKMH">
+      <job id="1" sgbd="D50M57E1" name="STATUS_MESSWERTBLOCK_LESEN" args="JA;ILMMG;IPLAD;IPUMG;IUBAT;ITKUM;IMOAK;INMOT;ITKRS;ITLAL;IMEIA;ITAVO;SPLAD;IPRDR;SPRDR;IAFZG;IVKMH">
         <display name="!JOB#STATUS_MESSWERTBLOCK_LESEN#STAT_LUFTMASSE_PRO_HUB_WERT" result="1#STAT_LUFTMASSE_PRO_HUB_WERT" format="L" grid-type="simple-gauge-round" min-value="0" max-value="1500" log_tag="STAT_LUFTMASSE_PRO_HUB_WERT" />
         <display name="!JOB#STATUS_MESSWERTBLOCK_LESEN#STAT_LADEDRUCK_WERT" result="1#STAT_LADEDRUCK_WERT" format="4.1R" grid-type="simple-gauge-round" min-value="0" max-value="2500" log_tag="STAT_LADEDRUCK_WERT" />
         <display name="!JOB#STATUS_MESSWERTBLOCK_LESEN#STAT_UBATT_WERT" result="1#STAT_UBATT_WERT" format="2.1R" grid-type="simple-gauge-round" min-value="0" max-value="15" log_tag="STAT_UBATT_WERT" />
@@ -58,6 +60,7 @@
         <display name="!JOB#STATUS_MESSWERTBLOCK_LESEN#STAT_RAILDRUCK_SOLL_WERT" result="1#STAT_RAILDRUCK_SOLL_WERT" format="L" grid-type="simple-gauge-round" min-value="0" max-value="1400" log_tag="STAT_RAILDRUCK_SOLL_WERT" />
         <display name="!JOB#STATUS_MESSWERTBLOCK_LESEN#STAT_FAHRZEUGBESCHLEUNIGUNG_WERT" result="1#STAT_FAHRZEUGBESCHLEUNIGUNG_WERT" format="2.3R" grid-type="simple-gauge-round" min-value="-15" max-value="15" log_tag="STAT_FAHRZEUGBESCHLEUNIGUNG_WERT" />
         <display name="!JOB#STATUS_MESSWERTBLOCK_LESEN#STAT_GESCHWINDIGKEIT_WERT" result="1#STAT_GESCHWINDIGKEIT_WERT" format="L" grid-type="simple-gauge-round" min-value="0" max-value="250" log_tag="STAT_GESCHWINDIGKEIT_WERT" />
+		<display name="!JOB#STATUS_MESSWERTBLOCK_LESEN#STAT_UMGEBUNGSDRUCK_WERT" result="STAT_UMGEBUNGSDRUCK_WERT" format="4.1R"  log_tag="STAT_UMGEBUNGSDRUCK_WERT" />
       </job>
 	  <job id="2" sgbd="kombi46r" name="STATUS_TOENS_IO">
         <display name="!JOB#STATUS_TOENS_IO#STAT_TOG_HIGH_WERT" result="1#STAT_TOG_HIGH_WERT" format="L" grid-type="simple-gauge-round" min-value="0" max-value="1000" log_tag="STAT_TOG_HIGH_WERT" />

+ 2 - 2
E46 M57N/LWS5_1B.ccpage

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <fragment xmlns="http://www.holeschak.de/BmwDeepObd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.holeschak.de/BmwDeepObd BmwDeepObd.xsd">
-  <page name="!PAGE_NAME" display-mode="list" fontsize="small" gauges-portrait="2" gauges-landscape="4" logfile="LWS5_1B.log">
+  <page name="LWS5" display-mode="list" fontsize="medium" gauges-portrait="2" gauges-landscape="4" logfile="LWS5_1B.log">
     <strings>
-      <string name="!PAGE_NAME">LWS5</string>
+      <string name="LWS5">LWS5</string>
       <string name="!JOB#STATUS_SG_ONLINE#STAT_INLRW_G_WERT">Lenkwinkel</string>
       <string name="!JOB#STATUS_SG_ONLINE#STAT_INLRWPKT_G_WERT">Lenkwinkelgeschwindigkeit</string>
     </strings>

+ 33 - 60
E46 M57N/Laufunruhe.ccpage

@@ -1,62 +1,35 @@
-<?xml version="1.0" encoding="utf-8"?>
-<fragment xmlns="http://www.holeschak.de/BmwDeepObd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.holeschak.de/BmwDeepObd BmwDeepObd.xsd">
-  <page name="!PAGE_NAME" display-mode="list" fontsize="medium" gauges-portrait="2" gauges-landscape="4" logfile="Laufunruhe.log">
-    <strings>
-      <string name="!PAGE_NAME">Uneven running</string>
-      <string name="STAT_LAUFUNRUHE_LLR_MENGE_ZYL1_WERT"> Cyl. 1 [mg/str]</string>
-      <string name="STAT_LAUFUNRUHE_LLR_MENGE_ZYL2_WERT"> Cyl. 2 [mg/str]</string>
-      <string name="STAT_LAUFUNRUHE_LLR_MENGE_ZYL3_WERT"> Cyl. 3 [mg/str]</string>
-      <string name="STAT_LAUFUNRUHE_LLR_MENGE_ZYL4_WERT"> Cyl. 4 [mg/str]</string>
-      <string name="STAT_LAUFUNRUHE_LLR_MENGE_ZYL5_WERT"> Cyl. 5 [mg/str]</string>
-      <string name="STAT_LAUFUNRUHE_LLR_MENGE_ZYL6_WERT"> Cyl. 6 [mg/str]</string>
-    </strings>
-	<strings lang="de">
-      <string name="!PAGE_NAME">Laufunruhe</string>
-      <string name="STAT_LAUFUNRUHE_LLR_MENGE_ZYL1_WERT"> Zyl. 1 [mg/Hub]</string>
-      <string name="STAT_LAUFUNRUHE_LLR_MENGE_ZYL2_WERT"> Zyl. 2 [mg/Hub]</string>
-      <string name="STAT_LAUFUNRUHE_LLR_MENGE_ZYL3_WERT"> Zyl. 3 [mg/Hub]</string>
-      <string name="STAT_LAUFUNRUHE_LLR_MENGE_ZYL4_WERT"> Zyl. 4 [mg/Hub]</string>
-      <string name="STAT_LAUFUNRUHE_LLR_MENGE_ZYL5_WERT"> Zyl. 5 [mg/Hub]</string>
-      <string name="STAT_LAUFUNRUHE_LLR_MENGE_ZYL6_WERT"> Zyl. 6 [mg/Hub]</string>
+<?xml version="1.0" encoding="utf-8"?>
+<fragment xmlns="http://www.holeschak.de/BmwDeepObd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.holeschak.de/BmwDeepObd BmwDeepObd.xsd">
+  <page name="Laufunruhe" display-mode="grid" fontsize="medium" gauges-portrait="2" gauges-landscape="4" logfile="Laufunruhe.log">
+    <strings>
+      <string name="Laufunruhe">Uneven running</string>
+      <string name="!JOB#STATUS_LAUFUNRUHE_LLR_MENGE#STAT_LAUFUNRUHE_LLR_MENGE_ZYL1_WERT"> Zyl. 1 [mg/str]</string>
+      <string name="!JOB#STATUS_LAUFUNRUHE_LLR_MENGE#STAT_LAUFUNRUHE_LLR_MENGE_ZYL2_WERT"> Zyl. 2 [mg/str]</string>
+      <string name="!JOB#STATUS_LAUFUNRUHE_LLR_MENGE#STAT_LAUFUNRUHE_LLR_MENGE_ZYL3_WERT"> Zyl. 3 [mg/str]</string>
+      <string name="!JOB#STATUS_LAUFUNRUHE_LLR_MENGE#STAT_LAUFUNRUHE_LLR_MENGE_ZYL4_WERT"> Zyl. 4 [mg/str]</string>
+      <string name="!JOB#STATUS_LAUFUNRUHE_LLR_MENGE#STAT_LAUFUNRUHE_LLR_MENGE_ZYL5_WERT"> Zyl. 5 [mg/str]</string>
+      <string name="!JOB#STATUS_LAUFUNRUHE_LLR_MENGE#STAT_LAUFUNRUHE_LLR_MENGE_ZYL6_WERT"> Zyl. 6 [mg/str]</string>
     </strings>
-      <display name="STAT_LAUFUNRUHE_LLR_MENGE_ZYL1_WERT" result="STAT_LAUFUNRUHE_LLR_MENGE_ZYL1_WERT" format=".2R" display-order="1" grid-type="simple-gauge-dot" min-value="-10" max-value="10" log_tag="STAT_LAUFUNRUHE_LLR_MENGE_ZYL1_WERT" />
-      <display name="STAT_LAUFUNRUHE_LLR_MENGE_ZYL2_WERT" result="STAT_LAUFUNRUHE_LLR_MENGE_ZYL2_WERT" format=".2R" display-order="2" grid-type="simple-gauge-dot" min-value="-10" max-value="10" log_tag="STAT_LAUFUNRUHE_LLR_MENGE_ZYL2_WERT" />
-      <display name="STAT_LAUFUNRUHE_LLR_MENGE_ZYL3_WERT" result="STAT_LAUFUNRUHE_LLR_MENGE_ZYL3_WERT" format=".2R" display-order="3" grid-type="simple-gauge-dot" min-value="-10" max-value="10" log_tag="STAT_LAUFUNRUHE_LLR_MENGE_ZYL3_WERT" />
-      <display name="STAT_LAUFUNRUHE_LLR_MENGE_ZYL4_WERT" result="STAT_LAUFUNRUHE_LLR_MENGE_ZYL4_WERT" format=".2R" display-order="4" grid-type="simple-gauge-dot" min-value="-10" max-value="10" log_tag="STAT_LAUFUNRUHE_LLR_MENGE_ZYL4_WERT" />
-      <display name="STAT_LAUFUNRUHE_LLR_MENGE_ZYL5_WERT" result="STAT_LAUFUNRUHE_LLR_MENGE_ZYL5_WERT" format=".2R" display-order="5" grid-type="simple-gauge-dot" min-value="-10" max-value="10" log_tag="STAT_LAUFUNRUHE_LLR_MENGE_ZYL5_WERT" />
-      <display name="STAT_LAUFUNRUHE_LLR_MENGE_ZYL6_WERT" result="STAT_LAUFUNRUHE_LLR_MENGE_ZYL6_WERT" format=".2R" display-order="6" grid-type="simple-gauge-dot" min-value="-10" max-value="10" log_tag="STAT_LAUFUNRUHE_LLR_MENGE_ZYL6_WERT" />
-    
-    <jobs sgbd="d50m57e1"/>
-    <code show_warnings="true">
-    <![CDATA[
-    class PageClass
-    {
-        public void ExecuteJob(EdiabasNet ediabas, ref MultiMap<string, EdiabasNet.ResultData> resultDict, bool firstCall)
-        {	
-            if (firstCall) {
-                ediabas.ArgString = string.Empty;
-                ediabas.ArgBinaryStd = null;
-                ediabas.ResultsRequests = "JOB_STATUS";
-                
-                ediabas.ExecuteJob("START_SYSTEMCHECK_ZYL");
-            }
-            else {
-                ediabas.ArgString = string.Empty;
-                ediabas.ArgBinaryStd = null;
-                ediabas.ResultsRequests = "STAT_LAUFUNRUHE_LLR_MENGE_ZYL1_WERT;STAT_LAUFUNRUHE_LLR_MENGE_ZYL2_WERT;STAT_LAUFUNRUHE_LLR_MENGE_ZYL3_WERT;STAT_LAUFUNRUHE_LLR_MENGE_ZYL4_WERT;STAT_LAUFUNRUHE_LLR_MENGE_ZYL5_WERT;STAT_LAUFUNRUHE_LLR_MENGE_ZYL6_WERT";
-                
-                ediabas.ExecuteJob("STATUS_LAUFUNRUHE_LLR_MENGE");
-				
-				List<Dictionary<string, EdiabasNet.ResultData>> resultSets = ediabas.ResultSets;
-				if (resultSets != null && resultSets.Count >= 2)
-				{
-					//EdiabasNet.ResultData resultData;
-					EdiabasThread.MergeResultDictionarys(ref resultDict, resultSets[1]);
-				}
-            }
-        }
-    }
-    ]]>
-    </code>
-  </page>
+	<strings lang="de">
+      <string name="Laufunruhe">Laufunruhe</string>
+      <string name="!JOB#STATUS_LAUFUNRUHE_LLR_MENGE#STAT_LAUFUNRUHE_LLR_MENGE_ZYL1_WERT"> Zyl. 1 [mg/Hub]</string>
+      <string name="!JOB#STATUS_LAUFUNRUHE_LLR_MENGE#STAT_LAUFUNRUHE_LLR_MENGE_ZYL2_WERT"> Zyl. 2 [mg/Hub]</string>
+      <string name="!JOB#STATUS_LAUFUNRUHE_LLR_MENGE#STAT_LAUFUNRUHE_LLR_MENGE_ZYL3_WERT"> Zyl. 3 [mg/Hub]</string>
+      <string name="!JOB#STATUS_LAUFUNRUHE_LLR_MENGE#STAT_LAUFUNRUHE_LLR_MENGE_ZYL4_WERT"> Zyl. 4 [mg/Hub]</string>
+      <string name="!JOB#STATUS_LAUFUNRUHE_LLR_MENGE#STAT_LAUFUNRUHE_LLR_MENGE_ZYL5_WERT"> Zyl. 5 [mg/Hub]</string>
+      <string name="!JOB#STATUS_LAUFUNRUHE_LLR_MENGE#STAT_LAUFUNRUHE_LLR_MENGE_ZYL6_WERT"> Zyl. 6 [mg/Hub]</string>
+    </strings>
+	<jobs sgbd="d50m57e1">
+	  <job name="START_SYSTEMCHECK_ZYL" args_first="LLR_EIN" results="JOB_STATUS">
+	  </job>
+      <job name="STATUS_LAUFUNRUHE_LLR_MENGE" results="STAT_LAUFUNRUHE_LLR_MENGE_ZYL1_WERT;STAT_LAUFUNRUHE_LLR_MENGE_ZYL2_WERT;STAT_LAUFUNRUHE_LLR_MENGE_ZYL3_WERT;STAT_LAUFUNRUHE_LLR_MENGE_ZYL4_WERT;STAT_LAUFUNRUHE_LLR_MENGE_ZYL5_WERT;STAT_LAUFUNRUHE_LLR_MENGE_ZYL6_WERT">
+        <display name="!JOB#STATUS_LAUFUNRUHE_LLR_MENGE#STAT_LAUFUNRUHE_LLR_MENGE_ZYL1_WERT" result="STAT_LAUFUNRUHE_LLR_MENGE_ZYL1_WERT" format=".2R" display-order="1" grid-type="simple-gauge-dot" min-value="-10" max-value="10" log_tag="STAT_LAUFUNRUHE_LLR_MENGE_ZYL1_WERT" />
+        <display name="!JOB#STATUS_LAUFUNRUHE_LLR_MENGE#STAT_LAUFUNRUHE_LLR_MENGE_ZYL2_WERT" result="STAT_LAUFUNRUHE_LLR_MENGE_ZYL2_WERT" format=".2R" display-order="2" grid-type="simple-gauge-dot" min-value="-10" max-value="10" log_tag="STAT_LAUFUNRUHE_LLR_MENGE_ZYL2_WERT" />
+        <display name="!JOB#STATUS_LAUFUNRUHE_LLR_MENGE#STAT_LAUFUNRUHE_LLR_MENGE_ZYL3_WERT" result="STAT_LAUFUNRUHE_LLR_MENGE_ZYL3_WERT" format=".2R" display-order="3" grid-type="simple-gauge-dot" min-value="-10" max-value="10" log_tag="STAT_LAUFUNRUHE_LLR_MENGE_ZYL3_WERT" />
+        <display name="!JOB#STATUS_LAUFUNRUHE_LLR_MENGE#STAT_LAUFUNRUHE_LLR_MENGE_ZYL4_WERT" result="STAT_LAUFUNRUHE_LLR_MENGE_ZYL4_WERT" format=".2R" display-order="4" grid-type="simple-gauge-dot" min-value="-10" max-value="10" log_tag="STAT_LAUFUNRUHE_LLR_MENGE_ZYL4_WERT" />
+        <display name="!JOB#STATUS_LAUFUNRUHE_LLR_MENGE#STAT_LAUFUNRUHE_LLR_MENGE_ZYL5_WERT" result="STAT_LAUFUNRUHE_LLR_MENGE_ZYL5_WERT" format=".2R" display-order="5" grid-type="simple-gauge-dot" min-value="-10" max-value="10" log_tag="STAT_LAUFUNRUHE_LLR_MENGE_ZYL5_WERT" />
+        <display name="!JOB#STATUS_LAUFUNRUHE_LLR_MENGE#STAT_LAUFUNRUHE_LLR_MENGE_ZYL6_WERT" result="STAT_LAUFUNRUHE_LLR_MENGE_ZYL6_WERT" format=".2R" display-order="6" grid-type="simple-gauge-dot" min-value="-10" max-value="10" log_tag="STAT_LAUFUNRUHE_LLR_MENGE_ZYL6_WERT" />
+      </job>
+	</jobs>
+  </page>
 </fragment>

+ 62 - 0
E46 M57N/Laufunruhe_C.ccpage

@@ -0,0 +1,62 @@
+<?xml version="1.0" encoding="utf-8"?>
+<fragment xmlns="http://www.holeschak.de/BmwDeepObd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.holeschak.de/BmwDeepObd BmwDeepObd.xsd">
+  <page name="Laufunruhe" display-mode="list" fontsize="medium" gauges-portrait="2" gauges-landscape="4" logfile="Laufunruhe.log">
+    <strings>
+      <string name="Laufunruhe">Uneven running</string>
+      <string name="STAT_LAUFUNRUHE_LLR_MENGE_ZYL1_WERT"> Cyl. 1 [mg/str]</string>
+      <string name="STAT_LAUFUNRUHE_LLR_MENGE_ZYL2_WERT"> Cyl. 2 [mg/str]</string>
+      <string name="STAT_LAUFUNRUHE_LLR_MENGE_ZYL3_WERT"> Cyl. 3 [mg/str]</string>
+      <string name="STAT_LAUFUNRUHE_LLR_MENGE_ZYL4_WERT"> Cyl. 4 [mg/str]</string>
+      <string name="STAT_LAUFUNRUHE_LLR_MENGE_ZYL5_WERT"> Cyl. 5 [mg/str]</string>
+      <string name="STAT_LAUFUNRUHE_LLR_MENGE_ZYL6_WERT"> Cyl. 6 [mg/str]</string>
+    </strings>
+	<strings lang="de">
+      <string name="Laufunruhe">Laufunruhe</string>
+      <string name="STAT_LAUFUNRUHE_LLR_MENGE_ZYL1_WERT"> Zyl. 1 [mg/Hub]</string>
+      <string name="STAT_LAUFUNRUHE_LLR_MENGE_ZYL2_WERT"> Zyl. 2 [mg/Hub]</string>
+      <string name="STAT_LAUFUNRUHE_LLR_MENGE_ZYL3_WERT"> Zyl. 3 [mg/Hub]</string>
+      <string name="STAT_LAUFUNRUHE_LLR_MENGE_ZYL4_WERT"> Zyl. 4 [mg/Hub]</string>
+      <string name="STAT_LAUFUNRUHE_LLR_MENGE_ZYL5_WERT"> Zyl. 5 [mg/Hub]</string>
+      <string name="STAT_LAUFUNRUHE_LLR_MENGE_ZYL6_WERT"> Zyl. 6 [mg/Hub]</string>
+    </strings>
+      <display name="STAT_LAUFUNRUHE_LLR_MENGE_ZYL1_WERT" result="STAT_LAUFUNRUHE_LLR_MENGE_ZYL1_WERT" format=".2R" display-order="1" grid-type="simple-gauge-dot" min-value="-10" max-value="10" log_tag="STAT_LAUFUNRUHE_LLR_MENGE_ZYL1_WERT" />
+      <display name="STAT_LAUFUNRUHE_LLR_MENGE_ZYL2_WERT" result="STAT_LAUFUNRUHE_LLR_MENGE_ZYL2_WERT" format=".2R" display-order="2" grid-type="simple-gauge-dot" min-value="-10" max-value="10" log_tag="STAT_LAUFUNRUHE_LLR_MENGE_ZYL2_WERT" />
+      <display name="STAT_LAUFUNRUHE_LLR_MENGE_ZYL3_WERT" result="STAT_LAUFUNRUHE_LLR_MENGE_ZYL3_WERT" format=".2R" display-order="3" grid-type="simple-gauge-dot" min-value="-10" max-value="10" log_tag="STAT_LAUFUNRUHE_LLR_MENGE_ZYL3_WERT" />
+      <display name="STAT_LAUFUNRUHE_LLR_MENGE_ZYL4_WERT" result="STAT_LAUFUNRUHE_LLR_MENGE_ZYL4_WERT" format=".2R" display-order="4" grid-type="simple-gauge-dot" min-value="-10" max-value="10" log_tag="STAT_LAUFUNRUHE_LLR_MENGE_ZYL4_WERT" />
+      <display name="STAT_LAUFUNRUHE_LLR_MENGE_ZYL5_WERT" result="STAT_LAUFUNRUHE_LLR_MENGE_ZYL5_WERT" format=".2R" display-order="5" grid-type="simple-gauge-dot" min-value="-10" max-value="10" log_tag="STAT_LAUFUNRUHE_LLR_MENGE_ZYL5_WERT" />
+      <display name="STAT_LAUFUNRUHE_LLR_MENGE_ZYL6_WERT" result="STAT_LAUFUNRUHE_LLR_MENGE_ZYL6_WERT" format=".2R" display-order="6" grid-type="simple-gauge-dot" min-value="-10" max-value="10" log_tag="STAT_LAUFUNRUHE_LLR_MENGE_ZYL6_WERT" />
+    
+    <jobs sgbd="d50m57e1"/>
+    <code show_warnings="true">
+    <![CDATA[
+    class PageClass
+    {
+        public void ExecuteJob(EdiabasNet ediabas, ref MultiMap<string, EdiabasNet.ResultData> resultDict, bool firstCall)
+        {	
+            if (firstCall) {
+                ediabas.ArgString = string.Empty;
+                ediabas.ArgBinaryStd = null;
+                ediabas.ResultsRequests = "JOB_STATUS";
+                
+                ediabas.ExecuteJob("START_SYSTEMCHECK_ZYL");
+            }
+            else {
+                ediabas.ArgString = string.Empty;
+                ediabas.ArgBinaryStd = null;
+                ediabas.ResultsRequests = "STAT_LAUFUNRUHE_LLR_MENGE_ZYL1_WERT;STAT_LAUFUNRUHE_LLR_MENGE_ZYL2_WERT;STAT_LAUFUNRUHE_LLR_MENGE_ZYL3_WERT;STAT_LAUFUNRUHE_LLR_MENGE_ZYL4_WERT;STAT_LAUFUNRUHE_LLR_MENGE_ZYL5_WERT;STAT_LAUFUNRUHE_LLR_MENGE_ZYL6_WERT";
+                
+                ediabas.ExecuteJob("STATUS_LAUFUNRUHE_LLR_MENGE");
+				
+				List<Dictionary<string, EdiabasNet.ResultData>> resultSets = ediabas.ResultSets;
+				if (resultSets != null && resultSets.Count >= 2)
+				{
+					//EdiabasNet.ResultData resultData;
+					EdiabasThread.MergeResultDictionarys(ref resultDict, resultSets[1]);
+				}
+            }
+        }
+    }
+    ]]>
+    </code>
+  </page>
+</fragment>

+ 0 - 26
E46 M57N/Laufunruhe_old.ccpage

@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<fragment xmlns="http://www.holeschak.de/BmwDeepObd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.holeschak.de/BmwDeepObd BmwDeepObd.xsd">
-  <page name="!PAGE_NAME" display-mode="grid" fontsize="medium" gauges-portrait="2" gauges-landscape="4" logfile="Laufunruhe.log">
-    <strings>
-      <string name="!PAGE_NAME">Laufunruhe</string>
-      <string name="!JOB#STATUS_LAUFUNRUHE_LLR_MENGE#STAT_LAUFUNRUHE_LLR_MENGE_ZYL1_WERT">Zyl. 1</string>
-      <string name="!JOB#STATUS_LAUFUNRUHE_LLR_MENGE#STAT_LAUFUNRUHE_LLR_MENGE_ZYL2_WERT">Zyl. 2</string>
-      <string name="!JOB#STATUS_LAUFUNRUHE_LLR_MENGE#STAT_LAUFUNRUHE_LLR_MENGE_ZYL3_WERT">Zyl. 3</string>
-      <string name="!JOB#STATUS_LAUFUNRUHE_LLR_MENGE#STAT_LAUFUNRUHE_LLR_MENGE_ZYL4_WERT">Zyl. 4</string>
-      <string name="!JOB#STATUS_LAUFUNRUHE_LLR_MENGE#STAT_LAUFUNRUHE_LLR_MENGE_ZYL5_WERT">Zyl. 5</string>
-      <string name="!JOB#STATUS_LAUFUNRUHE_LLR_MENGE#STAT_LAUFUNRUHE_LLR_MENGE_ZYL6_WERT">Zyl. 6</string>
-    </strings>
-	<jobs sgbd="d50m57e1">
-	  <job name="START_SYSTEMCHECK_ZYL" args_first="LLR_EIN" results="JOB_STATUS">
-	  </job>
-      <job name="STATUS_LAUFUNRUHE_LLR_MENGE" results="STAT_LAUFUNRUHE_LLR_MENGE_ZYL1_WERT;STAT_LAUFUNRUHE_LLR_MENGE_ZYL2_WERT;STAT_LAUFUNRUHE_LLR_MENGE_ZYL3_WERT;STAT_LAUFUNRUHE_LLR_MENGE_ZYL4_WERT;STAT_LAUFUNRUHE_LLR_MENGE_ZYL5_WERT;STAT_LAUFUNRUHE_LLR_MENGE_ZYL6_WERT">
-        <display name="!JOB#STATUS_LAUFUNRUHE_LLR_MENGE#STAT_LAUFUNRUHE_LLR_MENGE_ZYL1_WERT" result="STAT_LAUFUNRUHE_LLR_MENGE_ZYL1_WERT" format=".2R" display-order="1" grid-type="simple-gauge-dot" min-value="-10" max-value="10" log_tag="STAT_LAUFUNRUHE_LLR_MENGE_ZYL1_WERT" />
-        <display name="!JOB#STATUS_LAUFUNRUHE_LLR_MENGE#STAT_LAUFUNRUHE_LLR_MENGE_ZYL2_WERT" result="STAT_LAUFUNRUHE_LLR_MENGE_ZYL2_WERT" format=".2R" display-order="2" grid-type="simple-gauge-dot" min-value="-10" max-value="10" log_tag="STAT_LAUFUNRUHE_LLR_MENGE_ZYL2_WERT" />
-        <display name="!JOB#STATUS_LAUFUNRUHE_LLR_MENGE#STAT_LAUFUNRUHE_LLR_MENGE_ZYL3_WERT" result="STAT_LAUFUNRUHE_LLR_MENGE_ZYL3_WERT" format=".2R" display-order="3" grid-type="simple-gauge-dot" min-value="-10" max-value="10" log_tag="STAT_LAUFUNRUHE_LLR_MENGE_ZYL3_WERT" />
-        <display name="!JOB#STATUS_LAUFUNRUHE_LLR_MENGE#STAT_LAUFUNRUHE_LLR_MENGE_ZYL4_WERT" result="STAT_LAUFUNRUHE_LLR_MENGE_ZYL4_WERT" format=".2R" display-order="4" grid-type="simple-gauge-dot" min-value="-10" max-value="10" log_tag="STAT_LAUFUNRUHE_LLR_MENGE_ZYL4_WERT" />
-        <display name="!JOB#STATUS_LAUFUNRUHE_LLR_MENGE#STAT_LAUFUNRUHE_LLR_MENGE_ZYL5_WERT" result="STAT_LAUFUNRUHE_LLR_MENGE_ZYL5_WERT" format=".2R" display-order="5" grid-type="simple-gauge-dot" min-value="-10" max-value="10" log_tag="STAT_LAUFUNRUHE_LLR_MENGE_ZYL5_WERT" />
-        <display name="!JOB#STATUS_LAUFUNRUHE_LLR_MENGE#STAT_LAUFUNRUHE_LLR_MENGE_ZYL6_WERT" result="STAT_LAUFUNRUHE_LLR_MENGE_ZYL6_WERT" format=".2R" display-order="6" grid-type="simple-gauge-dot" min-value="-10" max-value="10" log_tag="STAT_LAUFUNRUHE_LLR_MENGE_ZYL6_WERT" />
-      </job>
-	</jobs>
-  </page>
-</fragment>

+ 2 - 2
E46 M57N/Pages.ccpages

@@ -8,11 +8,11 @@
     <include filename="DSC_MK60.ccpage" />
 	  <include filename="LWS5_1B.ccpage" />
     <include filename="KOMBI46R.ccpage" />
-    <include filename="KOMBI_SIA.ccpage" />
+    <include filename="KOMBI46R_SIA.ccpage" />
     <include filename="LSZ_2.ccpage" />
     <include filename="PDCACT.ccpage" />
     <include filename="IHKA46_3.ccpage" />
-    <include filename="DDEAbgleich.ccpage" />
+    <include filename="DDEAbgleich_D50M57E1.ccpage" />
     <include filename="Errors.ccpage" />
   </pages>
 </fragment>

+ 8 - 2
E46 M57N/RPA_DSC_MK60.ccpage

@@ -1,8 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
 <fragment xmlns="http://www.holeschak.de/BmwDeepObd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.holeschak.de/BmwDeepObd BmwDeepObd.xsd">
-  <page name="!PAGE_NAME" display-mode="list" fontsize="medium" gauges-portrait="2" gauges-landscape="4" logfile="RPA_DSC_MK60.log">
+  <page name="RPA" display-mode="list" fontsize="medium" gauges-portrait="2" gauges-landscape="4" logfile="RPA_DSC_MK60.log">
     <strings>
-      <string name="!PAGE_NAME">RPA (DSC MK60)</string>
+      <string name="RPA">RPA</string>
+      <string name="!JOB#STATUS_LESEN_RPA#WARNUNG_AKTUELL"> RPA current warning</string>
+      <string name="!JOB#STATUS_LESEN_RPA#STATUS_KM_RESET"> kilometers last initialisation</string>
+      <string name="!JOB#STATUS_LESEN_RPA#STATUS_KM_WARNUNG"> kilometers last warning</string>
+    </strings>
+	<strings lang="de">
+      <string name="RPA">RPA</string>
       <string name="!JOB#STATUS_LESEN_RPA#WARNUNG_AKTUELL"> RPA Warnung aktuell</string>
       <string name="!JOB#STATUS_LESEN_RPA#STATUS_KM_RESET"> Kilometerstand letzte Initialisierung</string>
       <string name="!JOB#STATUS_LESEN_RPA#STATUS_KM_WARNUNG"> Kilometerstand letzte Warnung</string>