search

kike-canaries / canairio_firmware

CanAirIO is a citizen science initiative. We are developing a mobile application that is able to set a PM2.5 or CO2 sensors, and other related sensors, as a fixed station using WiFi or mobile station with an smartphone by using a Bluetooth connection.
https://canair.io
GNU General Public License v3.0
106 stars 23 forks source link

Av/master merge #195

Closed hpsaturn closed 2 years ago

hpsaturn commented 2 years ago

Overview

Warnning

Please before merge save these files. This PR will delete this files. We need maybe doing the merge manually with the new battery library.

CONFLICT (modify/delete): lib/gui-utils-oled/src/battery.hpp deleted in 56484963b373e5fe6572cb573fe9f8e6a28f5e62 and modified in HEAD. Version HEAD of lib/gui-utils-oled/src/battery.hpp left in tree.
CONFLICT (modify/delete): lib/gui-utils-oled/src/battery.cpp deleted in 56484963b373e5fe6572cb573fe9f8e6a28f5e62 and modified in HEAD. Version HEAD of lib/gui-utils-oled/src/battery.cpp left in tree.