ElixirForge/firmware
1
0
Fork 0
mirror of https://github.com/alexhopeoconnor/firmware.git synced 2026-10-19 01:41:30 +10:00
Code Releases Activity

Merge remote-tracking branch 'origin/develop' into pr10715-fix

Browse Source 
# Conflicts:
#	src/graphics/Screen.cpp
#	src/modules/Telemetry/Sensor/PMSA003ISensor.h
#	src/modules/Telemetry/Sensor/SCD30Sensor.h
#	src/modules/Telemetry/Sensor/SCD4XSensor.h
#	src/modules/Telemetry/Sensor/SEN5XSensor.cpp
#	src/modules/Telemetry/Sensor/SEN5XSensor.h
#	src/modules/Telemetry/Sensor/SFA30Sensor.h
This commit is contained in:
Thomas Göttgens
2026-07-03 11:12:16 +02:00
parent f604a4e172 397ff8523a
commit e1982cc2b1
535 changed files with 20722 additions and 20884 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/modules/Telemetry/Sensor/PMSA003ISensor.h
+1 -1
View File
@@ -39,4 +39,4 @@ class PMSA003ISensor : public TelemetrySensor
#endif
};
#endif
#endif