From 3e24dbb403ea67993bd970f2ffba5828f86df941 Mon Sep 17 00:00:00 2001 From: Christian Nilsson Date: Tue, 2 Jun 2020 10:09:30 +0200 Subject: [PATCH 1/3] Remove legacy "compatible with" sections Most data where already up to date in .h so pure removal of duplication --- src/ir_Fujitsu.cpp | 13 +++---------- src/ir_Goodweather.cpp | 3 --- src/ir_Gree.cpp | 4 ---- src/ir_Hitachi.cpp | 3 --- src/ir_Midea.cpp | 9 +-------- src/ir_Mitsubishi.cpp | 12 ------------ src/ir_Mitsubishi.h | 8 ++++---- src/ir_Sharp.cpp | 6 ------ src/ir_Sharp.h | 1 + src/ir_Toshiba.cpp | 7 ------- src/ir_Vestel.cpp | 4 ---- src/ir_Whirlpool.cpp | 5 ----- 12 files changed, 9 insertions(+), 66 deletions(-) diff --git a/src/ir_Fujitsu.cpp b/src/ir_Fujitsu.cpp index 583a441ba..5a0a3b706 100644 --- a/src/ir_Fujitsu.cpp +++ b/src/ir_Fujitsu.cpp @@ -1,5 +1,8 @@ // Copyright 2017 Jonny Graham // Copyright 2017-2019 David Conran + +// Fujitsu A/C support added by Jonny Graham & David Conran + #include "ir_Fujitsu.h" #include #ifndef ARDUINO @@ -9,16 +12,6 @@ #include "IRtext.h" #include "IRutils.h" -// Fujitsu A/C support added by Jonny Graham & David Conran - -// Equipment it seems compatible with: -// * Fujitsu ASYG30LFCA with remote AR-RAH2E -// * Fujitsu AST9RSGCW with remote AR-DB1 -// * Fujitsu ASYG7LMCA with remote AR-REB1E -// * Fujitsu AR-RAE1E remote. -// * Fujitsu General with remote AR-JW2 -// * - // Ref: // These values are based on averages of measurements const uint16_t kFujitsuAcHdrMark = 3324; diff --git a/src/ir_Goodweather.cpp b/src/ir_Goodweather.cpp index 97a4a9277..f13f18a45 100644 --- a/src/ir_Goodweather.cpp +++ b/src/ir_Goodweather.cpp @@ -2,9 +2,6 @@ // Copyright 2019 David Conran // // Code to emulate Goodweather protocol compatible HVAC devices. -// Should be compatible with: -// * ZH/JT-03 remote control -// #include "ir_Goodweather.h" #include diff --git a/src/ir_Gree.cpp b/src/ir_Gree.cpp index 4c07c7ab1..59ed472b3 100644 --- a/src/ir_Gree.cpp +++ b/src/ir_Gree.cpp @@ -2,10 +2,6 @@ // Copyright 2017, 2018 David Conran // // Code to emulate Gree protocol compatible HVAC devices. -// Should be compatible with: -// * Heat pumps carrying the "Ultimate" brand name. -// * EKOKAI air conditioners. -// #include "ir_Gree.h" #include diff --git a/src/ir_Hitachi.cpp b/src/ir_Hitachi.cpp index dcc6dfa40..d700a7be5 100644 --- a/src/ir_Hitachi.cpp +++ b/src/ir_Hitachi.cpp @@ -1,9 +1,6 @@ // Copyright 2018-2019 David Conran // // Code to emulate Hitachi protocol compatible devices. -// Should be compatible with: -// * Hitachi RAS-35THA6 remote -// #include "ir_Hitachi.h" #include diff --git a/src/ir_Midea.cpp b/src/ir_Midea.cpp index bbf9bedfa..246e56750 100644 --- a/src/ir_Midea.cpp +++ b/src/ir_Midea.cpp @@ -1,5 +1,5 @@ // Copyright 2017 bwze, crankyoldgit -// Midea +// Midea A/C added by (send) bwze/crankyoldgit & (decode) crankyoldgit #include "ir_Midea.h" #include @@ -11,13 +11,6 @@ #include "IRtext.h" #include "IRutils.h" -// Midea A/C added by (send) bwze/crankyoldgit & (decode) crankyoldgit -// -// Equipment it seems compatible with: -// * Pioneer System Model RYBO12GMFILCAD (12K BTU) -// * Pioneer System Model RUBO18GMFILCAD (18K BTU) -// * - // Ref: // https://docs.google.com/spreadsheets/d/1TZh4jWrx4h9zzpYUI9aYXMl1fYOiqu-xVuOOMqagxrs/edit?usp=sharing diff --git a/src/ir_Mitsubishi.cpp b/src/ir_Mitsubishi.cpp index b8d62e109..2f6174f03 100644 --- a/src/ir_Mitsubishi.cpp +++ b/src/ir_Mitsubishi.cpp @@ -426,8 +426,6 @@ bool IRrecv::decodeMitsubishiAC(decode_results *results, uint16_t offset, // // Warning: Consider this very alpha code. Seems to work, but not validated. // -// Equipment it seems compatible with: -// * // Initialise the object. IRMitsubishiAC::IRMitsubishiAC(const uint16_t pin, const bool inverted, const bool use_modulation) @@ -867,11 +865,6 @@ bool IRrecv::decodeMitsubishi136(decode_results *results, uint16_t offset, #endif // DECODE_MITSUBISHI136 // Code to emulate Mitsubishi 136bit A/C IR remote control unit. -// -// Equipment it seems compatible with: -// Brand: Mitsubishi Electric, Model: PEAD-RP71JAA Ducted A/C -// Brand: Mitsubishi Electric, Model: 001CP T7WE10714 remote - // Initialise the object. IRMitsubishi136::IRMitsubishi136(const uint16_t pin, const bool inverted, const bool use_modulation) @@ -1265,11 +1258,6 @@ bool IRrecv::decodeMitsubishi112(decode_results *results, uint16_t offset, #endif // DECODE_MITSUBISHI112 || DECODE_TCL112AC // Code to emulate Mitsubishi 112bit A/C IR remote control unit. -// -// Equipment it seems compatible with: -// Brand: Mitsubishi Electric, Model: MSH-A24WV / MUH-A24WV A/C -// Brand: Mitsubishi Electric, Model: KPOA remote - // Initialise the object. IRMitsubishi112::IRMitsubishi112(const uint16_t pin, const bool inverted, const bool use_modulation) diff --git a/src/ir_Mitsubishi.h b/src/ir_Mitsubishi.h index b9cc7b349..eb1f9a73d 100644 --- a/src/ir_Mitsubishi.h +++ b/src/ir_Mitsubishi.h @@ -9,10 +9,10 @@ // Brand: Mitsubishi, Model: HC3000 Projector // Brand: Mitsubishi, Model: MS-GK24VA A/C // Brand: Mitsubishi, Model: KM14A 0179213 remote -// Brand: Mitsubishi Electric, Model: PEAD-RP71JAA Ducted A/C -// Brand: Mitsubishi Electric, Model: 001CP T7WE10714 remote -// Brand: Mitsubishi Electric, Model: MSH-A24WV / MUH-A24WV A/C -// Brand: Mitsubishi Electric, Model: KPOA remote +// Brand: Mitsubishi Electric, Model: PEAD-RP71JAA Ducted A/C (136bit) +// Brand: Mitsubishi Electric, Model: 001CP T7WE10714 remote (136bit) +// Brand: Mitsubishi Electric, Model: MSH-A24WV / MUH-A24WV A/C (112bit) +// Brand: Mitsubishi Electric, Model: KPOA remote (112bit) #ifndef IR_MITSUBISHI_H_ #define IR_MITSUBISHI_H_ diff --git a/src/ir_Sharp.cpp b/src/ir_Sharp.cpp index 95a3de5cc..c4b5f050b 100644 --- a/src/ir_Sharp.cpp +++ b/src/ir_Sharp.cpp @@ -14,12 +14,6 @@ #include "IRtext.h" #include "IRutils.h" -// Equipment it seems compatible with: -// * Sharp LC-52D62U -// * Sharp AH-AxSAY A/C (Remote CRMC-A907 JBEZ) -// * -// - // Constants // period time = 1/38000Hz = 26.316 microseconds. // Ref: diff --git a/src/ir_Sharp.h b/src/ir_Sharp.h index 31f340817..c1720ebba 100644 --- a/src/ir_Sharp.h +++ b/src/ir_Sharp.h @@ -4,6 +4,7 @@ // Brand: Sharp, Model: LC-52D62U TV // Brand: Sharp, Model: AY-ZP40KR A/C // Brand: Sharp, Model: AH-AxSAY A/C +// Brand: Sharp, Model: CRMC-A907 JBEZ remote // Brand: Sharp, Model: AH-XP10NRY A/C // Brand: Sharp, Model: CRMC-820JBEZ remote diff --git a/src/ir_Toshiba.cpp b/src/ir_Toshiba.cpp index 3113e1b09..c6e56f8af 100644 --- a/src/ir_Toshiba.cpp +++ b/src/ir_Toshiba.cpp @@ -14,13 +14,6 @@ #include "IRtext.h" #include "IRutils.h" -// -// Equipment it seems compatible with: -// * Toshiba RAS-B13N3KV2 / Akita EVO II -// * Toshiba RAS-B13N3KVP-E, RAS 18SKP-ES -// * Toshiba WH-TA04NE, WC-L03SE -// * - // Constants // Toshiba A/C diff --git a/src/ir_Vestel.cpp b/src/ir_Vestel.cpp index 4378497e0..f5311f5e3 100644 --- a/src/ir_Vestel.cpp +++ b/src/ir_Vestel.cpp @@ -15,10 +15,6 @@ #include "IRutils.h" #include "ir_Haier.h" -// Equipment it seems compatible with: -// * Vestel AC Model BIOX CXP-9 (9K BTU) -// * - // Ref: // None. Totally reverse engineered. diff --git a/src/ir_Whirlpool.cpp b/src/ir_Whirlpool.cpp index 3ba781c4c..046ba1cb6 100644 --- a/src/ir_Whirlpool.cpp +++ b/src/ir_Whirlpool.cpp @@ -1,11 +1,6 @@ // Copyright 2018 David Conran // // Code to emulate Whirlpool protocol compatible devices. -// Should be compatible with: -// * SPIS409L, SPIS412L, SPIW409L, SPIW412L, SPIW418L -// Remotes: -// * DG11J1-3A / DG11J1-04 -// * DG11J1-91 // // Note: Smart, iFeel, AroundU, PowerSave, & Silent modes are unsupported. // Advanced 6thSense, Dehumidify, & Sleep modes are not supported. From dfae46fabd00bdc0f616b4ff48c3382d43887fcd Mon Sep 17 00:00:00 2001 From: Christian Nilsson Date: Tue, 2 Jun 2020 10:38:50 +0200 Subject: [PATCH 2/3] Move Supports sections from .cpp to .h --- src/ir_Amcor.cpp | 5 ----- src/ir_Carrier.cpp | 8 -------- src/ir_Carrier.h | 8 ++++++++ src/ir_Coolix.cpp | 8 -------- src/ir_Coolix.h | 17 +++++++++-------- src/ir_LG.cpp | 4 ---- src/ir_Neoclima.cpp | 5 ----- src/ir_Neoclima.h | 8 ++++---- 8 files changed, 21 insertions(+), 42 deletions(-) diff --git a/src/ir_Amcor.cpp b/src/ir_Amcor.cpp index 55be6822d..1ca4637d4 100644 --- a/src/ir_Amcor.cpp +++ b/src/ir_Amcor.cpp @@ -5,11 +5,6 @@ /// @see https://github.com/crankyoldgit/IRremoteESP8266/issues/385 /// @see https://github.com/crankyoldgit/IRremoteESP8266/issues/834 -// Supports: -// Brand: Amcor, Model: ADR-853H A/C -// Brand: Amcor, Model: TAC-495 remote -// Brand: Amcor, Model: TAC-444 remote - #include "ir_Amcor.h" #include #include diff --git a/src/ir_Carrier.cpp b/src/ir_Carrier.cpp index 0f7a96f38..f8f1578c5 100644 --- a/src/ir_Carrier.cpp +++ b/src/ir_Carrier.cpp @@ -4,14 +4,6 @@ /// @see CarrierAc https://github.com/crankyoldgit/IRremoteESP8266/issues/385 /// @see CarrierAc64 https://github.com/crankyoldgit/IRremoteESP8266/issues/1127 -// Supports: -// Brand: Carrier/Surrey, Model: 42QG5A55970 remote -// Brand: Carrier/Surrey, Model: 619EGX0090E0 A/C -// Brand: Carrier/Surrey, Model: 619EGX0120E0 A/C -// Brand: Carrier/Surrey, Model: 619EGX0180E0 A/C -// Brand: Carrier/Surrey, Model: 619EGX0220E0 A/C -// Brand: Carrier/Surrey, Model: 53NGK009/012 Inverter - #include "ir_Carrier.h" #include #include "IRac.h" diff --git a/src/ir_Carrier.h b/src/ir_Carrier.h index 44c70c015..9d0a06c0c 100644 --- a/src/ir_Carrier.h +++ b/src/ir_Carrier.h @@ -4,6 +4,14 @@ /// @see https://github.com/crankyoldgit/IRremoteESP8266/issues/1127 /// @see https://docs.google.com/spreadsheets/d/1EZy78L0cn1KDIX1aKq2biptejFqCjD5HO3tLiRvXf48/edit#gid=0 +// Supports: +// Brand: Carrier/Surrey, Model: 42QG5A55970 remote +// Brand: Carrier/Surrey, Model: 619EGX0090E0 A/C +// Brand: Carrier/Surrey, Model: 619EGX0120E0 A/C +// Brand: Carrier/Surrey, Model: 619EGX0180E0 A/C +// Brand: Carrier/Surrey, Model: 619EGX0220E0 A/C +// Brand: Carrier/Surrey, Model: 53NGK009/012 Inverter + #ifndef IR_CARRIER_H_ #define IR_CARRIER_H_ diff --git a/src/ir_Coolix.cpp b/src/ir_Coolix.cpp index e45a35b8a..e13b175bd 100644 --- a/src/ir_Coolix.cpp +++ b/src/ir_Coolix.cpp @@ -15,14 +15,6 @@ #include "IRtext.h" #include "IRutils.h" -// Supports: -// Brand: Beko, Model: RG57K7(B)/BGEF Remote -// Brand: Beko, Model: BINR 070/071 split-type A/C -// Brand: Midea, Model: RG52D/BGE Remote -// Brand: Midea, Model: MS12FU-10HRDN1-QRD0GW(B) A/C -// Brand: Midea, Model: MSABAU-07HRFN1-QRD0GW A/C (circa 2016) -// Brand: Tokio, Model: AATOEMF17-12CHR1SW split-type RG51|50/BGE Remote - // Constants // Pulse parms are *50-100 for the Mark and *50+100 for the space // First MARK is the one after the long gap diff --git a/src/ir_Coolix.h b/src/ir_Coolix.h index f05fafe87..fb2d87190 100644 --- a/src/ir_Coolix.h +++ b/src/ir_Coolix.h @@ -2,6 +2,15 @@ // // Copyright 2018 David Conran +// Supports: +// Brand: Beko, Model: RG57K7(B)/BGEF Remote +// Brand: Beko, Model: BINR 070/071 split-type A/C +// Brand: Midea, Model: RG52D/BGE Remote +// Brand: Midea, Model: MS12FU-10HRDN1-QRD0GW(B) A/C +// Brand: Midea, Model: MSABAU-07HRFN1-QRD0GW A/C (circa 2016) +// Brand: Tokio, Model: AATOEMF17-12CHR1SW split-type RG51|50/BGE Remote +// Brand: Airwell, Model: RC08B remote + #ifndef IR_COOLIX_H_ #define IR_COOLIX_H_ @@ -16,14 +25,6 @@ #include "IRsend_test.h" #endif -// Supports: -// Brand: Beko, Model: RG57K7(B)/BGEF Remote -// Brand: Beko, Model: BINR 070/071 split-type A/C -// Brand: Midea, Model: RG52D/BGE Remote -// Brand: Midea, Model: MS12FU-10HRDN1-QRD0GW(B) A/C -// Brand: Midea, Model: MSABAU-07HRFN1-QRD0GW A/C (circa 2016) -// Brand: Tokio, Model: AATOEMF17-12CHR1SW split-type RG51|50/BGE Remote -// Brand: Airwell, Model: RC08B remote // Ref: // https://github.com/crankyoldgit/IRremoteESP8266/issues/484 // Kudos: diff --git a/src/ir_LG.cpp b/src/ir_LG.cpp index 1024548ca..415992734 100644 --- a/src/ir_LG.cpp +++ b/src/ir_LG.cpp @@ -2,10 +2,6 @@ // Copyright 2015 cheaplin // Copyright 2017, 2018 David Conran -// Supports: -// Brand: LG, Model: 6711A20083V remote -// Brand: LG, Model: AKB74395308 remote - #include "ir_LG.h" #include #include "IRac.h" diff --git a/src/ir_Neoclima.cpp b/src/ir_Neoclima.cpp index 8c93ef26f..4c2cd8fd6 100644 --- a/src/ir_Neoclima.cpp +++ b/src/ir_Neoclima.cpp @@ -8,11 +8,6 @@ // https://github.com/crankyoldgit/IRremoteESP8266/issues/764 // https://drive.google.com/file/d/1kjYk4zS9NQcMQhFkak-L4mp4UuaAIesW/view - -// Supports: -// Brand: Neoclima, Model: NS-09AHTI A/C -// Brand: Neoclima, Model: ZH/TY-01 remote - #include "ir_Neoclima.h" #include #include diff --git a/src/ir_Neoclima.h b/src/ir_Neoclima.h index e1555e917..afdb07225 100644 --- a/src/ir_Neoclima.h +++ b/src/ir_Neoclima.h @@ -4,6 +4,10 @@ // Analysis by crankyoldgit & AndreyShpilevoy +// Supports: +// Brand: Neoclima, Model: NS-09AHTI A/C +// Brand: Neoclima, Model: ZH/TY-01 remote + #ifndef IR_NEOCLIMA_H_ #define IR_NEOCLIMA_H_ @@ -18,10 +22,6 @@ #include "IRsend_test.h" #endif -// Supports: -// Brand: Neoclima, Model: NS-09AHTI A/C -// Brand: Neoclima, Model: ZH/TY-01 remote - // Ref: // https://github.com/crankyoldgit/IRremoteESP8266/issues/764 // https://drive.google.com/file/d/1kjYk4zS9NQcMQhFkak-L4mp4UuaAIesW/view From b915aafdfcd226270a6ca523584c0bced40d284e Mon Sep 17 00:00:00 2001 From: Christian Nilsson Date: Tue, 2 Jun 2020 11:13:27 +0200 Subject: [PATCH 3/3] Fix move of Supported sections, do not lose information (or at least lose less) --- src/ir_Fujitsu.h | 6 +++--- src/ir_Mitsubishi.h | 9 +++++---- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/src/ir_Fujitsu.h b/src/ir_Fujitsu.h index 17e791ac8..2ff508d3f 100644 --- a/src/ir_Fujitsu.h +++ b/src/ir_Fujitsu.h @@ -3,11 +3,11 @@ // Supports: // Brand: Fujitsu, Model: AR-RAH2E remote -// Brand: Fujitsu, Model: ASYG30LFCA A/C +// Brand: Fujitsu, Model: ASYG30LFCA A/C (ARRAH2E) // Brand: Fujitsu, Model: AR-DB1 remote -// Brand: Fujitsu, Model: AST9RSGCW A/C +// Brand: Fujitsu, Model: AST9RSGCW A/C (ARDB1) // Brand: Fujitsu, Model: AR-REB1E remote -// Brand: Fujitsu, Model: ASYG7LMCA A/C +// Brand: Fujitsu, Model: ASYG7LMCA A/C (ARREB1E) // Brand: Fujitsu, Model: AR-RAE1E remote // Brand: Fujitsu, Model: AGTV14LAC A/C // Brand: Fujitsu, Model: AR-RAC1E remote diff --git a/src/ir_Mitsubishi.h b/src/ir_Mitsubishi.h index eb1f9a73d..ef12860cd 100644 --- a/src/ir_Mitsubishi.h +++ b/src/ir_Mitsubishi.h @@ -9,10 +9,11 @@ // Brand: Mitsubishi, Model: HC3000 Projector // Brand: Mitsubishi, Model: MS-GK24VA A/C // Brand: Mitsubishi, Model: KM14A 0179213 remote -// Brand: Mitsubishi Electric, Model: PEAD-RP71JAA Ducted A/C (136bit) -// Brand: Mitsubishi Electric, Model: 001CP T7WE10714 remote (136bit) -// Brand: Mitsubishi Electric, Model: MSH-A24WV / MUH-A24WV A/C (112bit) -// Brand: Mitsubishi Electric, Model: KPOA remote (112bit) +// Brand: Mitsubishi Electric, Model: PEAD-RP71JAA Ducted A/C (MITSUBISHI136) +// Brand: Mitsubishi Electric, Model: 001CP T7WE10714 remote (MITSUBISHI136) +// Brand: Mitsubishi Electric, Model: MSH-A24WV A/C (MITSUBISHI112) +// Brand: Mitsubishi Electric, Model: MUH-A24WV A/C (MITSUBISHI112) +// Brand: Mitsubishi Electric, Model: KPOA remote (MITSUBISHI112) #ifndef IR_MITSUBISHI_H_ #define IR_MITSUBISHI_H_