[rp] fix gpio functional

modm-io · Oct 23, 2024 · cedb3aa · cedb3aa
1 parent 6a4aeaf
commit cedb3aa
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 13 deletions.
diff --git a/src/modm/platform/gpio/rp/base.hpp.in b/src/modm/platform/gpio/rp/base.hpp.in
@@ -59,13 +59,6 @@ struct Gpio
 		PushPull
 	};
 
-	enum class
-	OutputSpeed
-	{
-		Slow = 0,
-		Fast = 1,
-	};
-
 	enum class
 	DriveStrength
 	{

diff --git a/src/modm/platform/gpio/rp/set.hpp.in b/src/modm/platform/gpio/rp/set.hpp.in
@@ -62,15 +62,15 @@ public:
 		setOutput();
 	}
 
-	static void setOutput(OutputType type, OutputSpeed speed = OutputSpeed::Slow)
+	static void setOutput(OutputType type, SlewRate speed = SlewRate::Slow)
 	{
 		setOutput();
 		configure(type, speed);
 	}
 
-	static void configure(OutputType, OutputSpeed speed = OutputSpeed::Slow)
+	static void configure(OutputType, SlewRate speed = SlewRate::Slow)
 	{
-		(PortRegs<Gpios::port>::set_speed(Gpios::pin, speed), ...);
+		(PortRegs<Gpios::port>::set_slewrate(Gpios::pin, uint8_t(speed)), ...);
 	}
 
 	static void setInput()
@@ -96,6 +96,11 @@ public:
 		(PortRegs<Gpios::port>::set_slewrate(Gpios::pin, uint8_t(rate)), ...);
 	}
 
+	static void setDriveStrength(DriveStrength drive)
+	{
+		(PortRegs<Gpios::port>::set_drive(Gpios::pin, uint8_t(drive)), ...);
+	}
+
 	static void set()
 	{
 %% for port, id in ports.items()

diff --git a/src/modm/platform/gpio/rp/static.hpp.in b/src/modm/platform/gpio/rp/static.hpp.in
@@ -45,14 +45,14 @@ public:
 
 	static void setFunction(uint8_t func) { Regs::set_funcsel(pin, func); }
 	static void setDriveStrength(DriveStrength strength)
-	{ Regs::set_drive(pin, strength); }
+	{ Regs::set_drive(pin, uint8_t(strength)); }
 
 public:
 	static void setOutput() { PinSet::setOutput(); }
 	static void setOutput(bool value) { PinSet::setOutput(value); }
-	static void setOutput(OutputType type, OutputSpeed speed=OutputSpeed::Slow)
+	static void setOutput(OutputType type, SlewRate speed=SlewRate::Slow)
 	{ PinSet::setOutput(type, speed); }
-	static void configure(OutputType type, OutputSpeed speed=OutputSpeed::Slow)
+	static void configure(OutputType type, SlewRate speed=SlewRate::Slow)
 	{ PinSet::configure(type, speed); }
 
 	static void set() { PinSet::set(); }