Use upstreamed modm::Stusb4500 driver

rleh · Mar 9, 2021 · d9141d6 · d9141d6
1 parent 903b99c
commit d9141d6
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 135 deletions.
diff --git a/firmware_modm/main.cpp b/firmware_modm/main.cpp
@@ -20,7 +20,7 @@
 
 #include "hardware.hpp"
 
-#include "stusb4500.hpp"
+#include <modm/driver/usb/stusb4500.hpp>
 
 // modm::IODeviceWrapper<modm::platform::UsbUart0, modm::IOBuffer::DiscardIfFull> loggerDevice;
 // modm::log::Logger modm::log::debug(loggerDevice);
@@ -43,7 +43,7 @@ using namespace modm::literals;
 
 modm::Pid<float, 1> pid;
 
-Stusb4500<Iron::Display::MyI2cMaster> usb{};
+modm::Stusb4500<Iron::Display::MyI2cMaster> usb{};
 
 class AdcThread : public modm::pt::Protothread
 {
@@ -245,16 +245,16 @@ int main()
 	Iron::Ui::initialize();
 
 
-	RF_CALL_BLOCKING(usb.configurePdo(0, 5000, 500));
-	RF_CALL_BLOCKING(usb.configurePdo(1, 20000, 1500));
-	RF_CALL_BLOCKING(usb.configurePdo(2, 20000, 4000));
+	RF_CALL_BLOCKING(usb.configurePdo(1, 5000, 500));
+	RF_CALL_BLOCKING(usb.configurePdo(2, 20000, 1500));
+	RF_CALL_BLOCKING(usb.configurePdo(3, 20000, 4000));
 
 	// pdo number expected {1,2,3}
 	RF_CALL_BLOCKING(usb.setValidPdo(3));
 
 	// check results
 	modm::delay(200ms);
-	stusb4500::RdoRegStatusData status = RF_CALL_BLOCKING(usb.getRdoRegStatus());
+	modm::stusb4500::RdoRegStatusData status = RF_CALL_BLOCKING(usb.getRdoRegStatus());
 	auto r = Iron::AnalogReadings::readAll();
 
 	Iron::Display::initialize();

diff --git a/firmware_modm/project.xml b/firmware_modm/project.xml
@@ -19,6 +19,7 @@
     <module>modm:processing:protothread</module>
     <module>modm:processing:timer</module>
     <module>modm:driver:ssd1306</module>
+    <module>modm:driver:stusb4500</module>
     <module>modm:container</module>
     <module>modm:platform:i2c:1</module>
     <module>modm:platform:timer:1</module>

diff --git a/firmware_modm/stusb4500.hpp b/firmware_modm/stusb4500.hpp