airgradienthq/arduino
1
0
Fork 1
mirror of https://github.com/airgradienthq/arduino.git synced 2025-07-04 19:56:31 +02:00
Code Issues Packages Projects Releases Wiki Activity

Add files via upload

Browse Source
This commit is contained in:
airgradienthq
2020-07-25 11:19:00 +07:00
committed by GitHub
parent cc218880a4
commit bc23262645
2 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
AirGradient/AirGradient.cpp
View File

@ -11,6 +11,7 @@
#include <SoftwareSerial.h> #include <SoftwareSerial.h>
#include "Arduino.h" #include "Arduino.h"
#include <Wire.h> #include <Wire.h>
#include <Math.h>
// Constructor ///////////////////////////////////////////////////////////////// // Constructor /////////////////////////////////////////////////////////////////
@ -55,7 +56,7 @@ void AirGradient::PMS_Init(){
if (_debugMsg) { if (_debugMsg) {
Serial.println("Initializing PMS..."); Serial.println("Initializing PMS...");
} }
PMS_Init(5,6); PMS_Init(D5,D6);
} }
void AirGradient::PMS_Init(int rx_pin,int tx_pin){ void AirGradient::PMS_Init(int rx_pin,int tx_pin){
PMS_Init(rx_pin,tx_pin,9600); PMS_Init(rx_pin,tx_pin,9600);
@ -499,7 +500,8 @@ uint8_t AirGradient::checkCrc(uint8_t data[], uint8_t checksum)//
float AirGradient::calculateTemperature(uint16_t rawValue)// float AirGradient::calculateTemperature(uint16_t rawValue)//
{ {
return 175.0f * (float)rawValue / 65535.0f - 45.0f; float value = 175.0f * (float)rawValue / 65535.0f - 45.0f;
return round(value*10)/10;
} }
@ -541,7 +543,7 @@ TMP_RH AirGradient::returnError(TMP_RH_ErrorCode error) {
//START C02 FUNCTIONS // //START C02 FUNCTIONS //
void AirGradient::C02_Init(){ void AirGradient::C02_Init(){
C02_Init(4,3); C02_Init(D4,D3);
} }
void AirGradient::C02_Init(int rx_pin,int tx_pin){ void AirGradient::C02_Init(int rx_pin,int tx_pin){
C02_Init(rx_pin,tx_pin,9600); C02_Init(rx_pin,tx_pin,9600);
@ -566,7 +568,7 @@ void AirGradient::C02_Init(int rx_pin,int tx_pin,int baudRate){
} }
int AirGradient::getC02(int retryLimit) { int AirGradient::getC02(int retryLimit) {
int ctr = 0; int ctr = 0;
int result_c02 = 0; int result_c02 = get_C02_values();
while(result_c02 == -1){ while(result_c02 == -1){
result_c02 = get_C02_values(); result_c02 = get_C02_values();
if(ctr == retryLimit){ if(ctr == retryLimit){
@ -814,7 +816,7 @@ int AirGradient::readInternal_MHZ19() {
byte AirGradient::getCheckSum_MHZ19(byte* packet) { uint8_t AirGradient::getCheckSum_MHZ19(unsigned char* packet) {
if (!SerialConfigured) { if (!SerialConfigured) {
if (debug_MHZ19) Serial.println(F("-- serial is not configured")); if (debug_MHZ19) Serial.println(F("-- serial is not configured"));
return STATUS_serial_MHZ19_NOT_CONFIGURED; return STATUS_serial_MHZ19_NOT_CONFIGURED;

4
AirGradient/AirGradient.h
View File

@ -286,11 +286,11 @@ class AirGradient
int readInternal_MHZ19(); int readInternal_MHZ19();
uint8_t _type_MHZ19, temperature_MHZ19; uint8_t _type_MHZ19, temperature_MHZ19;
boolean debug_MHZ19 = false; bool debug_MHZ19 = false;
Stream * _serial_MHZ19; Stream * _serial_MHZ19;
SoftwareSerial *_SoftSerial_MHZ19; SoftwareSerial *_SoftSerial_MHZ19;
byte getCheckSum_MHZ19(byte *packet); uint8_t getCheckSum_MHZ19(unsigned char *packet);
//MHZ19 VARABLES PUBLIC END //MHZ19 VARABLES PUBLIC END
}; };