update mocks and messages

Author: timothy.tamm

messages/Makefile

@@ -0,0 +1,2 @@
+protobuf: mockMsg.proto
+	protoc -I=./ --python_out=./ ./mockMsg.proto

messages/__init__.py

@@ -0,0 +1,12 @@
+from enum import Enum
+from .mockMsg_pb2 import MockMsg
+
+class MsgType(Enum):
+    MOCK_MSG = 0
+
+message_buffers = {
+    MsgType.MOCK_MSG: MockMsg
+}
+
+
+__all__ = ['MsgType', 'message_buffers', 'MockMsg']

messages/mockMsg.proto

@@ -0,0 +1,8 @@
+syntax = "proto2";
+
+package mateROV;
+
+message MockMsg {
+
+  required int32 mockValue = 1;
+}

messages/mockMsg_pb2.py

@@ -12,7 +12,7 @@
 class MockGuiModule(rm.ProtoModule):
     def __init__(self, addr, port):
         self.subscriptions = [MsgType.MOCK_MSG]
-        super().__init__(addr, port, message_buffers, MsgType, self.subscriptions)
+        super().__init__(addr, port, message_buffers, MsgType, FREQUENCY, self.subscriptions)
         self.value = -1
         self.sub_ticks = 0
         self.subbed = True
@@ -24,8 +24,6 @@ def msg_received(self, msg, msg_type):
 
     def tick(self):
         # this function will get called in a loop with FREQUENCY frequency
-        self.loop.call_later(1.0/FREQUENCY, self.tick)
-
         # for this mock module we will print out the current value
         print('Current value: {}'.format(self.value))
 

mockDisplayModule.py

@@ -12,7 +12,7 @@
 class MockSensorModule(rm.ProtoModule):
     def __init__(self, addr, port):
         self.subscriptions = []
-        super().__init__(addr, port, message_buffers, MsgType, self.subscriptions)
+        super().__init__(addr, port, message_buffers, MsgType, FREQUENCY)
 
     def msg_received(self, msg, msg_type):
         # This gets called whenever any message is received
@@ -21,8 +21,6 @@ def msg_received(self, msg, msg_type):
 
     def tick(self):
         # this function will get called in a loop with FREQUENCY frequency
-        self.loop.call_later(1.0/FREQUENCY, self.tick)
-
         # for this mock module we will just send a random int
         msg = MockMsg()
         msg.mockValue = random.randint(1, 9)