diff --git a/fw/Core/Inc/main.h b/fw/Core/Inc/main.h
index 20ac803..24e6d7f 100644
--- a/fw/Core/Inc/main.h
+++ b/fw/Core/Inc/main.h
@@ -53,10 +53,11 @@ extern "C" {
 #include "scd4x.h"
 #include "sht4x.h"
 #include "sps30.h"
-#include <sgp40.h>
+#include "sgp40.h"
 #include "modbus.h"
 #include "config.h"
 #include "rgbled.h"
+#include "crc8.h"
 #include "sensirion_gas_index_algorithm.h"
 /* USER CODE END Includes */
 
diff --git a/fw/Core/Src/main.c b/fw/Core/Src/main.c
index 13b41ee..e41e0d4 100644
--- a/fw/Core/Src/main.c
+++ b/fw/Core/Src/main.c
@@ -175,67 +175,87 @@ void CO2_to_color(uint16_t co2, uint16_t co2_limit_yellow, uint16_t co2_limit_re
 
 int8_t sht4x_i2c_transmit(uint8_t address, uint8_t *buffer, int len)
 {
-	i2c_transmit(address, buffer, len);
+	return i2c_transmit(address, buffer, len);
 }
 
 int8_t sht4x_i2c_receive(uint8_t address, uint8_t *buffer, int len)
 {
-	i2c_receive(address, buffer, len);
+	return i2c_receive(address, buffer, len);
 }
 
 uint8_t sensirion_crc8_calculate(const uint8_t *data, uint16_t count)
 {
-	crc8_calculate(data, count);
+	return crc8_calculate(data, count);
 }
 
 int8_t sht4x_disable_interrupts(void)
 {
-	uart_disable_interrupts();
+	return uart_disable_interrupts();
 }
 
 int8_t sht4x_enable_interrupts(void)
 {
-	uart_enable_interrupts();
+	return uart_enable_interrupts();
 }
 
 int8_t sgp40_i2c_transmit(uint8_t address, uint8_t *buffer, int len)
 {
-	i2c_transmit(address, buffer, len);
+	return i2c_transmit(address, buffer, len);
 }
 
 int8_t sgp40_i2c_receive(uint8_t address, uint8_t *buffer, int len)
 {
-	i2c_receive(address, buffer, len);
+	return i2c_receive(address, buffer, len);
 }
 
 int8_t sgp40_disable_interrupts(void)
 {
-	uart_disable_interrupts();
+	return uart_disable_interrupts();
 }
 
 int8_t sgp40_enable_interrupts(void)
 {
-	uart_enable_interrupts();
+	return uart_enable_interrupts();
 }
 
 int8_t scd4x_i2c_transmit(uint8_t address, uint8_t *buffer, int len)
 {
-	i2c_transmit(address, buffer, len);
+	return i2c_transmit(address, buffer, len);
 }
 
 int8_t scd4x_i2c_receive(uint8_t address, uint8_t *buffer, int len)
 {
-	i2c_receive(address, buffer, len);
+	return i2c_receive(address, buffer, len);
 }
 
 int8_t scd4x_disable_interrupts(void)
 {
-	uart_disable_interrupts();
+	return uart_disable_interrupts();
 }
 
 int8_t scd4x_enable_interrupts(void)
 {
-	uart_enable_interrupts();
+	return uart_enable_interrupts();
+}
+
+int8_t sps30_i2c_transmit(uint8_t address, uint8_t *buffer, int len)
+{
+	return i2c_transmit(address, buffer, len);
+}
+
+int8_t sps30_i2c_receive(uint8_t address, uint8_t *buffer, int len)
+{
+	return i2c_receive(address, buffer, len);
+}
+
+int8_t sps30_disable_interrupts(void)
+{
+	return uart_disable_interrupts();
+}
+
+int8_t sps30_enable_interrupts(void)
+{
+	return uart_enable_interrupts();
 }
 
 void delay_ms(int delay_ms)