fixed examples

Author: TomSaw

examples/nucleo_f042k6/spi_dma/main.cpp

@@ -33,7 +33,7 @@ int main()
 		uint8_t receiveBuffer[13];
 
 		// send out 12 bytes, don't care about response
-		Spi::transferBlocking(sendBuffer, nullptr, 12);
+		Spi::transferBlocking(sendBuffer, (uint8_t*)(nullptr), 12);
 
 		// send out 12 bytes, read in 12 bytes
 		Spi::transferBlocking(sendBuffer, receiveBuffer, 12);

examples/nucleo_f303re/spi_dma/main.cpp

@@ -33,7 +33,7 @@ int main()
 		uint8_t receiveBuffer[13];
 
 		// send out 12 bytes, don't care about response
-		Spi::transferBlocking(sendBuffer, nullptr, 12);
+		Spi::transferBlocking(sendBuffer, (uint8_t*)(nullptr), 12);
 
 		// send out 12 bytes, read in 12 bytes
 		Spi::transferBlocking(sendBuffer, receiveBuffer, 12);

examples/nucleo_l432kc/spi_dma/main.cpp

@@ -34,7 +34,7 @@ int main()
 		uint8_t receiveBuffer[13];
 
 		// send out 12 bytes, don't care about response
-		Spi::transferBlocking(sendBuffer, nullptr, 12);
+		Spi::transferBlocking(sendBuffer, (uint8_t*)(nullptr), 12);
 
 		// send out 12 bytes, read in 12 bytes
 		Spi::transferBlocking(sendBuffer, receiveBuffer, 12);

examples/nucleo_l452re/graphics_touch/main.cpp

@@ -51,7 +51,7 @@ namespace touch
 	//using Interrupt = modm::platform::GpioA10;
 }
 
-modm::Touch2046<touch::Spi, touch::Cs> touchController;
+modm::Touch2046<touch::Spi, touch::Cs, 320, 240> touchController;
 
 
 int
@@ -75,12 +75,10 @@ main()
 		touch::Mosi::Mosi>();
 	touch::Spi::initialize<SystemClock, 2500_kHz>();
 	modm::touch2046::Calibration cal{
-		.OffsetX = -11,
-		.OffsetY = 335,
 		.FactorX = 22018,
+		.OffsetX = -11,
 		.FactorY = -29358,
-		.MaxX = 240,
-		.MaxY = 320,
+		.OffsetY = 335,
 		.ThresholdZ = 500,
 	};
 	touchController.setCalibration(cal);
@@ -107,22 +105,22 @@ main()
 
 	int16_t X = 0;
 	int16_t Y = 0;
-	int16_t Z = 0;
+	// int16_t Z = 0;
 
 	while (true)
 	{
 		LedGreen::set();
 
-		std::tie(X, Y, Z) = RF_CALL_BLOCKING(touchController.getRawValues());
+		std::tie(X, Y) = RF_CALL_BLOCKING(touchController.getTouchPosition());
 		tftController.setColor(Red);
 		tftController.fillRectangle({30, 50}, 90, 115);
 		tftController.setColor(Black);
 		tftController.setCursor(0, 50);
 		tftController << "X=" << X;
 		tftController.setCursor(0, 90);
 		tftController << "Y=" << Y;
-		tftController.setCursor(0, 130);
-		tftController << "Z=" << Z;
+		// tftController.setCursor(0, 130);
+		// tftController << "Z=" << Z;
 
 		tftController.setColor(Red);
 		tftController.fillRectangle({30, 220}, 120, 35);

examples/nucleo_l452re/lvgl/main.cpp

@@ -59,7 +59,7 @@ namespace touch
 	//using Interrupt = modm::platform::GpioA10;
 }
 
-modm::Touch2046<touch::Spi, touch::Cs> touchController;
+modm::Touch2046<touch::Spi, touch::Cs, 320, 240> touchController;
 
 
 static lv_disp_draw_buf_t disp_buf;

src/modm/driver/radio/sx1276_impl.hpp

@@ -173,8 +173,8 @@ Sx1276<SpiMaster, Cs>::transmit(uint8_t* data, uint8_t length)
 
 		Cs::reset();
 
-		RF_CALL(SpiMaster::transfer(buffer,nullptr,1));
-		RF_CALL(SpiMaster::transfer(data,nullptr,length));
+		RF_CALL(SpiMaster::transfer(buffer, (uint8_t*)(nullptr), 1));
+		RF_CALL(SpiMaster::transfer(data, (uint8_t*)(nullptr), length));
 
 		if(this->releaseMaster())
 		{
@@ -251,16 +251,16 @@ Sx1276<SpiMaster, Cs>::readPacket(uint8_t* data, uint8_t maxLength)
 
 			Cs::reset();
 
-			RF_CALL(SpiMaster::transfer(buffer,nullptr,1));
+			RF_CALL(SpiMaster::transfer(buffer, (uint8_t*)(nullptr), 1));
 			if(lastPacketSize > maxLength)
 			{
 				MODM_LOG_ERROR<<"SX1276: Read buffer is too small, packet discarded!"<<modm::endl;
 				//read it out anyway to clean the fifo
-				RF_CALL(SpiMaster::transfer(nullptr,nullptr,lastPacketSize));
+				RF_CALL(SpiMaster::transfer((uint8_t*)(nullptr),(uint8_t*)(nullptr),lastPacketSize));
 			}
 			else
 			{
-				RF_CALL(SpiMaster::transfer(nullptr,data,lastPacketSize));
+				RF_CALL(SpiMaster::transfer((uint8_t*)(nullptr), data, lastPacketSize));
 			}
 
 			if(this->releaseMaster())