Skip to content
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

Added kWh to contrib/oregon_scientific.c, fix rounding and minor tweaks in src/rtl_433/pulse_demod.c #65

Merged
merged 19 commits into from
Mar 18, 2023
Merged

Added kWh to contrib/oregon_scientific.c, fix rounding and minor tweaks in src/rtl_433/pulse_demod.c #65

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
2793e7e
My devices
diepeterpan Mar 4, 2023
d241628
My devices tuning and CM160 carry total KWH
diepeterpan Mar 6, 2023
020deab
Fine tune CM160
diepeterpan Mar 8, 2023
a0490ba
Rework kWh reading calc
diepeterpan Mar 10, 2023
3fcd149
Update labels for Raw values
diepeterpan Mar 12, 2023
6e5c768
Align code with PC version
diepeterpan Mar 12, 2023
fc43550
Align code with PC version
diepeterpan Mar 12, 2023
aafd173
Align with PC code
diepeterpan Mar 12, 2023
4af8dd2
Merge branch 'NorthernMan54:master' into master
diepeterpan Mar 14, 2023
1f9574e
kWh reading is of by 12%
diepeterpan Mar 17, 2023
b30be6c
Reduce the number of changes files on this request
diepeterpan Mar 17, 2023
3f6cde2
Perky new line
diepeterpan Mar 17, 2023
20694a5
Test NL
diepeterpan Mar 17, 2023
1f2ece6
Pesky new line
diepeterpan Mar 17, 2023
586c5e9
Fixing rounding problem where LCD will show 435 and out calculated va…
diepeterpan Mar 17, 2023
694d142
Copy of file must go to contrib and comment out raw values
diepeterpan Mar 17, 2023
3fb31ec
Round went missing
diepeterpan Mar 17, 2023
8220b66
We don't round the watts, the consumer can for display purposed.
diepeterpan Mar 17, 2023
bfc49c6
And a cpy in the contrib folder
diepeterpan Mar 17, 2023
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
32 changes: 26 additions & 6 deletions contrib/oregon_scientific.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -140,6 +140,11 @@ static unsigned long long cm180i_total(uint8_t const *msg)
return val;
}

static uint8_t swap_nibbles(unsigned char byte)
{
return (((byte&0xf) << 4) | (byte >> 4));
}

static unsigned short int cm180_power(uint8_t const *msg)
{
unsigned short int val = 0;
Expand Down Expand Up @@ -748,16 +753,31 @@ static int oregon_scientific_v3_decode(r_device *decoder, bitbuffer_t *bitbuffer
return 1;
}
else if ((msg[0] == 0x20) || (msg[0] == 0x21) || (msg[0] == 0x22) || (msg[0] == 0x23) || (msg[0] == 0x24)) { // Owl CM160 Readings
msg[0] = msg[0] & 0x0f;

msg[0] = msg[0] & 0x0F;

if (validate_os_checksum(decoder, msg, 22) != 0)
return DECODE_FAIL_MIC;
float rawAmp = (msg[4] >> 4 << 8 | (msg[3] & 0x0f )<< 4 | msg[3] >> 4);
unsigned short int ipower = (rawAmp /(0.27*230)*1000);

int id = msg[1] & 0x0F;
unsigned int current_amps = swap_nibbles(msg[3]) | ((msg[4] >> 4) << 8);
double current_watts = current_amps * 0.07 * 230; // Assuming device is running in 230V country

double total_amps = ((uint64_t)swap_nibbles(msg[10]) << 36) | ((uint64_t)swap_nibbles(msg[9]) << 28) |
(swap_nibbles(msg[8]) << 20) | (swap_nibbles(msg[7]) << 12) |
(swap_nibbles(msg[6]) << 4) | (msg[5]&0xf);

double total_kWh = total_amps * 230.0 / 3600.0 / 1000.0 * 1.12; // Assuming device is running in 230V country
//result compares to the CM160 LCD display values when * 1.12 between readings

/* clang-format off */
data = data_make(
"model", "", DATA_STRING, "Oregon-CM160",
"id", "House Code", DATA_INT, msg[1]&0x0F,
"power_W", "Power", DATA_FORMAT, "%d W", DATA_INT, ipower,
"model", "", DATA_STRING, "Oregon-CM160",
"id", "House Code", DATA_INT, id,
// "current_A", "Current Amps", DATA_FORMAT, "%d A", DATA_INT, current_amps,
// "total_As", "Total Amps", DATA_FORMAT, "%d As", DATA_INT, (int)total_amps,
"power_W", "Power", DATA_FORMAT, "%7.4f W", DATA_DOUBLE, current_watts,
"energy_kWh", "Energy", DATA_FORMAT, "%7.4f kWh",DATA_DOUBLE, total_kWh,
NULL);
/* clang-format on */
decoder_output_data(decoder, data);
Expand Down
32 changes: 26 additions & 6 deletions src/rtl_433/devices/oregon_scientific.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -140,6 +140,11 @@ static unsigned long long cm180i_total(uint8_t const *msg)
return val;
}

static uint8_t swap_nibbles(unsigned char byte)
{
return (((byte&0xf) << 4) | (byte >> 4));
}

static unsigned short int cm180_power(uint8_t const *msg)
{
unsigned short int val = 0;
Expand Down Expand Up @@ -748,16 +753,31 @@ static int oregon_scientific_v3_decode(r_device *decoder, bitbuffer_t *bitbuffer
return 1;
}
else if ((msg[0] == 0x20) || (msg[0] == 0x21) || (msg[0] == 0x22) || (msg[0] == 0x23) || (msg[0] == 0x24)) { // Owl CM160 Readings
msg[0] = msg[0] & 0x0f;

msg[0] = msg[0] & 0x0F;

if (validate_os_checksum(decoder, msg, 22) != 0)
return DECODE_FAIL_MIC;
float rawAmp = (msg[4] >> 4 << 8 | (msg[3] & 0x0f )<< 4 | msg[3] >> 4);
unsigned short int ipower = (rawAmp /(0.27*230)*1000);

int id = msg[1] & 0x0F;
unsigned int current_amps = swap_nibbles(msg[3]) | ((msg[4] >> 4) << 8);
double current_watts = current_amps * 0.07 * 230; // Assuming device is running in 230V country

double total_amps = ((uint64_t)swap_nibbles(msg[10]) << 36) | ((uint64_t)swap_nibbles(msg[9]) << 28) |
(swap_nibbles(msg[8]) << 20) | (swap_nibbles(msg[7]) << 12) |
(swap_nibbles(msg[6]) << 4) | (msg[5]&0xf);

double total_kWh = total_amps * 230.0 / 3600.0 / 1000.0 * 1.12; // Assuming device is running in 230V country
//result compares to the CM160 LCD display values when * 1.12 between readings

/* clang-format off */
data = data_make(
"model", "", DATA_STRING, "Oregon-CM160",
"id", "House Code", DATA_INT, msg[1]&0x0F,
"power_W", "Power", DATA_FORMAT, "%d W", DATA_INT, ipower,
"model", "", DATA_STRING, "Oregon-CM160",
"id", "House Code", DATA_INT, id,
// "current_A", "Current Amps", DATA_FORMAT, "%d A", DATA_INT, current_amps,
// "total_As", "Total Amps", DATA_FORMAT, "%d As", DATA_INT, (int)total_amps,
"power_W", "Power", DATA_FORMAT, "%7.4f W", DATA_DOUBLE, current_watts,
"energy_kWh", "Energy", DATA_FORMAT, "%7.4f kWh",DATA_DOUBLE, total_kWh,
NULL);
/* clang-format on */
decoder_output_data(decoder, data);
Expand Down
7 changes: 3 additions & 4 deletions src/rtl_433/pulse_demod.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -310,9 +310,8 @@ int pulse_demod_pwm(const pulse_data_t *pulses, r_device *device) {
int s_sync = device->sync_width * samples_per_us;
int s_tolerance = device->tolerance * samples_per_us;

// if (s_tolerance <= 0)
// s_tolerance = s_long / 2.2; // default tolerance is +-45% of a bit
// period
if (s_tolerance <= 0)
s_tolerance = s_long / 4; // default tolerance is +-25% of a bit period

// check for rounding to zero
if ((device->short_width > 0 && s_short <= 0) ||
Expand Down Expand Up @@ -426,7 +425,7 @@ int pulse_demod_manchester_zerobit(const pulse_data_t *pulses,
int s_tolerance = device->tolerance * samples_per_us;

if (s_tolerance <= 0)
s_tolerance = s_long / 4; // default tolerance is +-45% of a bit period
s_tolerance = s_long / 4; // default tolerance is +-25% of a bit period

// check for rounding to zero
if ((device->short_width > 0 && s_short <= 0) ||
Expand Down