-
Notifications
You must be signed in to change notification settings - Fork 29
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
first attempt at async driver (with errors!)
- Loading branch information
1 parent
c2d9929
commit 2f3e091
Showing
11 changed files
with
293 additions
and
33 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
26 changes: 26 additions & 0 deletions
26
mil_common/drivers/electrical_protocol/electrical_protocol/Async_readme.txt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,26 @@ | ||
Everything currently labelled async is unifinished | ||
and not fully working. | ||
|
||
The last issue I had was the simulated device not | ||
being able to connect to the test, all async files are | ||
commented out. | ||
|
||
You can run the async test with the following command: | ||
"rostest --text electrical_protocol async_simulated.test" | ||
|
||
If you have any questions or confusion about the mess | ||
I've made here feel free to reach out: [email protected] | ||
|
||
ps: when starting you will most likely have to make | ||
async_test_simulated_basic.py / async_driver.py executable | ||
example: chmod +x async_test_simulated_basic.py (makes it executable) | ||
|
||
some helpful sites: | ||
axros examples | ||
https://mil.ufl.edu/docs/reference/axros/examples.html | ||
|
||
axros reference | ||
https://mil.ufl.edu/docs/reference/axros/api.html#service | ||
|
||
asyncio reference | ||
https://docs.python.org/3/library/asyncio.html |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -6,6 +6,7 @@ | |
<maintainer email="[email protected]">cameron.brown</maintainer> | ||
<license>MIT</license> | ||
<buildtool_depend>catkin</buildtool_depend> | ||
<exec_depend>axros</exec_depend> | ||
<exec_depend>rospy</exec_depend> | ||
<exec_depend>serial</exec_depend> | ||
</package> |
104 changes: 104 additions & 0 deletions
104
mil_common/drivers/electrical_protocol/test/async_calculator_device.py
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,104 @@ | ||
#!/usr/bin/env python3 | ||
""" | ||
from __future__ import annotations | ||
import asyncio | ||
from dataclasses import dataclass | ||
# from threading import Event, Thread | ||
from typing import Union | ||
import uvloop | ||
from axros import NodeHandle | ||
from electrical_protocol import AsyncSerialDevice, Packet | ||
from std_msgs.msg import Float32, String | ||
from std_srvs.srv import Empty, EmptyRequest, EmptyResponse | ||
@dataclass | ||
class RequestAddPacket(Packet, class_id=0x37, subclass_id=0x00, payload_format="<ff"): | ||
number_one: float | ||
number_two: float | ||
@dataclass | ||
class RequestSubPacket(Packet, class_id=0x37, subclass_id=0x01, payload_format="<ff"): | ||
start: float | ||
minus: float | ||
@dataclass | ||
class AnswerPacket(Packet, class_id=0x37, subclass_id=0x02, payload_format="<f"): | ||
result: float | ||
class AsyncCalculatorDevice( | ||
AsyncSerialDevice[Union[RequestAddPacket, RequestSubPacket], AnswerPacket], | ||
): | ||
def __init__(self, nh: NodeHandle): | ||
self.nh = nh | ||
print("1") | ||
# await asyncio.gather(self.port_topic.setup(), self.start_service.setup(), self.answer_topic.setup()) | ||
async def setup(self): | ||
# Move the async setup logic to a separate method | ||
print("Setting up AsyncCalculatorDevice...") | ||
# Create subscriber, service, and publisher | ||
self.port_topic = self.nh.subscribe("~port", String, self.port_callback) | ||
await self.port_topic.setup() | ||
print(f"Port topic: {self.port_topic.is_running}") | ||
self.start_service = self.nh.advertise_service("~trigger", Empty, self.trigger) | ||
await self.start_service.setup() | ||
print(f"Start service: {self.start_service.is_running}") | ||
self.answer_topic = self.nh.advertise("~answer", Float32, latching=True) | ||
print(f"Answer topic: {self.start_service.is_running}") | ||
await self.answer_topic.setup() | ||
# Set up the subscriber, publisher, and service asynchronously | ||
print("AsyncCalculatorDevice setup complete.") | ||
self.next_packet = asyncio.Event() | ||
self.i = 0 | ||
self.transport = None | ||
self.protocol = None | ||
def port_callback(self, msg: String): | ||
print("2") | ||
if self.loop.is_running: | ||
print("why are you running, but good") | ||
self.connect(msg.data, 115200, self.loop) | ||
async def trigger(self, _: EmptyRequest) -> EmptyResponse: | ||
if self.transport == None: | ||
print("transport is not with us") | ||
print("4") | ||
self.num_one, self.num_two = self.i, 1000 - self.i | ||
self.i += 1 | ||
self.send_packet( | ||
RequestAddPacket(number_one=self.num_one, number_two=self.num_two), | ||
) | ||
return EmptyResponse() | ||
def on_packet_received(self, packet) -> None: | ||
self.answer_topic.publish(Float32(data=packet.result)) | ||
self.next_packet.set() | ||
async def main(): | ||
nh, remaining_args = NodeHandle.from_argv_with_remaining( | ||
"async_calculator_device", anonymous=True, | ||
) | ||
async with nh: | ||
print("Starting AsyncCalculatorDevice...") | ||
device = AsyncCalculatorDevice(nh) | ||
await device.setup() | ||
if __name__ == "__main__": | ||
uvloop.install() | ||
asyncio.run(main()) | ||
""" |
7 changes: 7 additions & 0 deletions
7
mil_common/drivers/electrical_protocol/test/async_simulated.test
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,7 @@ | ||
|
||
<!-- <?xml version="1.0" encoding="UTF-8"?> | ||
<launch> | ||
<param name="/is_simulation" value="True" /> | ||
<node pkg="electrical_protocol" type="async_calculator_device.py" name="async_calculator_device" output="screen" /> | ||
<test pkg="electrical_protocol" test-name="async_test_simulated_basic" type="async_test_simulated_basic.py" /> | ||
</launch> --> |
Oops, something went wrong.