Skip to content

Add forecast and fix pressure encoding #21

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
arcadien wants to merge 4 commits into
base: master
Choose a base branch
from
+32 −12
Open

Add forecast and fix pressure encoding #21

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
a8f8789
add destructor for missing delete() after new()
arcadien Oct 14, 2022
fae6489
Add forecast
arcadien Oct 14, 2022
c7589e8
Fix pressure encoding
arcadien Oct 15, 2022
a2f5cd0
chore: restore original format
arcadien Oct 15, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
43 changes: 31 additions & 12 deletions Oregon_TM.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,10 @@ Oregon_TM::Oregon_TM(byte tr_pin, int buf_size)
TX_PIN = tr_pin;
pinMode(TX_PIN, OUTPUT);
digitalWrite(TX_PIN, LOW);

}
Oregon_TM::~Oregon_TM()
{
delete SendBuffer;
}

Oregon_TM::Oregon_TM(byte tr_pin)
Expand Down Expand Up @@ -704,37 +707,53 @@ void Oregon_TM::setStartCount(byte startcount)
if (startcount == 1) SendBuffer[3] |= 0x01;
}


///////////////////////////////////////////////////////////////////////////////////////////////////

void Oregon_TM::setPressure(float mm_hg_pressure)
{
byte pressure;

//Ограничения датчика по даташиту
word pressure = (word)(mm_hg_pressure / 0.75);
if (mm_hg_pressure < 450) pressure = 600;
if (mm_hg_pressure > 790) pressure = 1054;
// if (mm_hg_pressure < 450) pressure = 600;
// if (mm_hg_pressure > 790) pressure = 1054;

if (sens_type == BTHR968)
{
pressure -= 600;
pressure = (byte)(mm_hg_pressure-856);
SendBuffer[7] &= 0xF0;
SendBuffer[7] += pressure & 0x0F;
SendBuffer[8] = (pressure & 0x0F0) + ((pressure & 0xF00) >> 8);
//прогноз - переменно
SendBuffer[9] &= 0x0F;
SendBuffer[9] += 0x60;
}

if (sens_type == BTHGN129)
{
pressure -= 545;
pressure = (byte)(mm_hg_pressure-795);
SendBuffer[7] &= 0xF0;
SendBuffer[7] += pressure & 0x0F;
SendBuffer[8] = (pressure & 0x0F0) + ((pressure & 0xF00) >> 8);
SendBuffer[9] &= 0x0F;
SendBuffer[9] += 0x60;
}

// prediction on nibble 18
if (mm_hg_pressure < 1000)
{
// rainy
SendBuffer[9] = 0x30;
}
else if (mm_hg_pressure < 1010)
{
// cloudy
SendBuffer[9] = 0x20;
}
else if (mm_hg_pressure < 1025)
{
// partly cloudy
SendBuffer[9] = 0x60;
}
else
{
// Sunny
SendBuffer[9] = 0xC0;
}
}
///////////////////////////////////////////////////////////////////////////////////////////////////
void Oregon_TM::setTemperature(float temp)
Expand Down
1 change: 1 addition & 0 deletions Oregon_TM.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,7 @@ class Oregon_TM
Oregon_TM(byte, int);
Oregon_TM(byte);
Oregon_TM();
~Oregon_TM();
void setType(word);
void setChannel( byte);
void setId(byte);
Expand Down