Change can.Message

.codecov.yml

@@ -8,7 +8,10 @@ coverage:
   round: down
   range: 50...100
   status:
-    # pull-requests only
+    project:
+      default:
+        # coverage may fall by <1.0% and still be considered "passing"
+        threshold: 1.0%
     patch:
       default:
         # coverage may fall by <1.0% and still be considered "passing"

can/CAN.py

@@ -22,10 +22,10 @@
 
 log = logging.getLogger('can')
 
-# See #267
+# See #267.
 # Version 2.0 - 2.1:    Log a Debug message
 # Version 2.2:          Log a Warning
 # Version 2.3:          Log an Error
 # Version 2.4:          Remove the module
-log.warning('Loading python-can via the old "CAN" API is deprecated since v2.0 an will get removed in v2.4. '
+log.error('Loading python-can via the old "CAN" API is deprecated since v2.0 an will get removed in v2.4. '
             'Please use `import can` instead.')

can/broadcastmanager.py

@@ -154,5 +154,5 @@ def send_periodic(bus, message, period, *args, **kwargs):
     :return: A started task instance
     """
     log.warning("The function `can.send_periodic` is deprecated and will " +
-                "be removed in version 2.3. Please use `can.Bus.send_periodic` instead.")
+                "be removed in version 3.0. Please use `can.Bus.send_periodic` instead.")
     return bus.send_periodic(message, period, *args, **kwargs)

can/interfaces/ixxat/canlib.py

@@ -485,7 +485,7 @@ def send(self, msg, timeout=None):
         message = structures.CANMSG()
         message.uMsgInfo.Bits.type = constants.CAN_MSGTYPE_DATA
         message.uMsgInfo.Bits.rtr = 1 if msg.is_remote_frame else 0
-        message.uMsgInfo.Bits.ext = 1 if msg.id_type else 0
+        message.uMsgInfo.Bits.ext = 1 if msg.is_extended_id else 0
         message.uMsgInfo.Bits.srr = 1 if self._receive_own_messages else 0
         message.dwMsgId = msg.arbitration_id
         if msg.dlc:
@@ -545,7 +545,7 @@ def __init__(self, scheduler, msg, period, duration, resolution):
         self._msg.wCycleTime = int(round(period * resolution))
         self._msg.dwMsgId = msg.arbitration_id
         self._msg.uMsgInfo.Bits.type = constants.CAN_MSGTYPE_DATA
-        self._msg.uMsgInfo.Bits.ext = 1 if msg.id_type else 0
+        self._msg.uMsgInfo.Bits.ext = 1 if msg.is_extended_id else 0
         self._msg.uMsgInfo.Bits.rtr = 1 if msg.is_remote_frame else 0
         self._msg.uMsgInfo.Bits.dlc = msg.dlc
         for i, b in enumerate(msg.data):

can/interfaces/kvaser/canlib.py

@@ -516,8 +516,6 @@ def _recv_internal(self, timeout=None):
                              error_state_indicator=error_state_indicator,
                              channel=self.channel,
                              timestamp=msg_timestamp + self._timestamp_offset)
-            rx_msg.flags = flags
-            rx_msg.raw_timestamp = msg_timestamp
             #log.debug('Got message: %s' % rx_msg)
             return rx_msg, self._is_filtered
         else:
@@ -526,7 +524,7 @@ def _recv_internal(self, timeout=None):
 
     def send(self, msg, timeout=None):
         #log.debug("Writing a message: {}".format(msg))
-        flags = canstat.canMSG_EXT if msg.id_type else canstat.canMSG_STD
+        flags = canstat.canMSG_EXT if msg.is_extended_id else canstat.canMSG_STD
         if msg.is_remote_frame:
             flags |= canstat.canMSG_RTR
         if msg.is_error_frame:

can/interfaces/nican.py

@@ -263,7 +263,7 @@ def send(self, msg, timeout=None):
             It does not wait for message to be ACKed currently.
         """
         arb_id = msg.arbitration_id
-        if msg.id_type:
+        if msg.is_extended_id:
             arb_id |= NC_FL_CAN_ARBID_XTD
         raw_msg = TxMessageStruct(arb_id,
                                   bool(msg.is_remote_frame),

can/interfaces/pcan/pcan.py

@@ -226,7 +226,7 @@ def _recv_internal(self, timeout):
         return rx_msg, False
 
     def send(self, msg, timeout=None):
-        if msg.id_type:
+        if msg.is_extended_id:
             msgType = PCAN_MESSAGE_EXTENDED
         else:
             msgType = PCAN_MESSAGE_STANDARD

can/interfaces/usb2can/usb2canInterface.py

@@ -51,7 +51,7 @@ def message_convert_tx(msg):
     if msg.is_remote_frame:
         messagetx.flags |= IS_REMOTE_FRAME
 
-    if msg.id_type:
+    if msg.is_extended_id:
         messagetx.flags |= IS_ID_TYPE
 
     return messagetx

can/interfaces/vector/canlib.py

@@ -319,7 +319,7 @@ def _recv_internal(self, timeout):
     def send(self, msg, timeout=None):
         msg_id = msg.arbitration_id
 
-        if msg.id_type:
+        if msg.is_extended_id:
             msg_id |= vxlapi.XL_CAN_EXT_MSG_ID
 
         flags = 0

can/io/blf.py

@@ -293,7 +293,7 @@ def on_message_received(self, msg):
             channel += 1
 
         arb_id = msg.arbitration_id
-        if msg.id_type:
+        if msg.is_extended_id:
             arb_id |= CAN_MSG_EXT
         flags = REMOTE_FLAG if msg.is_remote_frame else 0
         data = bytes(msg.data)

can/io/csv.py

@@ -61,7 +61,7 @@ def on_message_received(self, msg):
         row = ','.join([
             repr(msg.timestamp), # cannot use str() here because that is rounding
             hex(msg.arbitration_id),
-            '1' if msg.id_type else '0',
+            '1' if msg.is_extended_id else '0',
             '1' if msg.is_remote_frame else '0',
             '1' if msg.is_error_frame else '0',
             str(msg.dlc),

can/io/sqlite.py

@@ -195,7 +195,7 @@ def _db_writer_thread(self):
                     messages.append((
                         msg.timestamp,
                         msg.arbitration_id,
-                        msg.id_type,
+                        msg.is_extended_id,
                         msg.is_remote_frame,
                         msg.is_error_frame,
                         msg.dlc,