[driver] Small fixes for replacing Protothreads with Fibers

Author: salkinium

src/modm/driver/adc/ads101x.lb

@@ -21,8 +21,7 @@ The ADS1013/ADS1014/ADS1015 are ultra-low power, high precision analog-digital c
 def prepare(module, options):
     module.depends(
         ":architecture:i2c.device",
-        ":architecture:register",
-        ":processing:protothread")
+        ":architecture:register")
     return True
 
 def build(env):

src/modm/driver/adc/ads7828_impl.hpp

@@ -21,7 +21,7 @@ namespace modm
 {
 
 template <typename I2cMaster>
-Ads7828<I2cMaster>::Ads7828(Data &data, uint8_t address) : data(data), modm::I2cDevice<I2cMaster, 1>(address)
+Ads7828<I2cMaster>::Ads7828(Data &data, uint8_t address) : modm::I2cDevice<I2cMaster, 1>(address), data(data)
 {
 }
 
@@ -60,4 +60,4 @@ Ads7828<I2cMaster>::readConversionResult()
     RF_END_RETURN_CALL(this->runTransaction());
 }
 
-} // modm namespace
+} // modm namespace

src/modm/driver/display/hd44780.hpp

@@ -77,7 +77,7 @@ class Hd44780 : public CharacterDisplay
 	 * cg must be uint8_t[8].
 	 */
 	void
-	writeCGRAM(uint8_t character, uint8_t *cg);
+	writeCGRAM(uint8_t character, const uint8_t *cg);
 
 };
 

src/modm/driver/display/hd44780_base.hpp

@@ -126,7 +126,7 @@ class Hd44780Base
 	isBusy();
 
 	static inline bool
-	writeCGRAM(uint8_t character, uint8_t *cg);
+	writeCGRAM(uint8_t character, const uint8_t *cg);
 
 protected:
 	/// unconditionally write data to the controller

src/modm/driver/display/hd44780_base_impl.hpp

@@ -172,7 +172,7 @@ modm::Hd44780Base<DATA, RW, RS, E>::isBusy()
 
 template <typename DATA, typename RW, typename RS, typename E>
 bool
-modm::Hd44780Base<DATA, RW, RS, E>::writeCGRAM(uint8_t character, uint8_t *cg)
+modm::Hd44780Base<DATA, RW, RS, E>::writeCGRAM(uint8_t character, const uint8_t *cg)
 {
 	while(not writeCommand(SetCGRAM_Address | (character << 3)))
 		;

src/modm/driver/display/hd44780_impl.hpp

@@ -64,7 +64,7 @@ modm::Hd44780<DATA, RW, RS, E>::execute(Command command)
 
 template <typename DATA, typename RW, typename RS, typename E>
 void
-modm::Hd44780<DATA, RW, RS, E>::writeCGRAM(uint8_t character, uint8_t *cg)
+modm::Hd44780<DATA, RW, RS, E>::writeCGRAM(uint8_t character, const uint8_t *cg)
 {
 	// There are only 8 characters in CGRAM
 	if (character > 8) {

src/modm/driver/encoder/as5047.hpp

@@ -18,7 +18,6 @@
 #include <modm/architecture/interface/register.hpp>
 #include <modm/architecture/interface/spi_device.hpp>
 #include <modm/processing/resumable.hpp>
-#include <modm/processing/timer.hpp>
 #include <modm/math/geometry/angle_int.hpp>
 
 namespace modm
@@ -121,4 +120,4 @@ class As5047 : public as5047, public modm::SpiDevice<SpiMaster>, protected modm:
 
 }  // namespace modm
 
-#include "as5047_impl.hpp"
+#include "as5047_impl.hpp"

src/modm/driver/encoder/as5047.lb

@@ -11,21 +11,21 @@
 # -----------------------------------------------------------------------------
 
 def init(module):
-	module.name = ":driver:as5047"
-	module.description = """\
+    module.name = ":driver:as5047"
+    module.description = """\
 # AS5047 14 bit Absolute Encoder SPI Driver
 
 [Datasheet](https://ams.com/documents/20143/36005/AS5047D_DS000394_2-00.pdf)
 """
 
 def prepare(module, options):
-	module.depends(
-		":architecture:gpio",
-		":architecture:spi.device",
-		":processing:resumable",
-		":math:geometry"
+    module.depends(
+        ":architecture:gpio",
+        ":architecture:spi.device",
+        ":processing:resumable",
+        ":math:geometry"
     )
-	return True
+    return True
 
 def build(env):
     env.outbasepath = "modm/src/modm/driver/encoder"

src/modm/driver/inertial/bmi088.lb

@@ -25,8 +25,8 @@ def prepare(module, options):
         ":architecture:register",
         ":architecture:spi.device",
         ":architecture:i2c.device",
+        ":architecture:fiber",
         ":math:geometry",
-        ":processing:fiber",
         ":processing:timer")
     return True
 

src/modm/driver/inertial/bmi088_transport_impl.hpp

@@ -13,7 +13,7 @@
 #error "Don't include this file directly, use 'bmi088_transport.hpp' instead!"
 #endif
 
-#include <modm/processing/fiber.hpp>
+#include <modm/architecture/interface/fiber.hpp>
 
 namespace modm
 {

src/modm/driver/inertial/hmc6343.hpp

@@ -13,7 +13,6 @@
 #define MODM_HMC6343_HPP
 
 #include <modm/architecture/interface/i2c_device.hpp>
-#include <modm/processing/protothread.hpp>
 
 namespace modm
 {

src/modm/driver/inertial/hmc6343.lb

@@ -28,8 +28,7 @@ def prepare(module, options):
     module.depends(
         ":architecture:i2c.device",
         ":architecture:register",
-        ":math:utils",
-        ":processing:protothread")
+        ":math:utils")
     return True
 
 def build(env):

src/modm/driver/position/vl6180.lb

@@ -22,9 +22,7 @@ def prepare(module, options):
         ":architecture:register",
         ":architecture:unaligned",
         ":math:utils",
-        ":debug",
-        ":processing:protothread",
-        ":processing:timer",)
+        ":processing:timer")
     return True
 
 def build(env):

src/modm/driver/pressure/bme280.hpp

@@ -13,11 +13,8 @@
 #ifndef MODM_BME280_HPP
 #define MODM_BME280_HPP
 
-#include <modm/processing/protothread.hpp>
-#include <modm/processing/resumable.hpp>
 #include <modm/architecture/interface/i2c_device.hpp>
 #include <modm/architecture/interface/register.hpp>
-#include <modm/processing/timer.hpp>
 
 #include "bme280_data.hpp"
 

src/modm/driver/pressure/bme280.lb

@@ -29,9 +29,7 @@ def prepare(module, options):
         ":architecture:i2c.device",
         ":architecture:register",
         ":math:utils",
-        ":debug",
-        ":processing:protothread",
-        ":processing:timer")
+        ":debug")
     return True
 
 def build(env):

src/modm/driver/pressure/bmp085.hpp

@@ -13,8 +13,6 @@
 #ifndef MODM_BMP085_HPP
 #define MODM_BMP085_HPP
 
-#include <modm/processing/protothread.hpp>
-#include <modm/processing/resumable.hpp>
 #include <modm/architecture/interface/i2c_device.hpp>
 #include <modm/processing/timer.hpp>
 

src/modm/driver/pressure/bmp085.lb

@@ -33,7 +33,6 @@ def prepare(module, options):
         ":architecture:i2c.device",
         ":math:utils",
         ":debug",
-        ":processing:protothread",
         ":processing:timer")
     return True
 

src/modm/driver/rtc/mcp7941x.hpp

@@ -18,7 +18,7 @@
 
 #include <modm/architecture/interface/register.hpp>
 #include <modm/architecture/interface/i2c_device.hpp>
-#include <modm/processing/protothread.hpp>
+#include <modm/processing/resumable.hpp>
 
 namespace modm
 {

src/modm/driver/temperature/ds1631.hpp

@@ -116,9 +116,8 @@ class Ds1631 :	public ds1631, public I2cDevice< I2cMaster, 2 >,
 	///
 	Ds1631(Data &data, uint8_t address=0x90);
 
-	void
-	update()
-	{ run(); }
+	bool
+	update();
 
 	modm::ResumableResult<bool>
 	initialize();
@@ -170,9 +169,6 @@ class Ds1631 :	public ds1631, public I2cDevice< I2cMaster, 2 >,
 	{ return data; }
 
 private:
-	bool
-	run();
-
 	modm::ResumableResult<bool>
 	writeCommand(Command cmd);
 

src/modm/driver/temperature/ds1631_impl.hpp

@@ -41,7 +41,7 @@ modm::Ds1631<I2cMaster>::initialize()
 
 template < typename I2cMaster >
 bool
-modm::Ds1631<I2cMaster>::run()
+modm::Ds1631<I2cMaster>::update()
 {
 	PT_BEGIN();
 

src/modm/driver/temperature/tmp102.hpp

@@ -118,9 +118,8 @@ class Tmp102 :	public tmp102, public Lm75< I2cMaster >,
 	/// sets address to default of 0x48 (alternatives are 0x49, 0x4A and 0x4B).
 	Tmp102(Data &data, uint8_t address=0x48);
 
-	void
-	update()
-	{ run(); }
+	bool
+	update();
 
 	// MARK: Configuration
 	// @param	rate	Update rate in Hz: 0 to 33. (Use 0 to update at 0.25Hz).
@@ -153,9 +152,6 @@ class Tmp102 :	public tmp102, public Lm75< I2cMaster >,
 	getData();
 
 private:
-	bool
-	run();
-
 	modm::ResumableResult<bool>
 	writeConfiguration(uint8_t length=3);
 

src/modm/driver/temperature/tmp102.lb

@@ -36,7 +36,8 @@ def prepare(module, options):
         ":architecture:register",
         ":driver:lm75",
         ":math:utils",
-        ":processing:protothread")
+        ":processing:protothread",
+        ":processing:timer")
     return True
 
 def build(env):

src/modm/driver/temperature/tmp102_impl.hpp

@@ -22,12 +22,11 @@ modm::Tmp102<I2cMaster>::Tmp102(Data &data, uint8_t address)
 	updateTime(250), timeout(modm::ShortDuration(updateTime)),
 	config_lsb(ConversionRate_t(ConversionRate::Hz4))
 {
-	this->stop();
 }
 
 template < typename I2cMaster >
 bool
-modm::Tmp102<I2cMaster>::run()
+modm::Tmp102<I2cMaster>::update()
 {
 	PT_BEGIN();
 

src/modm/driver/temperature/tmp12x.hpp

@@ -13,7 +13,7 @@
 #define MODM_TMP12x_HPP
 
 #include <modm/architecture/interface/spi_device.hpp>
-#include <modm/processing/resumable/nested_resumable.hpp>
+#include <modm/processing/resumable.hpp>
 #include <array>
 #include <ratio>
 

src/modm/driver/temperature/tmp175.hpp

@@ -74,9 +74,8 @@ class Tmp175 :	public tmp175, public Lm75< I2cMaster >,
 	/// sets address to default of 0x48 (alternatives are 0x49, 0x4A and 0x4B).
 	Tmp175(Data &data, uint8_t address=0x48);
 
-	void
-	update()
-	{ run(); }
+	bool
+	update();
 
 	// @param	rate	Update rate in Hz: 1 to 33.
 	void
@@ -103,9 +102,6 @@ class Tmp175 :	public tmp175, public Lm75< I2cMaster >,
 	getData();
 
 private:
-	bool
-	run();
-
 	modm::ResumableResult<bool>
 	writeConfiguration();
 

src/modm/driver/temperature/tmp175_impl.hpp

@@ -27,7 +27,7 @@ modm::Tmp175<I2cMaster>::Tmp175(Data &data, uint8_t address)
 
 template < typename I2cMaster >
 bool
-modm::Tmp175<I2cMaster>::run()
+modm::Tmp175<I2cMaster>::update()
 {
 	PT_BEGIN();