more debug tweaking

Brendan Whitfield · Brendan Whitfield · commit a47ade52d1fa · 2016-07-22T15:06:01.000-04:00
diff --git a/obd/elm327.py b/obd/elm327.py
@@ -105,21 +105,25 @@ class ELM327:
     def __init__(self, portname, baudrate, protocol):
         """Initializes port by resetting device and gettings supported PIDs. """
 
+        logger.info("Initializing ELM327: PORT=%s BAUD=%s PROTOCOL=%s" %
+                    (
+                        portname,
+                        "auto" if baudrate is None else baudrate,
+                        "auto" if protocol is None else protocol,
+                    ))
+
         self.__status   = OBDStatus.NOT_CONNECTED
         self.__port     = None
         self.__protocol = UnknownProtocol([])
 
 
         # ------------- open port -------------
         try:
-            logger.info("Opening serial port '%s'" % portname)
             self.__port = serial.Serial(portname, \
                                         parity   = serial.PARITY_NONE, \
                                         stopbits = 1, \
                                         bytesize = 8,
                                         timeout = 10) # seconds
-            logger.info("Port opened")
-
         except serial.SerialException as e:
             self.__error(e)
             return
@@ -164,7 +168,12 @@ def __init__(self, portname, baudrate, protocol):
         # try to communicate with the car, and load the correct protocol parser
         if self.set_protocol(protocol):
             self.__status = OBDStatus.CAR_CONNECTED
-            logger.info("Connection successful")
+            logger.info("Connected Successfully: PORT=%s BAUD=%s PROTOCOL=%s" %
+                        (
+                            portname,
+                            self.__protocol.ELM_ID,
+                            self.__port.baudrate,
+                        ))
         else:
             logger.error("Connected to the adapter, but failed to connect to the vehicle")
 
@@ -182,9 +191,6 @@ def set_protocol(self, protocol):
 
 
     def manual_protocol(self, protocol):
-
-        logger.debug("Setting fixed protocol: %s" % protocol)
-
         r = self.__send(b"ATTP" + protocol.encode())
         r0100 = self.__send(b"0100")
 
@@ -206,8 +212,6 @@ def auto_protocol(self):
             and this function returns True
         """
 
-        logger.debug("Choosing protocol automatically")
-
         # -------------- try the ELM's auto protocol mode --------------
         r = self.__send(b"ATSP0")
 
@@ -234,7 +238,7 @@ def auto_protocol(self):
             # an unknown protocol
             # this is likely because not all adapter/car combinations work
             # in "auto" mode. Some respond to ATDPN responded with "0"
-            logger.info("ELM responded with unknown protocol. Trying them one-by-one")
+            logger.debug("ELM responded with unknown protocol. Trying them one-by-one")
 
             for p in self._TRY_PROTOCOL_ORDER:
                 r = self.__send(b"ATTP" + p.encode())
@@ -258,7 +262,6 @@ def set_baudrate(self, baud):
             else:
                 return self.auto_baudrate()
         else:
-            logger.debug("Setting fixed baudrate: %d" % baud)
             self.__port.baudrate = baud
             return True
 
@@ -269,8 +272,6 @@ def auto_baudrate(self):
         Returns boolean for success.
         """
 
-        logger.debug("Choosing baudrate automatically")
-
         # before we change the timout, save the "normal" value
         timeout = self.__port.timeout
         self.__port.timeout = 0.1 # we're only talking with the ELM, so things should go quickly
@@ -399,7 +400,7 @@ def __send(self, cmd, delay=None):
         self.__write(cmd)
 
         if delay is not None:
-            logger.info("wait: %d seconds" % delay)
+            logger.debug("wait: %d seconds" % delay)
             time.sleep(delay)
 
         return self.__read()
diff --git a/obd/obd.py b/obd/obd.py
@@ -99,7 +99,7 @@ def __load_commands(self):
             logger.warning("Cannot load commands: No connection to car")
             return
 
-        logger.info("querying for supported PIDs (commands)...")
+        logger.info("querying for supported commands")
         pid_getters = commands.pid_getters()
         for get in pid_getters:
             # PID listing commands should sequentialy become supported
@@ -109,9 +109,10 @@ def __load_commands(self):
 
             # when querying, only use the blocking OBD.query()
             # prevents problems when query is redefined in a subclass (like Async)
-            response = OBD.query(self, get, force=True) # ask nicely
+            response = OBD.query(self, get)
 
             if response.is_null():
+                logger.info("No valid data for PID listing command: %s" % get)
                 continue
 
             # loop through PIDs bitarray
