fixup: Cs43l22

Author: rleh

src/modm/driver/dac/cs43l22.hpp

@@ -132,7 +132,7 @@ struct cs43l22
 		PDN_HPA1  = Bit5,
 
 		PDN_HPB0  = Bit6,
-		PDN_HPB1  = Bit7,		
+		PDN_HPB1  = Bit7,
 	};
 	MODM_FLAGS8(PowerControl2);
 
@@ -156,7 +156,7 @@ struct cs43l22
 
 		RATIO0      = Bit1,
 		RATIO1      = Bit2,
-		
+
 		VIDEOCLK    = Bit3,
 		GROUP_32K   = Bit4,
 
@@ -276,7 +276,7 @@ struct cs43l22
 										ClockingControl_t, InterfaceControl1_t,
 										MasterVolumeControl_t, AnalogZcAndSrSettings_t,
 										MiscellaneousControls_t, LimiterControl1MinMaxThresholds_t >;
-	
+
 	typedef int16_t centiBel_t;
 	static constexpr centiBel_t MaxVolume = 120;
 	static constexpr centiBel_t MinVolume = -1020;
@@ -293,10 +293,10 @@ struct cs43l22
  * @ingroup modm_driver_cs43l22
  */
 template<typename I2cMaster, typename I2sMaster>
-class CS43L22 : public cs43l22, public modm::I2cDevice<I2cMaster, 3>
+class Cs43l22 : public cs43l22, public modm::I2cDevice<I2cMaster, 5>
 {
 public:
-	CS43L22(uint8_t i2cAddress);
+	Cs43l22(uint8_t i2cAddress);
 
 	/// Initialize device, call before using any other function
 	ResumableResult<bool>

src/modm/driver/dac/cs43l22_impl.hpp

@@ -17,15 +17,15 @@ namespace modm
 {
 
 template<typename I2cMaster, typename I2sMaster>
-CS43L22<I2cMaster, I2sMaster>::CS43L22(uint8_t i2cAddress)
-	: I2cDevice<I2cMaster, 3>(i2cAddress)
+Cs43l22<I2cMaster, I2sMaster>::Cs43l22(uint8_t i2cAddress)
+	: I2cDevice<I2cMaster, 5>(i2cAddress)
 {
 	volume = -300;
 }
 
 template<typename I2cMaster, typename I2sMaster>
 ResumableResult<bool>
-CS43L22<I2cMaster, I2sMaster>::initialize()
+Cs43l22<I2cMaster, I2sMaster>::initialize()
 {
 	RF_BEGIN();
 	// Verify the chip ID
@@ -35,8 +35,8 @@ CS43L22<I2cMaster, I2sMaster>::initialize()
 		RF_RETURN(false);
 	}
 	RF_CALL(writeRegister(Register::PowerControl1, Power_t(Power::Down)));
-	RF_CALL(writeRegister(Register::PowerControl2, ChannelPowerHeadphoneA_t(ChannelPower::OnAlways) | 
-															ChannelPowerHeadphoneB_t(ChannelPower::OnAlways) | 
+	RF_CALL(writeRegister(Register::PowerControl2, ChannelPowerHeadphoneA_t(ChannelPower::OnAlways) |
+															ChannelPowerHeadphoneB_t(ChannelPower::OnAlways) |
 															ChannelPowerSpeakerA_t(ChannelPower::OffAlways)  |
 															ChannelPowerSpeakerB_t(ChannelPower::OffAlways)));
 	RF_CALL(writeRegister(Register::ClockingControl, ClockingControl::AUTO_DETECT));
@@ -45,8 +45,8 @@ CS43L22<I2cMaster, I2sMaster>::initialize()
 	RF_CALL(setMasterVolume(volume));
 	RF_CALL(writeRegister(Register::PowerControl1, Power_t(Power::Up)));
 	/* Additional configuration for the CODEC. These configurations are done to reduce
-	the time needed for the Codec to power off. If these configurations are removed, 
-	then a long delay should be added between powering off the Codec and switching 
+	the time needed for the Codec to power off. If these configurations are removed,
+	then a long delay should be added between powering off the Codec and switching
 	off the I2S peripheral MCLK clock (which is the operating clock for Codec).
 	If this delay is not inserted, then the codec will not shut down properly and
 	it results in high noise after shut down. */
@@ -63,7 +63,7 @@ CS43L22<I2cMaster, I2sMaster>::initialize()
 
 template<typename I2cMaster, typename I2sMaster>
 ResumableResult<bool>
-CS43L22<I2cMaster, I2sMaster>::writeRegister(Register reg, RegisterValue_t value)
+Cs43l22<I2cMaster, I2sMaster>::writeRegister(Register reg, RegisterValue_t value)
 {
 	RF_BEGIN();
 	tx_buffer[0] = static_cast<uint8_t>(reg);
@@ -74,7 +74,7 @@ CS43L22<I2cMaster, I2sMaster>::writeRegister(Register reg, RegisterValue_t value
 
 template<typename I2cMaster, typename I2sMaster>
 ResumableResult<bool>
-CS43L22<I2cMaster, I2sMaster>::readRegister(Register reg)
+Cs43l22<I2cMaster, I2sMaster>::readRegister(Register reg)
 {
 	RF_BEGIN();
 	rx_buffer = static_cast<uint8_t>(reg);
@@ -88,7 +88,7 @@ CS43L22<I2cMaster, I2sMaster>::readRegister(Register reg)
 
 template<typename I2cMaster, typename I2sMaster>
 ResumableResult<bool>
-CS43L22<I2cMaster, I2sMaster>::setMasterVolume(centiBel_t vol)
+Cs43l22<I2cMaster, I2sMaster>::setMasterVolume(centiBel_t vol)
 {
 	RF_BEGIN();
 	{
@@ -108,7 +108,7 @@ CS43L22<I2cMaster, I2sMaster>::setMasterVolume(centiBel_t vol)
 
 template<typename I2cMaster, typename I2sMaster>
 void
-CS43L22<I2cMaster, I2sMaster>::regToCentibel(uint8_t reg)
+Cs43l22<I2cMaster, I2sMaster>::regToCentibel(uint8_t reg)
 {
 	volume = reg;
 	if (volume <= 24 and volume >= 0)
@@ -126,7 +126,7 @@ CS43L22<I2cMaster, I2sMaster>::regToCentibel(uint8_t reg)
 
 template<typename I2cMaster, typename I2sMaster>
 ResumableResult<bool>
-CS43L22<I2cMaster, I2sMaster>::setMasterVolumeRelative(centiBel_t rel_vol)
+Cs43l22<I2cMaster, I2sMaster>::setMasterVolumeRelative(centiBel_t rel_vol)
 {
 	RF_BEGIN();
 	if (RF_CALL(getMasterVolume()))
@@ -140,7 +140,7 @@ CS43L22<I2cMaster, I2sMaster>::setMasterVolumeRelative(centiBel_t rel_vol)
 
 template<typename I2cMaster, typename I2sMaster>
 ResumableResult<bool>
-CS43L22<I2cMaster, I2sMaster>::getMasterVolume()
+Cs43l22<I2cMaster, I2sMaster>::getMasterVolume()
 {
 	return readRegister(Register::MasterVolumeControlA);
 }