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

Jump to bottom

rename silvercrest and nexus to mitigate codebase conflict with ESPiL… #157

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

rename silvercrest and nexus to mitigate codebase conflict with ESPiL… #157

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions include/rtl_433_devices.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -157,7 +157,7 @@
DECL(new_template) \
DECL(newkaku) \
DECL(nexa) \
DECL(nexus) \
DECL(RTLnexus) \
DECL(nice_flor_s) \
DECL(norgo) \
DECL(oil_smart) \
Expand Down Expand Up @@ -192,7 +192,7 @@
DECL(scmplus) \
DECL(secplus_v1) \
DECL(sharp_spc775) \
DECL(silvercrest) \
DECL(RTLsilvercrest) \
DECL(ss_sensor) \
DECL(simplisafe_gen3) \
DECL(skylink_motion) \
Expand Down
2 changes: 1 addition & 1 deletion src/rtl_433/devices/nexus.c → src/rtl_433/devices/RTLnexus.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,7 @@ static char const *const output_fields[] = {
NULL,
};

r_device const nexus = {
r_device const RTLnexus = {
.name = "Nexus, FreeTec NC-7345, NX-3980, Solight TE82S, TFA 30.3209 temperature/humidity sensor",
.modulation = OOK_PULSE_PPM,
.short_width = 1000,
Expand Down
2 changes: 1 addition & 1 deletion src/rtl_433/devices/silvercrest.c → src/rtl_433/devices/RTLsilvercrest.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ static char const *const output_fields[] = {
NULL,
};

r_device const silvercrest = {
r_device const RTLsilvercrest = {
.name = "Silvercrest Remote Control",
.modulation = OOK_PULSE_PWM,
.short_width = 264,
Expand Down
4 changes: 2 additions & 2 deletions src/signalDecoder.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -182,7 +182,7 @@ void rtlSetup() {
memcpy(&cfg->devices[93], &new_template, sizeof(r_device));
memcpy(&cfg->devices[94], &newkaku, sizeof(r_device));
memcpy(&cfg->devices[95], &nexa, sizeof(r_device));
memcpy(&cfg->devices[96], &nexus, sizeof(r_device));
memcpy(&cfg->devices[96], &RTLnexus, sizeof(r_device));
memcpy(&cfg->devices[97], &nice_flor_s, sizeof(r_device));
memcpy(&cfg->devices[98], &norgo, sizeof(r_device));
memcpy(&cfg->devices[99], &oil_standard_ask, sizeof(r_device));
Expand Down Expand Up @@ -211,7 +211,7 @@ void rtlSetup() {
memcpy(&cfg->devices[122], &schrader_SMD3MA4, sizeof(r_device));
memcpy(&cfg->devices[123], &scmplus, sizeof(r_device));
memcpy(&cfg->devices[124], &secplus_v1, sizeof(r_device));
memcpy(&cfg->devices[125], &silvercrest, sizeof(r_device));
memcpy(&cfg->devices[125], &RTLsilvercrest, sizeof(r_device));
memcpy(&cfg->devices[126], &ss_sensor, sizeof(r_device));
memcpy(&cfg->devices[127], &skylink_motion, sizeof(r_device));
memcpy(&cfg->devices[128], &smoke_gs558, sizeof(r_device));
Expand Down
4 changes: 2 additions & 2 deletions tools/decoder.fragment
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ if (rtl_433_ESP::ookModulation) {
memcpy(&cfg->devices[93], &new_template, sizeof(r_device));
memcpy(&cfg->devices[94], &newkaku, sizeof(r_device));
memcpy(&cfg->devices[95], &nexa, sizeof(r_device));
memcpy(&cfg->devices[96], &nexus, sizeof(r_device));
memcpy(&cfg->devices[96], &RTLnexus, sizeof(r_device));
memcpy(&cfg->devices[97], &nice_flor_s, sizeof(r_device));
memcpy(&cfg->devices[98], &norgo, sizeof(r_device));
memcpy(&cfg->devices[99], &oil_standard_ask, sizeof(r_device));
Expand Down Expand Up @@ -126,7 +126,7 @@ if (rtl_433_ESP::ookModulation) {
memcpy(&cfg->devices[122], &schrader_SMD3MA4, sizeof(r_device));
memcpy(&cfg->devices[123], &scmplus, sizeof(r_device));
memcpy(&cfg->devices[124], &secplus_v1, sizeof(r_device));
memcpy(&cfg->devices[125], &silvercrest, sizeof(r_device));
memcpy(&cfg->devices[125], &RTLsilvercrest, sizeof(r_device));
memcpy(&cfg->devices[126], &ss_sensor, sizeof(r_device));
memcpy(&cfg->devices[127], &skylink_motion, sizeof(r_device));
memcpy(&cfg->devices[128], &smoke_gs558, sizeof(r_device));
Expand Down
4 changes: 2 additions & 2 deletions tools/rtl_433_devices.fragment
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -146,7 +146,7 @@
DECL(new_template) \
DECL(newkaku) \
DECL(nexa) \
DECL(nexus) \
DECL(RTLnexus) \
DECL(nice_flor_s) \
DECL(norgo) \
DECL(oil_smart) \
Expand Down Expand Up @@ -181,7 +181,7 @@
DECL(scmplus) \
DECL(secplus_v1) \
DECL(sharp_spc775) \
DECL(silvercrest) \
DECL(RTLsilvercrest) \
DECL(ss_sensor) \
DECL(simplisafe_gen3) \
DECL(skylink_motion) \
Expand Down