From ac0f9eb1be1d8296bf2b2631ea349b7b241f76d9 Mon Sep 17 00:00:00 2001
From: kascade <kascade@romraider.forum>
Date: Fri, 12 Jan 2007 23:33:55 +0000
Subject: [PATCH] iam, engine load updates to logger

git-svn-id: http://svn.3splooges.com/romraider-arch/trunk@424 d2e2e1cd-ba16-0410-be16-b7c4453c7c2d
---
 logger.xml                                    | 29 +++++++++++++------
 .../comms/manager/QueryManagerImpl.java       |  4 +--
 2 files changed, 22 insertions(+), 11 deletions(-)

diff --git a/logger.xml b/logger.xml
index a38d5d62..00e7cb53 100644
--- a/logger.xml
+++ b/logger.xml
@@ -969,10 +969,10 @@
 
             <ecuparams>
 
-                <ecuparam id="E1" name="IAM" desc="Ignition Advance Multiplier">
+                <ecuparam id="E1" name="IAM (16bit)" desc="Ignition Advance Multiplier (16bit)">
                     <address>
-                        <ecu id="3152584006">
-                            <byte>0x008228</byte>
+                        <ecu id="1234567890">
+                            <byte>0xFFFFFF</byte>
                         </ecu>
                     </address>
                     <conversions>
@@ -980,7 +980,18 @@
                     </conversions>
                 </ecuparam>
 
-                <!--<ecuparam id="E2" name="Engine Load (16bit)" desc="Engine Load (16bit)">
+                <ecuparam id="E2" name="IAM (32bit)" desc="Ignition Advance Multiplier (32bit)">
+                    <address>
+                        <ecu id="3152584006">
+                            <byte>0xFF8228</byte>
+                        </ecu>
+                    </address>
+                    <conversions>
+                        <conversion units="IAM" expr="x" format="0.00"/>
+                    </conversions>
+                </ecuparam>
+
+                <ecuparam id="E3" name="Engine Load (16bit)" desc="Engine Load (16bit)">
                     <address>
                         <ecu id="1234567890">
                             <byte>0xFFFFFF</byte>
@@ -989,17 +1000,17 @@
                     <conversions>
                         <conversion units="grams" expr="x/32" format="0.00"/>
                     </conversions>
-                </ecuparam>-->
+                </ecuparam>
 
-                <ecuparam id="E3" name="Engine Load (32bit)" desc="Engine Load (32bit)">
+                <ecuparam id="E4" name="Engine Load (32bit)" desc="Engine Load (32bit)">
                     <address>
                         <ecu id="3152584006">
-                            <byte>0x00A6FC</byte>
-                            <byte>0x00A6FD</byte>
+                            <byte>0xFFA6FC</byte>
+                            <byte>0xFFA6FD</byte>
                         </ecu>
                     </address>
                     <conversions>
-                        <conversion units="grams" expr="x/256" format="0.00"/>
+                        <conversion units="grams" expr="x" format="0.00"/>
                     </conversions>
                 </ecuparam>
 
diff --git a/src/enginuity/logger/comms/manager/QueryManagerImpl.java b/src/enginuity/logger/comms/manager/QueryManagerImpl.java
index 7bf3469b..b2797947 100644
--- a/src/enginuity/logger/comms/manager/QueryManagerImpl.java
+++ b/src/enginuity/logger/comms/manager/QueryManagerImpl.java
@@ -96,7 +96,7 @@ public final class QueryManagerImpl implements QueryManager {
                     notifyReading();
                     runLogger();
                 } else {
-                    sleep(5000L);
+                    sleep(1000L);
                 }
             }
         } catch (Exception e) {
@@ -138,7 +138,7 @@ public final class QueryManagerImpl implements QueryManager {
                 updateQueryList();
                 if (queryMap.isEmpty()) {
                     messageListener.reportMessage("Select parameters to be logged...");
-                    sleep(2000L);
+                    sleep(1000L);
                 } else {
                     txManager.sendQueries(queryMap.values());
                     count++;