Update socketcan ctypes and cyclic example to use new api

hardbyte · hardbyte · commit b446ead919aa · 2017-02-07T23:25:23.000+11:00
diff --git a/can/interfaces/socketcan/socketcan_ctypes.py b/can/interfaces/socketcan/socketcan_ctypes.py
@@ -8,7 +8,7 @@
 from ctypes.util import find_library
 
 import can
-from can.broadcastmanager import CyclicSendTaskABC
+from can.broadcastmanager import CyclicSendTaskABC, RestartableCyclicTaskABC, ModifiableCyclicTaskABC
 from can.bus import BusABC
 from can.message import Message
 from can.interfaces.socketcan.socketcan_constants import *  # CAN_RAW
@@ -413,7 +413,7 @@ def __init__(self, channel, *args, **kwargs):
         super(SocketCanCtypesBCMBase, self).__init__(*args, **kwargs)
 
 
-class CyclicSendTask(SocketCanCtypesBCMBase, CyclicSendTaskABC):
+class CyclicSendTask(SocketCanCtypesBCMBase, RestartableCyclicTaskABC, ModifiableCyclicTaskABC):
 
     def __init__(self, channel, message, period):
         """
diff --git a/examples/cyclic.py b/examples/cyclic.py
@@ -23,6 +23,7 @@ def simple_periodic_send(bus):
     print("Starting to send a message every 200ms for 2s")
     msg = can.Message(arbitration_id=0x123, data=[1, 2, 3, 4, 5, 6], extended_id=False)
     task = bus.send_periodic(msg, 0.20)
+    assert isinstance(task, can.CyclicSendTaskABC)
     time.sleep(2)
     task.stop()
     print("stopped cyclic send")
@@ -31,35 +32,39 @@ def simple_periodic_send(bus):
 def limited_periodic_send(bus):
     print("Starting to send a message every 200ms for 1s")
     msg = can.Message(arbitration_id=0x12345678, data=[0, 0, 0, 0, 0, 0], extended_id=True)
-    bus.send_periodic(msg, 0.20, 1)
-    time.sleep(3)
-    # task.stop()
-    # print("stopped cyclic send")
+    task = bus.send_periodic(msg, 0.20, 1)
+    if not isinstance(task, can.LimitedDurationCyclicSendTaskABC):
+        print("This interface doesn't seem to support a ")
+        task.stop()
 
+    print("stopped cyclic send")
 
-# def test_periodic_send_with_modifying_data():
-#     print("Starting to send a message every 200ms. Initial data is ones")
-#     msg = can.Message(arbitration_id=0x0cf02200, data=[1, 1, 1, 1])
-#     task = can.send_periodic('vcan0', msg, 0.20)
-#     time.sleep(2)
-#     print("Changing data of running task to begin with 99")
-#     msg.data[0] = 0x99
-#     task.modify_data(msg)
-#     time.sleep(2)
-#
-#     task.stop()
-#     print("stopped cyclic send")
-#     print("Changing data of stopped task to single ff byte")
-#     msg.data = bytearray([0xff])
-#     task.modify_data(msg)
-#     time.sleep(1)
-#     print("starting again")
-#     task.start()
-#     time.sleep(1)
-#     task.stop()
-#     print("done")
-#
-#
+
+def test_periodic_send_with_modifying_data():
+    print("Starting to send a message every 200ms. Initial data is ones")
+    msg = can.Message(arbitration_id=0x0cf02200, data=[1, 1, 1, 1])
+    task = can.send_periodic('vcan0', msg, 0.20)
+    time.sleep(2)
+    print("Changing data of running task to begin with 99")
+    msg.data[0] = 0x99
+    task.modify_data(msg)
+    time.sleep(2)
+
+    task.stop()
+    print("stopped cyclic send")
+    print("Changing data of stopped task to single ff byte")
+    msg.data = bytearray([0xff])
+    task.modify_data(msg)
+    time.sleep(1)
+    print("starting again")
+    task.start()
+    time.sleep(1)
+    task.stop()
+    print("done")
+
+
+# Will have to consider how to expose items like this. The socketcan
+# interfaces will continue to support it... but the top level api won't.
 # def test_dual_rate_periodic_send():
 #     """Send a message 10 times at 1ms intervals, then continue to send every 500ms"""
 #     msg = can.Message(arbitration_id=0x123, data=[0, 1, 2, 3, 4, 5])
@@ -92,7 +97,7 @@ def limited_periodic_send(bus):
 
     for interface in {
         'socketcan_ctypes',
-        #'socketcan_native'
+        'socketcan_native'
     }:
         print("Carrying out cyclic tests with {} interface".format(interface))
         can.rc['interface'] = interface
@@ -107,7 +112,7 @@ def limited_periodic_send(bus):
 
         limited_periodic_send(bus)
 
-        #test_periodic_send_with_modifying_data()
+        test_periodic_send_with_modifying_data()
 
         #print("Carrying out multirate cyclic test for {} interface".format(interface))
         #can.rc['interface'] = interface
