From 47310c19f8ad16f226d4471391c3231a29d23a1b Mon Sep 17 00:00:00 2001 From: "Christian W. Zuckschwerdt" Date: Fri, 7 Sep 2018 11:37:09 +0000 Subject: [PATCH] Refresh README, sort build files --- README.md | 5 +- src/CMakeLists.txt | 84 +++++++++--------- src/Makefile.am | 86 +++++++++--------- src/devices/simplisafe.c | 2 +- vs15/rtl_433.vcxproj | 18 ++-- vs15/rtl_433.vcxproj.filters | 168 +++++++++++++++++------------------ 6 files changed, 182 insertions(+), 181 deletions(-) diff --git a/README.md b/README.md index 8f9cd3cf..7ba668e6 100644 --- a/README.md +++ b/README.md @@ -81,7 +81,7 @@ Supported device protocols: [15] KlikAanKlikUit Wireless Switch [16] AlectoV1 Weather Sensor (Alecto WS3500 WS4500 Ventus W155/W044 Oregon) [17] Cardin S466-TX2 - [18] Fine Offset Electronics, WH2 Temperature/Humidity Sensor + [18] Fine Offset Electronics, WH2, WH5, Telldus Temperature/Humidity/Rain Sensor [19] Nexus Temperature & Humidity Sensor [20] Ambient Weather Temperature Sensor [21] Calibeur RF-104 Sensor @@ -160,7 +160,7 @@ Supported device protocols: [94] Philips outdoor temperature sensor [95] Schrader TPMS EG53MA4 [96] Nexa - [97] Thermopro TP12 Thermometer + [97] Thermopro TP08/TP12 thermometer [98] GE Color Effects [99] X10 Security [100] Interlogix GE UTC Security Devices @@ -172,6 +172,7 @@ Supported device protocols: [106]* Wireless M-Bus, Mode R, 4.8kbps (-f 868330000) [107]* Wireless M-Bus, Mode F, 2.4kbps [108] WS Temperature Sensor + [109] WT0124 Pool Thermometer * Disabled by default, use -R n or -G diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index ea35f564..26a9c2d6 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -20,104 +20,104 @@ add_executable(rtl_433 baseband.c bitbuffer.c data.c + optparse.c pulse_demod.c pulse_detect.c rtl_433.c - optparse.c util.c - devices/flex.c devices/acurite.c + devices/akhan_100F14.c devices/alecto.c devices/ambient_weather.c devices/blyss.c devices/brennenstuhl_rcs_2044.c + devices/bresser_3ch.c devices/calibeur.c devices/cardin.c devices/chuango.c devices/current_cost.c devices/danfoss.c + devices/dish_remote_6_3.c devices/dsc.c devices/ec3k.c devices/efergy_e2_classic.c + devices/efergy_optical.c + devices/elro_db286a.c devices/elv.c devices/emontx.c devices/esperanza_ews.c devices/fineoffset.c + devices/fineoffset_wh1050.c devices/fineoffset_wh1080.c + devices/flex.c + devices/fordremote.c devices/ft004b.c devices/ge_coloreffects.c + devices/generic_motion.c devices/generic_remote.c devices/generic_temperature_sensor.c devices/gt_wt_02.c devices/hideki.c + devices/hondaremote.c + devices/honeywell.c devices/ht680.c + devices/ibis_beacon.c + devices/infactory.c devices/inovalley-kw9015b.c + devices/interlogix.c devices/intertechno.c devices/kedsum.c + devices/kerui.c devices/lacrosse.c devices/lacrosse_TX141TH_Bv2.c + devices/lacrosse_tx35.c devices/lacrossews.c devices/lightwave_rf.c devices/m_bus.c + devices/maverick_et73x.c devices/mebus.c + devices/new_template.c devices/newkaku.c + devices/nexa.c devices/nexus.c + devices/oil_standard.c devices/oil_watchman.c devices/oregon_scientific.c + devices/oregon_scientific_sl109h.c devices/oregon_scientific_v1.c + devices/philips.c devices/prologue.c + devices/proove.c + devices/quhwa.c + devices/radiohead_ask.c + devices/rftech.c devices/rubicson.c + devices/s3318p.c + devices/schraeder.c devices/silvercrest.c + devices/simplisafe.c + devices/smoke_gs558.c + devices/solight_te44.c devices/springfield.c + devices/steelmate.c devices/steffen.c - devices/tfa_twin_plus_30.3049.c devices/tfa_pool_thermometer.c + devices/tfa_twin_plus_30.3049.c + devices/thermopro_tp11.c + devices/thermopro_tp12.c + devices/tpms_citroen.c + devices/tpms_ford.c + devices/tpms_renault.c + devices/tpms_toyota.c + devices/vaillant_vrt340f.c devices/valeo.c devices/waveman.c devices/wg_pb12v1.c devices/wssensor.c + devices/wt0124.c devices/wt450.c devices/x10_rf.c - devices/s3318p.c - devices/akhan_100F14.c - devices/quhwa.c - devices/proove.c - devices/bresser_3ch.c - devices/oregon_scientific_sl109h.c - devices/steelmate.c - devices/schraeder.c - devices/elro_db286a.c - devices/efergy_optical.c - devices/hondaremote.c - devices/new_template.c - devices/radiohead_ask.c - devices/kerui.c - devices/fineoffset_wh1050.c - devices/honeywell.c - devices/maverick_et73x.c - devices/rftech.c - devices/lacrosse_tx35.c - devices/vaillant_vrt340f.c - devices/ibis_beacon.c - devices/oil_standard.c - devices/tpms_citroen.c - devices/thermopro_tp11.c - devices/solight_te44.c - devices/smoke_gs558.c - devices/generic_motion.c - devices/tpms_toyota.c - devices/tpms_ford.c - devices/tpms_renault.c - devices/infactory.c - devices/fordremote.c - devices/philips.c - devices/nexa.c - devices/thermopro_tp12.c devices/x10_sec.c - devices/interlogix.c - devices/dish_remote_6_3.c - devices/simplisafe.c - devices/wt0124.c ) add_library(data data.c) diff --git a/src/Makefile.am b/src/Makefile.am index a35ac7bb..e4d9c21c 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -6,103 +6,103 @@ bin_PROGRAMS = rtl_433 rtl_433_SOURCES = baseband.c \ bitbuffer.c \ data.c \ + optparse.c \ pulse_demod.c \ pulse_detect.c \ rtl_433.c \ - optparse.c \ util.c \ - devices/flex.c \ devices/acurite.c \ + devices/akhan_100F14.c \ devices/alecto.c \ devices/ambient_weather.c \ devices/blyss.c \ devices/brennenstuhl_rcs_2044.c \ + devices/bresser_3ch.c \ devices/calibeur.c \ devices/cardin.c \ devices/chuango.c \ devices/current_cost.c \ devices/danfoss.c \ + devices/dish_remote_6_3.c \ devices/dsc.c \ devices/ec3k.c \ devices/efergy_e2_classic.c \ + devices/efergy_optical.c \ + devices/elro_db286a.c \ devices/elv.c \ devices/emontx.c \ devices/esperanza_ews.c \ devices/fineoffset.c \ + devices/fineoffset_wh1050.c \ devices/fineoffset_wh1080.c \ + devices/flex.c \ + devices/fordremote.c \ devices/ft004b.c \ devices/ge_coloreffects.c \ + devices/generic_motion.c \ devices/generic_remote.c \ devices/generic_temperature_sensor.c \ devices/gt_wt_02.c \ devices/hideki.c \ + devices/hondaremote.c \ + devices/honeywell.c \ devices/ht680.c \ + devices/ibis_beacon.c \ + devices/infactory.c \ devices/inovalley-kw9015b.c \ + devices/interlogix.c \ devices/intertechno.c \ devices/kedsum.c \ + devices/kerui.c \ devices/lacrosse.c \ devices/lacrosse_TX141TH_Bv2.c \ + devices/lacrosse_tx35.c \ devices/lacrossews.c \ devices/lightwave_rf.c \ devices/m_bus.c \ + devices/maverick_et73x.c \ devices/mebus.c \ + devices/new_template.c \ devices/newkaku.c \ + devices/nexa.c \ devices/nexus.c \ + devices/oil_standard.c \ devices/oil_watchman.c \ devices/oregon_scientific.c \ + devices/oregon_scientific_sl109h.c \ devices/oregon_scientific_v1.c \ + devices/philips.c \ devices/prologue.c \ + devices/proove.c \ + devices/quhwa.c \ + devices/radiohead_ask.c \ + devices/rftech.c \ devices/rubicson.c \ + devices/s3318p.c \ + devices/schraeder.c \ devices/silvercrest.c \ + devices/simplisafe.c \ + devices/smoke_gs558.c \ + devices/solight_te44.c \ devices/springfield.c \ + devices/steelmate.c \ devices/steffen.c \ - devices/tfa_twin_plus_30.3049.c \ devices/tfa_pool_thermometer.c \ + devices/tfa_twin_plus_30.3049.c \ + devices/thermopro_tp11.c \ + devices/thermopro_tp12.c \ + devices/tpms_citroen.c \ + devices/tpms_ford.c \ + devices/tpms_renault.c \ + devices/tpms_toyota.c \ + devices/vaillant_vrt340f.c \ devices/valeo.c \ devices/waveman.c \ devices/wg_pb12v1.c \ devices/wssensor.c \ + devices/wt0124.c \ devices/wt450.c \ devices/x10_rf.c \ - devices/s3318p.c \ - devices/akhan_100F14.c \ - devices/quhwa.c \ - devices/proove.c \ - devices/bresser_3ch.c \ - devices/oregon_scientific_sl109h.c \ - devices/steelmate.c \ - devices/schraeder.c \ - devices/elro_db286a.c \ - devices/efergy_optical.c \ - devices/hondaremote.c \ - devices/new_template.c \ - devices/radiohead_ask.c \ - devices/kerui.c \ - devices/fineoffset_wh1050.c \ - devices/honeywell.c \ - devices/maverick_et73x.c \ - devices/rftech.c \ - devices/lacrosse_tx35.c \ - devices/vaillant_vrt340f.c \ - devices/ibis_beacon.c \ - devices/oil_standard.c \ - devices/tpms_citroen.c \ - devices/thermopro_tp11.c \ - devices/solight_te44.c \ - devices/smoke_gs558.c \ - devices/generic_motion.c \ - devices/tpms_toyota.c \ - devices/tpms_ford.c \ - devices/tpms_renault.c \ - devices/infactory.c \ - devices/fordremote.c \ - devices/philips.c \ - devices/nexa.c \ - devices/thermopro_tp12.c \ - devices/x10_sec.c \ - devices/interlogix.c \ - devices/dish_remote_6_3.c \ - devices/simplisafe.c \ - devices/wt1024.c + devices/x10_sec.c rtl_433_LDADD = $(LIBRTLSDR) $(LIBM) diff --git a/src/devices/simplisafe.c b/src/devices/simplisafe.c index 00b3d640..77024099 100644 --- a/src/devices/simplisafe.c +++ b/src/devices/simplisafe.c @@ -176,7 +176,7 @@ static char *sensor_output_fields[] = { }; r_device ss_sensor = { - .name = "SimpliSafe Home Security System", + .name = "SimpliSafe Home Security System (May require disabling automatic gain for KeyPad decodes)", .modulation = OOK_PULSE_PIWM_DC, .short_limit = 500, // half-bit width 500 us .long_limit = 1000, // bit width 1000 us diff --git a/vs15/rtl_433.vcxproj b/vs15/rtl_433.vcxproj index 5a9847de..0babafe8 100644 --- a/vs15/rtl_433.vcxproj +++ b/vs15/rtl_433.vcxproj @@ -100,6 +100,11 @@ + + + + + @@ -127,10 +132,10 @@ + - @@ -144,15 +149,15 @@ - + + - - + @@ -194,11 +199,6 @@ - - - - - diff --git a/vs15/rtl_433.vcxproj.filters b/vs15/rtl_433.vcxproj.filters index 2af0fd9f..97ba30ef 100644 --- a/vs15/rtl_433.vcxproj.filters +++ b/vs15/rtl_433.vcxproj.filters @@ -73,83 +73,8 @@ Source Files - - Source Files\devices - - - Source Files\devices - - - Source Files\devices - - - Source Files\devices - - - Source Files\devices - - - Source Files\devices - - - Source Files\devices - - - Source Files\devices - - - Source Files\devices - - - Source Files\devices - - - Source Files\devices - - - Source Files\devices - - - Source Files\devices - - - Source Files\devices - - - Source Files\devices - - - Source Files\devices - - - Source Files\devices - - - Source Files\devices - - - Source Files\devices - - - Source Files\devices - - - Source Files\devices - - - Source Files\devices - - - Source Files\devices - - - Source Files\devices - - - Source Files\devices - - - Source Files\devices + + Source Files\getopt Source Files\devices @@ -283,10 +208,10 @@ Source Files\devices - + Source Files\devices - + Source Files\devices @@ -295,6 +220,9 @@ Source Files\devices + + Source Files\devices + Source Files\devices @@ -343,17 +271,89 @@ Source Files\devices - - Source Files\getopt - - + Source Files\devices - + + Source Files\devices + + + Source Files\devices + + + Source Files\devices + + + Source Files\devices + + + Source Files\devices + + + Source Files\devices + + + Source Files\devices + + + Source Files\devices + + + Source Files\devices + + + Source Files\devices + + + Source Files\devices + + + Source Files\devices + + + Source Files\devices + + + Source Files\devices + + + Source Files\devices + + + Source Files\devices + + + Source Files\devices + + + Source Files\devices + + + Source Files\devices + + + Source Files\devices + + + Source Files\devices + + + Source Files\devices + + Source Files\devices Source Files\devices + + Source Files\devices + + + Source Files\devices + + + Source Files\devices + \ No newline at end of file