Han Yan
/
ms2b
not running
Diff: Road.cpp
- Revision:
- 2:16b3bd337db2
- Parent:
- 0:3b4906b8a747
--- a/Road.cpp Tue Dec 10 23:40:25 2019 +0000 +++ b/Road.cpp Wed Dec 11 20:20:12 2019 +0000 @@ -2,13 +2,10 @@ Serial pc_road(USBTX, USBRX); -Road::Road(char* t1, char* t2) { +Road::Road(Communication* c) { active_cars = 0x00; - topic_send = t1; // road publish, controller receive - topic_receive = t2; // road receive, controller publish - comm = Communication::getInstance(); - comm->subscribe_to_topic_sync(topic_receive); // for receiving sync messages - n = 0; + comm = c; + n = 1; } void Road::add_car(Car* car) { @@ -50,8 +47,8 @@ void Road::wait_for_car_update() { done_flags.wait_all(active_cars); - n = n + 1; - comm->publish_road(topic_send, n); + comm->publish_road(n); Communication::sync_flags.wait_all(0x01); n = Communication::sync; + pc_road.printf("Update number %d\r\n", n); }