From 607eff3a43fe6d3987636c31b3e295ad61d1ae4c Mon Sep 17 00:00:00 2001
From: Jake <jake.read@cba.mit.edu>
Date: Wed, 10 Aug 2022 16:25:30 -0400
Subject: [PATCH] tracking...
---
firmware/axl-stepper/src/main.cpp | 4 +---
firmware/axl-stepper/src/osap_config.h | 2 +-
firmware/axl-stepper/src/osape | 2 +-
firmware/axl-stepper/src/osape_arduino | 2 +-
4 files changed, 4 insertions(+), 6 deletions(-)
diff --git a/firmware/axl-stepper/src/main.cpp b/firmware/axl-stepper/src/main.cpp
index e95d3e5..abb8c08 100644
--- a/firmware/axl-stepper/src/main.cpp
+++ b/firmware/axl-stepper/src/main.cpp
@@ -12,7 +12,7 @@
#include "osape_arduino/vp_arduinoSerial.h"
#include "osape_ucbus/vb_ucBusDrop.h"
-OSAP osap("axl-stepper");
+OSAP osap("axl-stepper_y");
VPort_ArduinoSerial vpUSBSerial(&osap, "arduinoUSBSerial", &Serial);
@@ -201,8 +201,6 @@ void setup() {
// setup stepper machine
stepper_hw->init(false, 0.0F);
stepper_hw->setMicrostep(4);
- // add ro the ucbus...
- vbUCBusDrop.broadcastChannels[12] = (new Route())->sib(2);
// setup controller
axl_setup();
// ticker begin:
diff --git a/firmware/axl-stepper/src/osap_config.h b/firmware/axl-stepper/src/osap_config.h
index e55f3b9..f94ddc1 100644
--- a/firmware/axl-stepper/src/osap_config.h
+++ b/firmware/axl-stepper/src/osap_config.h
@@ -29,6 +29,6 @@ no warranty is provided, and users accept all liability.
#define ENDPOINT_ROUTE_MAX_LEN 64
// count of broadcast channels width,
-#define VBUS_BROADCAST_CHANNELS 64
+#define VBUS_MAX_BROADCAST_CHANNELS 64
#endif
\ No newline at end of file
diff --git a/firmware/axl-stepper/src/osape b/firmware/axl-stepper/src/osape
index 0f72f37..a9c9de9 160000
--- a/firmware/axl-stepper/src/osape
+++ b/firmware/axl-stepper/src/osape
@@ -1 +1 @@
-Subproject commit 0f72f37a8d46e3f70f8e8cec9c5c63ef319636c9
+Subproject commit a9c9de9ccddd1eadfe34688fa162999129b0e59b
diff --git a/firmware/axl-stepper/src/osape_arduino b/firmware/axl-stepper/src/osape_arduino
index 498c7f3..ede9f0b 160000
--- a/firmware/axl-stepper/src/osape_arduino
+++ b/firmware/axl-stepper/src/osape_arduino
@@ -1 +1 @@
-Subproject commit 498c7f326e951b2f69172fa41bc295d53c8d3596
+Subproject commit ede9f0b52f1db0e686088441c0e9ab863eb38aa7
--
GitLab