breeze/IRremoteESP8266
1
0
Fork 0
mirror of https://github.com/crankyoldgit/IRremoteESP8266.git synced 2026-01-12 00:05:10 +08:00
Code Issues Packages Projects Releases Wiki Activity

v2.5.0 Release (#524)

Browse Source 
## _v2.5.0 (20180919)_

**[Bug Fixes]**
- Fix HTML menu error for GICABLE in IRMQTTServer. (#516)
- Fix Mitsubishi A/C mode setting. (#514)
- Add missing ',' in auto analyse tool generated code. (#513)
- Fix Fujitsu checksum validation. (#501)
- Remove errant Repeat debug statement in IRMQTTServer. (#507)

**[Features]**
- Mitsubishi A/C decode improvements. (#514)
- Basic support for Whirlpool A/C messages. (#511)
- Basic support for Samsung A/C messages. (#512)
- Experimental support for detailed Samsung A/C messages. (#521)
- Experimental support for detailed Coolix A/C messages. (#518)
- Experimental support for Lutron protocol. (#516)
- Calculate and use average values for timings in analysing tool. (#513)

**[Misc]**
- Style change from using `#define`s for constants to `const kConstantName`.
- Improve the JVC example code.
This commit is contained in:
David Conran
2018-09-20 02:08:31 -07:00
committed by GitHub
parent eef81af201
commit 6ed8a30315
124 changed files with 7983 additions and 4480 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
.github/Contributors.md vendored
View File

@@ -10,6 +10,7 @@
- [Jonny Graham](https://github.com/jonnygraham/)
- [Stu Fisher](https://github.com/stufisher/)
- [Jorge Cisneros](https://github.com/jorgecis/)
- [Denes Varga](https://github.com/denxhun/)
All contributors can be found on the [contributors site](https://github.com/markszabo/IRremoteESP8266/graphs/contributors).

3
.gitignore vendored
View File

@@ -40,3 +40,6 @@ tools/gc_decode
.piolibdeps
.clang_complete
.gcc-flags.json
#Cygwin builds
*.exe

19
README.md
View File

@@ -7,12 +7,27 @@
This library enables you to **send _and_ receive** infra-red signals on an [ESP8266 using the Arduino framework](https://github.com/esp8266/Arduino) using common 940nm IR LEDs and common IR receiver modules. e.g. TSOP{17,22,24,36,38,44,48}* etc.
## v2.4.3 Now Available
Version 2.4.3 of the library is now [available](https://github.com/markszabo/IRremoteESP8266/releases/latest). You can view the [Release Notes](ReleaseNotes.md) for all the significant changes.
## v2.5.0 Now Available
Version 2.5.0 of the library is now [available](https://github.com/markszabo/IRremoteESP8266/releases/latest). You can view the [Release Notes](ReleaseNotes.md) for all the significant changes.
#### Upgrading from pre-v2.0
Usage of the library slight changed at v2.0. You will need to change your usage to work with v2.0 and beyond. You can read more about the changes required on our [Upgrade to v2.0](https://github.com/markszabo/IRremoteESP8266/wiki/Upgrading-to-v2.0) page.
#### Upgrading from pre-v2.5
The library has changed from using constants declared as `#define` to
[const](https://google.github.io/styleguide/cppguide.html#Constant_Names) with
the appropriate naming per the
[C++ style guide](https://google.github.io/styleguide/cppguide.html).
This may potentially cause old programs to not compile.
The most likely externally used `#define`s have been _aliased_ for limited
backward compatibility for projects using the old style. Going forward, only the
new `kConstantName` style will be supported for new protocol additions.
In the unlikely case it does break your code, then you may have been referencing
something you likely should not have. You should be able to quickly determine
the new name from the old. e.g. `CONSTANT_NAME` to `kConstantName`.
Use common sense or examining the library's code if this does affect code.
## Troubleshooting
Before reporting an issue or asking for help, please try to follow our [Troubleshooting Guide](https://github.com/markszabo/IRremoteESP8266/wiki/Troubleshooting-Guide) first.

23
ReleaseNotes.md
View File

@@ -1,5 +1,28 @@
# Release Notes
## _v2.5.0 (20180919)_
**[Bug Fixes]**
- Fix HTML menu error for GICABLE in IRMQTTServer. (#516)
- Fix Mitsubishi A/C mode setting. (#514)
- Add missing ',' in auto analyse tool generated code. (#513)
- Fix Fujitsu checksum validation. (#501)
- Remove errant Repeat debug statement in IRMQTTServer. (#507)
**[Features]**
- Mitsubishi A/C decode improvements. (#514)
- Basic support for Whirlpool A/C messages. (#511)
- Basic support for Samsung A/C messages. (#512)
- Experimental support for detailed Samsung A/C messages. (#521)
- Experimental support for detailed Coolix A/C messages. (#518)
- Experimental support for Lutron protocol. (#516)
- Calculate and use average values for timings in analysing tool. (#513)
**[Misc]**
- Style change from using #define's for constants to `const kConstantName`.
- Improve the JVC example code.
## _v2.4.3 (20180727)_
**[Bug Fixes]**

8
examples/IRGCTCPServer/IRGCTCPServer.ino
View File

@@ -9,7 +9,7 @@
* For more codes, visit: https://irdb.globalcache.com/
*
* How to use this program:
* 1) Update "ssid" and "password" below for your WIFI network.
* 1) Update "kSsid" and "kPassword" below for your WIFI network.
* 2) Compile and upload the sketch to your ESP8266 module.
* 3) (Optional) Use the serial connection to confirm it started and get the
* IP address.
@@ -46,8 +46,8 @@
#include <WiFiClient.h>
#include <WiFiServer.h>
const char* ssid = "..."; // Put your WIFI SSID here.
const char* password = "..."; // Put your WIFI password here.
const char* kSsid = "..."; // Put your WIFI SSID here.
const char* kPassword = "..."; // Put your WIFI Password here.
WiFiServer server(4998); // Uses port 4998.
WiFiClient client;
@@ -103,7 +103,7 @@ void setup() {
delay(100);
Serial.println(" ");
Serial.println("IR TCP Server");
WiFi.begin(ssid, password);
WiFi.begin(kSsid, kPassword);
while (WiFi.status() != WL_CONNECTED) {
delay(900);
Serial.print(".");

148
examples/IRMQTTServer/IRMQTTServer.ino
View File

@@ -132,7 +132,7 @@
// GPIO the IR LED is connected to/controlled by. GPIO 4 = D2.
#define IR_LED 4
// define IR_LED 3 // For an ESP-01 we suggest you use RX/GPIO3/Pin 7.
#define HTTP_PORT 80 // The port the HTTP server is listening on.
const uint16_t kHttpPort = 80; // The TCP port the HTTP server is listening on.
// Name of the device you want in mDNS.
// NOTE: Changing this will change the MQTT path too unless you override it
// via MQTTprefix below.
@@ -150,11 +150,11 @@ const IPAddress kSubnetMask = IPAddress(255, 255, 255, 0);
#ifdef MQTT_ENABLE
// Address of your MQTT server.
#define MQTT_SERVER "10.20.0.253" // <=- CHANGE ME
#define MQTT_PORT 1883 // Default port used by MQTT servers.
const uint16_t kMqttPort = 1883; // Default port used by MQTT servers.
// Set if your MQTT server requires a Username & Password to connect.
const char* mqtt_user = "";
const char* mqtt_password = "";
#define MQTT_RECONNECT_TIME 5000 // Delay(ms) between reconnect tries.
const uint32_t kMqttReconnectTime = 5000; // Delay(ms) between reconnect tries.
#define MQTTprefix HOSTNAME // Change this if you want the MQTT topic to be
// independent of the hostname.
@@ -168,7 +168,7 @@ const char* mqtt_password = "";
#define argBits "bits"
#define argRepeat "repeats"
#define _MY_VERSION_ "v0.5.2"
#define _MY_VERSION_ "v0.5.5"
#if IR_LED != 1 // Disable debug output if the LED is on the TX (D1) pin.
#undef DEBUG
@@ -181,7 +181,7 @@ const char* mqtt_password = "";
#define BAUD_RATE 115200 // Serial port Baud rate.
// Globals
ESP8266WebServer server(HTTP_PORT);
ESP8266WebServer server(kHttpPort);
IRsend irsend = IRsend(IR_LED);
MDNSResponder mdns;
WiFiClient espClient;
@@ -201,7 +201,7 @@ uint32_t lastMqttCmdTime = 0;
// MQTT client parameters
void callback(char* topic, byte* payload, unsigned int length);
PubSubClient mqtt_client(MQTT_SERVER, MQTT_PORT, callback, espClient);
PubSubClient mqtt_client(MQTT_SERVER, kMqttPort, callback, espClient);
// Create a unique MQTT client id.
String mqtt_clientid = MQTTprefix + String(ESP.getChipId(), HEX);
#endif // MQTT_ENABLE
@@ -275,7 +275,7 @@ void handleRoot() {
"Total send requests: " + String(sendReqCounter) + "</p>"
#ifdef MQTT_ENABLE
"<h4>MQTT Information</h4>"
"<p>Server: " MQTT_SERVER ":" + String(MQTT_PORT) + " <i>(" +
"<p>Server: " MQTT_SERVER ":" + String(kMqttPort) + " <i>(" +
(mqtt_client.connected() ? "Connected" : "Disconnected") + ")</i><br>"
"Client id: " + mqtt_clientid + "<br>"
"Command topic: " MQTTcommand "<br>"
@@ -320,10 +320,11 @@ void handleRoot() {
"<option value='15'>Coolix</option>"
"<option value='17'>Denon</option>"
"<option value='13'>Dish</option>"
"<option value='41'>GICable</option>"
"<option value='43'>GICable</option>"
"<option value='6'>JVC</option>"
"<option value='10'>LG</option>"
"<option value='36'>Lasertag</option>"
"<option value='47'>Lutron</option>"
"<option value='35'>MagiQuest</option>"
"<option value='34'>Midea</option>"
"<option value='12'>Mitsubishi</option>"
@@ -359,6 +360,7 @@ void handleRoot() {
"<option value='24'>24</option>"
"<option value='28'>28</option>"
"<option value='32'>32</option>"
"<option value='35'>35</option>"
"<option value='36'>36</option>"
"<option value='48'>48</option>"
"<option value='56'>56</option>"
@@ -421,12 +423,14 @@ void handleRoot() {
"<option value='42'>Hitachi2 (53 bytes)</option>"
"<option selected='selected' value='18'>Kelvinator</option>" // Default
"<option value='20'>Mitsubishi</option>"
"<option value='46'>Samsung</option>"
"<option value='32'>Toshiba</option>"
"<option value='28'>Trotec</option>"
"<option value='45'>Whirlpool</option>"
"</select>"
" State code: 0x"
"<input type='text' name='code' size='" + String(STATE_SIZE_MAX * 2) +
"' maxlength='" + String(STATE_SIZE_MAX * 2) + "'"
"<input type='text' name='code' size='" + String(kStateSizeMax * 2) +
"' maxlength='" + String(kStateSizeMax * 2) + "'"
" value='190B8050000000E0190B8070000010F0'>"
" <input type='submit' value='Send A/C State'>"
"</form>"
@@ -464,7 +468,7 @@ void handleReset() {
// str: A hexadecimal string containing the state to be sent.
void parseStringAndSendAirCon(const uint16_t irType, const String str) {
uint8_t strOffset = 0;
uint8_t state[STATE_SIZE_MAX] = {0}; // All array elements are set to 0.
uint8_t state[kStateSizeMax] = {0}; // All array elements are set to 0.
uint16_t stateSize = 0;
if (str.startsWith("0x") || str.startsWith("0X"))
@@ -478,25 +482,25 @@ void parseStringAndSendAirCon(const uint16_t irType, const String str) {
switch (irType) { // Get the correct state size for the protocol.
case KELVINATOR:
stateSize = KELVINATOR_STATE_LENGTH;
stateSize = kKelvinatorStateLength;
break;
case TOSHIBA_AC:
stateSize = TOSHIBA_AC_STATE_LENGTH;
stateSize = kToshibaACStateLength;
break;
case DAIKIN:
stateSize = DAIKIN_COMMAND_LENGTH;
stateSize = kDaikinStateLength;
break;
case MITSUBISHI_AC:
stateSize = MITSUBISHI_AC_STATE_LENGTH;
stateSize = kMitsubishiACStateLength;
break;
case TROTEC:
stateSize = TROTEC_COMMAND_LENGTH;
stateSize = kTrotecStateLength;
break;
case ARGO:
stateSize = ARGO_COMMAND_LENGTH;
stateSize = kArgoStateLength;
break;
case GREE:
stateSize = GREE_STATE_LENGTH;
stateSize = kGreeStateLength;
break;
case FUJITSU_AC:
// Fujitsu has four distinct & different size states, so make a best guess
@@ -506,29 +510,34 @@ void parseStringAndSendAirCon(const uint16_t irType, const String str) {
stateSize = inputLength / 2; // Every two hex chars is a byte.
// Use at least the minimum size.
stateSize = std::max(stateSize,
(uint16_t) (FUJITSU_AC_STATE_LENGTH_SHORT - 1));
(uint16_t) (kFujitsuAcStateLengthShort - 1));
// If we think it isn't a "short" message.
if (stateSize > FUJITSU_AC_STATE_LENGTH_SHORT)
if (stateSize > kFujitsuAcStateLengthShort)
// Then it has to be at least the smaller version of the "normal" size.
stateSize = std::max(stateSize,
(uint16_t) (FUJITSU_AC_STATE_LENGTH - 1));
stateSize = std::max(stateSize, (uint16_t) (kFujitsuAcStateLength - 1));
// Lastly, it should never exceed the maximum "normal" size.
stateSize = std::min(stateSize, (uint16_t) FUJITSU_AC_STATE_LENGTH);
stateSize = std::min(stateSize, kFujitsuAcStateLength);
break;
case HAIER_AC:
stateSize = HAIER_AC_STATE_LENGTH;
stateSize = kHaierACStateLength;
break;
case HAIER_AC_YRW02:
stateSize = HAIER_AC_YRW02_STATE_LENGTH;
stateSize = kHaierACYRW02StateLength;
break;
case HITACHI_AC:
stateSize = HITACHI_AC_STATE_LENGTH;
stateSize = kHitachiAcStateLength;
break;
case HITACHI_AC1:
stateSize = HITACHI_AC1_STATE_LENGTH;
stateSize = kHitachiAc1StateLength;
break;
case HITACHI_AC2:
stateSize = HITACHI_AC2_STATE_LENGTH;
stateSize = kHitachiAc2StateLength;
break;
case WHIRLPOOL_AC:
stateSize = kWhirlpoolAcStateLength;
break;
case SAMSUNG_AC:
stateSize = kSamsungAcStateLength;
break;
default: // Not a protocol we expected. Abort.
debug("Unexpected AirCon protocol detected. Ignoring.");
@@ -722,7 +731,7 @@ void parseStringAndSendGC(const String str) {
// 0030,0018,0018,0018,0018,0018,0030,0018,0018,03f6"
// or
// "0000,0067,0000,0015,0060,0018". i.e. without the Repeat value
// Requires at least PRONTO_MIN_LENGTH comma-separated values.
// Requires at least kProntoMinLength comma-separated values.
// sendPronto() only supports raw pronto code types, thus so does this.
// repeats: Nr. of times the message is to be repeated.
// This value is ignored if an embeddd repeat is found in str.
@@ -744,8 +753,8 @@ void parseStringAndSendPronto(const String str, uint16_t repeats) {
count--; // We don't count the repeats value as part of the code array.
}
// We need at least PRONTO_MIN_LENGTH values for the code part.
if (count < PRONTO_MIN_LENGTH) return;
// We need at least kProntoMinLength values for the code part.
if (count < kProntoMinLength) return;
// Now we know how many there are, allocate the memory to store them all.
code_array = newCodeArray(count);
@@ -954,7 +963,7 @@ bool reconnect() {
while (!mqtt_client.connected() && tries <= 3) {
int connected = false;
// Attempt to connect
debug("Attempting MQTT connection to " MQTT_SERVER ":" + String(MQTT_PORT) +
debug("Attempting MQTT connection to " MQTT_SERVER ":" + String(kMqttPort) +
"... ");
if (mqtt_user && mqtt_password)
connected = mqtt_client.connect(mqtt_clientid.c_str(), mqtt_user,
@@ -986,8 +995,8 @@ void loop(void) {
// MQTT client connection management
if (!mqtt_client.connected()) {
uint32_t now = millis();
// Reconnect if it's longer than MQTT_RECONNECT_TIME since we last tried.
if (now - lastReconnectAttempt > MQTT_RECONNECT_TIME) {
// Reconnect if it's longer than kMqttReconnectTime since we last tried.
if (now - lastReconnectAttempt > kMqttReconnectTime) {
lastReconnectAttempt = now;
debug("client mqtt not connected, trying to connect");
// Attempt to reconnect
@@ -1049,102 +1058,102 @@ void sendIRCode(int const ir_type, uint64_t const code, char const * code_str,
#if SEND_RC5
case RC5: // 1
if (bits == 0)
bits = RC5_BITS;
bits = kRC5Bits;
irsend.sendRC5(code, bits, repeat);
break;
#endif
#if SEND_RC6
case RC6: // 2
if (bits == 0)
bits = RC6_MODE0_BITS;
bits = kRC6Mode0Bits;
irsend.sendRC6(code, bits, repeat);
break;
#endif
#if SEND_NEC
case NEC: // 3
if (bits == 0)
bits = NEC_BITS;
bits = kNECBits;
irsend.sendNEC(code, bits, repeat);
break;
#endif
#if SEND_SONY
case SONY: // 4
if (bits == 0)
bits = SONY_12_BITS;
repeat = std::max(repeat, (uint16_t) SONY_MIN_REPEAT);
bits = kSony12Bits;
repeat = std::max(repeat, kSonyMinRepeat);
irsend.sendSony(code, bits, repeat);
break;
#endif
#if SEND_PANASONIC
case PANASONIC: // 5
if (bits == 0)
bits = PANASONIC_BITS;
bits = kPanasonicBits;
irsend.sendPanasonic64(code, bits, repeat);
break;
#endif
#if SEND_JVC
case JVC: // 6
if (bits == 0)
bits = JVC_BITS;
bits = kJvcBits;
irsend.sendJVC(code, bits, repeat);
break;
#endif
#if SEND_SAMSUNG
case SAMSUNG: // 7
if (bits == 0)
bits = SAMSUNG_BITS;
bits = kSamsungBits;
irsend.sendSAMSUNG(code, bits, repeat);
break;
#endif
#if SEND_WHYNTER
case WHYNTER: // 8
if (bits == 0)
bits = WHYNTER_BITS;
bits = kWhynterBits;
irsend.sendWhynter(code, bits, repeat);
break;
#endif
#if SEND_AIWA_RC_T501
case AIWA_RC_T501: // 9
if (bits == 0)
bits = AIWA_RC_T501_BITS;
repeat = std::max(repeat, (uint16_t) AIWA_RC_T501_MIN_REPEAT);
bits = kAiwaRcT501Bits;
repeat = std::max(repeat, kAiwaRcT501MinRepeats);
irsend.sendAiwaRCT501(code, bits, repeat);
break;
#endif
#if SEND_LG
case LG: // 10
if (bits == 0)
bits = LG_BITS;
bits = kLgBits;
irsend.sendLG(code, bits, repeat);
break;
#endif
#if SEND_MITSUBISHI
case MITSUBISHI: // 12
if (bits == 0)
bits = MITSUBISHI_BITS;
repeat = std::max(repeat, (uint16_t) MITSUBISHI_MIN_REPEAT);
bits = kMitsubishiBits;
repeat = std::max(repeat, kMitsubishiMinRepeat);
irsend.sendMitsubishi(code, bits, repeat);
break;
#endif
#if SEND_DISH
case DISH: // 13
if (bits == 0)
bits = DISH_BITS;
repeat = std::max(repeat, (uint16_t) DISH_MIN_REPEAT);
bits = kDishBits;
repeat = std::max(repeat, kDishMinRepeat);
irsend.sendDISH(code, bits, repeat);
break;
#endif
#if SEND_SHARP
case SHARP: // 14
if (bits == 0)
bits = SHARP_BITS;
bits = kSharpBits;
irsend.sendSharpRaw(code, bits, repeat);
break;
#endif
#if SEND_COOLIX
case COOLIX: // 15
if (bits == 0)
bits = COOLIX_BITS;
bits = kCoolixBits;
irsend.sendCOOLIX(code, bits, repeat);
break;
#endif
@@ -1173,29 +1182,29 @@ void sendIRCode(int const ir_type, uint64_t const code, char const * code_str,
#if SEND_SHERWOOD
case SHERWOOD: // 19
if (bits == 0)
bits = SHERWOOD_BITS;
repeat = std::max(repeat, (uint16_t) SHERWOOD_MIN_REPEAT);
bits = kSherwoodBits;
repeat = std::max(repeat, kSherwoodMinRepeat);
irsend.sendSherwood(code, bits, repeat);
break;
#endif
#if SEND_RCMM
case RCMM: // 21
if (bits == 0)
bits = RCMM_BITS;
bits = kRCMMBits;
irsend.sendRCMM(code, bits, repeat);
break;
#endif
#if SEND_SANYO
case SANYO_LC7461: // 22
if (bits == 0)
bits = SANYO_LC7461_BITS;
bits = kSanyoLC7461Bits;
irsend.sendSanyoLC7461(code, bits, repeat);
break;
#endif
#if SEND_RC5
case RC5X: // 23
if (bits == 0)
bits = RC5X_BITS;
bits = kRC5XBits;
irsend.sendRC5(code, bits, repeat);
break;
#endif
@@ -1207,7 +1216,7 @@ void sendIRCode(int const ir_type, uint64_t const code, char const * code_str,
#if SEND_NIKAI
case NIKAI: // 29
if (bits == 0)
bits = NIKAI_BITS;
bits = kNikaiBits;
irsend.sendNikai(code, bits, repeat);
break;
#endif
@@ -1224,46 +1233,53 @@ void sendIRCode(int const ir_type, uint64_t const code, char const * code_str,
#if SEND_MIDEA
case MIDEA: // 34
if (bits == 0)
bits = MIDEA_BITS;
bits = kMideaBits;
irsend.sendMidea(code, bits, repeat);
break;
#endif
#if SEND_MAGIQUEST
case MAGIQUEST: // 35
if (bits == 0)
bits = MAGIQUEST_BITS;
bits = kMagiquestBits;
irsend.sendMagiQuest(code, bits, repeat);
break;
#endif
#if SEND_LASERTAG
case LASERTAG: // 36
if (bits == 0)
bits = LASERTAG_BITS;
bits = kLasertagBits;
irsend.sendLasertag(code, bits, repeat);
break;
#endif
#if SEND_CARRIER_AC
case CARRIER_AC: // 37
if (bits == 0)
bits = CARRIER_AC_BITS;
bits = kCarrierAcBits;
irsend.sendCarrierAC(code, bits, repeat);
break;
#endif
#if SEND_MITSUBISHI2
case MITSUBISHI2: // 39
if (bits == 0)
bits = MITSUBISHI_BITS;
repeat = std::max(repeat, (uint16_t) MITSUBISHI_MIN_REPEAT);
bits = kMitsubishiBits;
repeat = std::max(repeat, kMitsubishiMinRepeat);
irsend.sendMitsubishi2(code, bits, repeat);
break;
#endif
#if SEND_GICABLE
case GICABLE: // 43
if (bits == 0)
bits = GICABLE_BITS;
repeat = std::max(repeat, (uint16_t) GICABLE_MIN_REPEAT);
bits = kGicableBits;
repeat = std::max(repeat, kGicableMinRepeat);
irsend.sendGICable(code, bits, repeat);
break;
#endif
#if SEND_LUTRON
case LUTRON: // 47
if (bits == 0)
bits = kLutronBits;
irsend.sendLutron(code, bits, repeat);
break;
#endif
}
sendReqCounter++;

14
examples/IRServer/IRServer.ino
View File

@@ -4,7 +4,7 @@
* Copyright 2015 Mark Szabo
*
* An IR LED circuit *MUST* be connected to the ESP8266 on a pin
* as specified by IR_LED below.
* as specified by kIrLed below.
*
* TL;DR: The IR LED needs to be driven by a transistor for a good result.
*
@@ -36,15 +36,15 @@
#include <IRsend.h>
#include <WiFiClient.h>
const char* ssid = ".....";
const char* password = ".....";
const char* kSsid = ".....";
const char* kPassword = ".....";
MDNSResponder mdns;
ESP8266WebServer server(80);
#define IR_LED 4 // ESP8266 GPIO pin to use. Recommended: 4 (D2).
const uint16_t kIrLed = 4; // ESP8266 GPIO pin to use. Recommended: 4 (D2).
IRsend irsend(IR_LED); // Set the GPIO to be used to sending the message.
IRsend irsend(kIrLed); // Set the GPIO to be used to sending the message.
void handleRoot() {
server.send(200, "text/html",
@@ -90,7 +90,7 @@ void setup(void) {
irsend.begin();
Serial.begin(115200);
WiFi.begin(ssid, password);
WiFi.begin(kSsid, kPassword);
Serial.println("");
// Wait for connection
@@ -100,7 +100,7 @@ void setup(void) {
}
Serial.println("");
Serial.print("Connected to ");
Serial.println(ssid);
Serial.println(kSsid);
Serial.print("IP address: ");
Serial.println(WiFi.localIP().toString());

8
examples/IRrecvDemo/IRrecvDemo.ino
View File

@@ -3,7 +3,7 @@
* This is very simple teaching code to show you how to use the library.
* If you are trying to decode your Infra-Red remote(s) for later replay,
* use the IRrecvDumpV2.ino example code instead of this.
* An IR detector/demodulator must be connected to the input RECV_PIN.
* An IR detector/demodulator must be connected to the input kRecvPin.
* Copyright 2009 Ken Shirriff, http://arcfn.com
* Example circuit diagram:
* https://github.com/markszabo/IRremoteESP8266/wiki#ir-receiving
@@ -25,9 +25,9 @@
// An IR detector/demodulator is connected to GPIO pin 14(D5 on a NodeMCU
// board).
uint16_t RECV_PIN = 14;
const uint16_t kRecvPin = 14;
IRrecv irrecv(RECV_PIN);
IRrecv irrecv(kRecvPin);
decode_results results;
@@ -38,7 +38,7 @@ void setup() {
delay(50);
Serial.println();
Serial.print("IRrecvDemo is now running and waiting for IR message on Pin ");
Serial.println(RECV_PIN);
Serial.println(kRecvPin);
}
void loop() {

4
examples/IRrecvDump/IRrecvDump.ino
View File

@@ -86,10 +86,10 @@ void dump(decode_results *results) {
if (i % 100 == 0)
yield(); // Preemptive yield every 100th entry to feed the WDT.
if (i & 1) {
Serial.print(results->rawbuf[i] * RAWTICK, DEC);
Serial.print(results->rawbuf[i] * kRawTick, DEC);
} else {
Serial.print(", ");
Serial.print((uint32_t) results->rawbuf[i] * RAWTICK, DEC);
Serial.print((uint32_t) results->rawbuf[i] * kRawTick, DEC);
}
}
Serial.println("};");

90
examples/IRrecvDumpV2/IRrecvDumpV2.ino
View File

@@ -1,6 +1,6 @@
/*
* IRremoteESP8266: IRrecvDumpV2 - dump details of IR codes with IRrecv
* An IR detector/demodulator must be connected to the input RECV_PIN.
* An IR detector/demodulator must be connected to the input kRecvPin.
*
* Copyright 2009 Ken Shirriff, http://arcfn.com
* Copyright 2017 David Conran
@@ -25,33 +25,35 @@
#include <IRremoteESP8266.h>
#include <IRrecv.h>
#include <IRutils.h>
#if DECODE_AC
// The following are only needed for extended decoding of A/C Messages
#include <ir_Coolix.h>
#include <ir_Daikin.h>
#include <ir_Fujitsu.h>
#include <ir_Gree.h>
#include <ir_Haier.h>
#include <ir_Kelvinator.h>
#include <ir_Mitsubishi.h>
#include <ir_Midea.h>
#include <ir_Samsung.h>
#include <ir_Toshiba.h>
#endif // DECODE_AC
// ==================== start of TUNEABLE PARAMETERS ====================
// An IR detector/demodulator is connected to GPIO pin 14
// e.g. D5 on a NodeMCU board.
#define RECV_PIN 14
const uint16_t kRecvPin = 14;
// The Serial connection baud rate.
// i.e. Status message will be sent to the PC at this baud rate.
// Try to avoid slow speeds like 9600, as you will miss messages and
// cause other problems. 115200 (or faster) is recommended.
// NOTE: Make sure you set your Serial Monitor to the same speed.
#define BAUD_RATE 115200
const uint32_t kBaudRate = 115200;
// As this program is a special purpose capture/decoder, let us use a larger
// than normal buffer so we can handle Air Conditioner remote codes.
#define CAPTURE_BUFFER_SIZE 1024
const uint16_t kCaptureBufferSize = 1024;
// TIMEOUT is the Nr. of milli-Seconds of no-more-data before we consider a
// kTimeout is the Nr. of milli-Seconds of no-more-data before we consider a
// message ended.
// This parameter is an interesting trade-off. The longer the timeout, the more
// complex a message it can capture. e.g. Some device protocols will send
@@ -63,33 +65,34 @@
// them is often also around 20+ms. This can result in the raw data be 2-3+
// times larger than needed as it has captured 2-3+ messages in a single
// capture. Setting a low timeout value can resolve this.
// So, choosing the best TIMEOUT value for your use particular case is
// So, choosing the best kTimeout value for your use particular case is
// quite nuanced. Good luck and happy hunting.
// NOTE: Don't exceed MAX_TIMEOUT_MS. Typically 130ms.
// NOTE: Don't exceed kMaxTimeoutMs. Typically 130ms.
#if DECODE_AC
#define TIMEOUT 50U // Some A/C units have gaps in their protocols of ~40ms.
// e.g. Kelvinator
// A value this large may swallow repeats of some protocols
// Some A/C units have gaps in their protocols of ~40ms. e.g. Kelvinator
// A value this large may swallow repeats of some protocols
const uint8_t kTimeout = 50;
#else // DECODE_AC
#define TIMEOUT 15U // Suits most messages, while not swallowing many repeats.
// Suits most messages, while not swallowing many repeats.
const uint8_t kTimeout = 15;
#endif // DECODE_AC
// Alternatives:
// #define TIMEOUT 90U // Suits messages with big gaps like XMP-1 & some aircon
// units, but can accidentally swallow repeated messages
// in the rawData[] output.
// #define TIMEOUT MAX_TIMEOUT_MS // This will set it to our currently allowed
// maximum. Values this high are problematic
// because it is roughly the typical boundary
// where most messages repeat.
// e.g. It will stop decoding a message and
// start sending it to serial at precisely
// the time when the next message is likely
// to be transmitted, and may miss it.
// const uint8_t kTimeout = 90;
// Suits messages with big gaps like XMP-1 & some aircon units, but can
// accidentally swallow repeated messages in the rawData[] output.
//
// const uint8_t kTimeout = kMaxTimeoutMs;
// This will set it to our currently allowed maximum.
// Values this high are problematic because it is roughly the typical boundary
// where most messages repeat.
// e.g. It will stop decoding a message and start sending it to serial at
// precisely the time when the next message is likely to be transmitted,
// and may miss it.
// Set the smallest sized "UNKNOWN" message packets we actually care about.
// This value helps reduce the false-positive detection rate of IR background
// noise as real messages. The chances of background IR noise getting detected
// as a message increases with the length of the TIMEOUT value. (See above)
// as a message increases with the length of the kTimeout value. (See above)
// The downside of setting this message too large is you can miss some valid
// short messages for protocols that this library doesn't yet decode.
//
@@ -98,12 +101,12 @@
// Set lower if you are sure your setup is working, but it doesn't see messages
// from your device. (e.g. Other IR remotes work.)
// NOTE: Set this value very high to effectively turn off UNKNOWN detection.
#define MIN_UNKNOWN_SIZE 12
const uint16_t kMinUnknownSize = 12;
// ==================== end of TUNEABLE PARAMETERS ====================
// Use turn on the save buffer feature for more complete capture coverage.
IRrecv irrecv(RECV_PIN, CAPTURE_BUFFER_SIZE, TIMEOUT, true);
IRrecv irrecv(kRecvPin, kCaptureBufferSize, kTimeout, true);
decode_results results; // Somewhere to store the results
@@ -131,6 +134,15 @@ void dumpACInfo(decode_results *results) {
description = ac.toString();
}
#endif // DECODE_KELVINATOR
#if DECODE_MITSUBISHI_AC
if (results->decode_type == MITSUBISHI_AC) {
IRMitsubishiAC ac(0);
ac.setRaw(results->state);
description = ac.toString();
} else {
Serial.println("Not Mitsu AC.");
}
#endif // DECODE_MITSUBISHI_AC
#if DECODE_TOSHIBA_AC
if (results->decode_type == TOSHIBA_AC) {
IRToshibaAC ac(0);
@@ -166,22 +178,36 @@ void dumpACInfo(decode_results *results) {
description = ac.toString();
}
#endif // DECODE_HAIER_AC_YRW02
#if DECODE_SAMSUNG_AC
if (results->decode_type == SAMSUNG_AC) {
IRSamsungAc ac(0);
ac.setRaw(results->state);
description = ac.toString();
}
#endif // DECODE_SAMSUNG_AC
#if DECODE_COOLIX
if (results->decode_type == COOLIX) {
IRCoolixAC ac(0);
ac.setRaw(results->value); // Coolix uses value instead of state.
description = ac.toString();
}
#endif // DECODE_COOLIX
// If we got a human-readable description of the message, display it.
if (description != "") Serial.println("Mesg Desc.: " + description);
}
// The section of code run only once at start-up.
void setup() {
Serial.begin(BAUD_RATE, SERIAL_8N1, SERIAL_TX_ONLY);
Serial.begin(kBaudRate, SERIAL_8N1, SERIAL_TX_ONLY);
while (!Serial) // Wait for the serial connection to be establised.
delay(50);
Serial.println();
Serial.print("IRrecvDumpV2 is now running and waiting for IR input on Pin ");
Serial.println(RECV_PIN);
Serial.println(kRecvPin);
#if DECODE_HASH
// Ignore messages with less than minimum on or off pulses.
irrecv.setUnknownThreshold(MIN_UNKNOWN_SIZE);
irrecv.setUnknownThreshold(kMinUnknownSize);
#endif // DECODE_HASH
irrecv.enableIRIn(); // Start the receiver
}
@@ -197,8 +223,8 @@ void loop() {
if (results.overflow)
Serial.printf("WARNING: IR code is too big for buffer (>= %d). "
"This result shouldn't be trusted until this is resolved. "
"Edit & increase CAPTURE_BUFFER_SIZE.\n",
CAPTURE_BUFFER_SIZE);
"Edit & increase kCaptureBufferSize.\n",
kCaptureBufferSize);
// Display the basic output of what we found.
Serial.print(resultToHumanReadableBasic(&results));
dumpACInfo(&results); // Display any extra A/C info if we have it.

6
examples/IRsendDemo/IRsendDemo.ino
View File

@@ -5,7 +5,7 @@
* Copyright 2009 Ken Shirriff, http://arcfn.com
*
* An IR LED circuit *MUST* be connected to the ESP8266 on a pin
* as specified by IR_LED below.
* as specified by kIrLed below.
*
* TL;DR: The IR LED needs to be driven by a transistor for a good result.
*
@@ -34,9 +34,9 @@
#include <IRremoteESP8266.h>
#include <IRsend.h>
#define IR_LED 4 // ESP8266 GPIO pin to use. Recommended: 4 (D2).
const uint16_t kIrLed = 4; // ESP8266 GPIO pin to use. Recommended: 4 (D2).
IRsend irsend(IR_LED); // Set the GPIO to be used to sending the message.
IRsend irsend(kIrLed); // Set the GPIO to be used to sending the message.
// Example of data captured by IRrecvDumpV2.ino
uint16_t rawData[67] = {9000, 4500, 650, 550, 650, 1650, 600, 550, 650, 550,

6
examples/IRsendProntoDemo/IRsendProntoDemo.ino
View File

@@ -6,7 +6,7 @@
* Version 1.0 June, 2017
*
* An IR LED circuit *MUST* be connected to ESP8266 pin 4 (D2), unless you
* change the IR_LED value below.
* change the kIrLed value below.
*
* TL;DR: The IR LED needs to be driven by a transistor for a good result.
*
@@ -35,9 +35,9 @@
#include <IRremoteESP8266.h>
#include <IRsend.h>
#define IR_LED 4 // ESP8266 GPIO pin to use. Recommended: 4 (D2).
const uint16_t kIrLed = 4; // ESP8266 GPIO pin to use. Recommended: 4 (D2).
IRsend irsend(IR_LED); // Set the GPIO to be used to sending the message.
IRsend irsend(kIrLed); // Set the GPIO to be used to sending the message.
// Panasonic Plasma TV Descrete code (Power On).
// Acquired from:

22
examples/JVCPanasonicSendDemo/JVCPanasonicSendDemo.ino
View File

@@ -5,7 +5,7 @@
* JVC and Panasonic protocol added by Kristian Lauszus (Thanks to zenwheel and other people at the original blog post)
*
* An IR LED circuit *MUST* be connected to the ESP8266 on a pin
* as specified by IR_LED below.
* as specified by kIrLed below.
*
* TL;DR: The IR LED needs to be driven by a transistor for a good result.
*
@@ -34,14 +34,13 @@
#include <IRremoteESP8266.h>
#include <IRsend.h>
#define PanasonicAddress 0x4004 // Panasonic address (Pre data)
#define PanasonicPower 0x100BCBD // Panasonic Power button
const uint16_t kPanasonicAddress = 0x4004; // Panasonic address (Pre data)
const uint32_t kPanasonicPower = 0x100BCBD; // Panasonic Power button
const uint16_t kJVCPower = 0xC5E8;
#define JVCPower 0xC5E8
const uint16_t kIrLed = 4; // ESP8266 GPIO pin to use. Recommended: 4 (D2).
#define IR_LED 4 // ESP8266 GPIO pin to use. Recommended: 4 (D2).
IRsend irsend(IR_LED); // Set the GPIO to be used to sending the message.
IRsend irsend(kIrLed); // Set the GPIO to be used to sending the message.
void setup() {
irsend.begin();
@@ -50,18 +49,15 @@ void setup() {
void loop() {
// This should turn your TV on and off
#if SEND_PANASONIC
irsend.sendPanasonic(PanasonicAddress, PanasonicPower);
irsend.sendPanasonic(kPanasonicAddress, kPanasonicPower);
#else // SEND_PANASONIC
Serial.println("Can't send because SEND_PANASONIC has been disabled.");
#endif // SEND_PANASONIC
#if SEND_JVC
irsend.sendJVC(JVCPower, 16, 0); // hex value, 16 bits, no repeat
// see http://www.sbprojects.com/knowledge/ir/jvc.php for information
delayMicroseconds(50);
irsend.sendJVC(JVCPower, 16, 1); // hex value, 16 bits, repeat
delayMicroseconds(50);
irsend.sendJVC(kJVCPower, 16, 1); // hex value, 16 bits, single repeat
#else // SEND_JVC
Serial.println("Can't send because SEND_JVC has been disabled.");
#endif // SEND_JVC
delay(10000); // Wait 10 seconds before we repeat everything.
}

10
examples/LGACSend/LGACSend.ino
View File

@@ -64,9 +64,9 @@ void Ac_Activate(unsigned int temperature, unsigned int air_flow,
else
ac_msbits4 = 0; // cooling
unsigned int ac_msbits5 = (temperature < 15) ? 0 : temperature - 15;
unsigned int ac_msbits6;
unsigned int ac_msbits6 = 0;
if (0 <= air_flow && air_flow <= 2) {
if (air_flow <= 2) {
if (kAc_Type == 0)
ac_msbits6 = kAc_Flow_Tower[air_flow];
else
@@ -132,7 +132,7 @@ void setup() {
}
void loop() {
char b;
char b = ' ';
Serial.println("# a : mode or temp b : air_flow, temp, swing, clean,"
" cooling/heating");
Serial.println("# 0 : off 0");
@@ -162,7 +162,7 @@ void loop() {
default:
Serial.println("b="); // Prompt User for input
while (Serial.available() == 0) {}
char b = Serial.read();
b = Serial.read();
}
/*
@@ -198,7 +198,7 @@ void loop() {
Ac_Change_Air_Swing(1);
break;
case '3': // 1 : clean on, power on
if (b == '0' | b == '1')
if (b == '0' || b == '1')
Ac_Air_Clean(b);
break;
case '4':

17
examples/LGACSend/platformio.ini Normal file
View File

@@ -0,0 +1,17 @@
[platformio]
lib_extra_dirs = ../../
src_dir=.
[common]
build_flags =
lib_deps_builtin =
lib_deps_external =
[env:nodemcuv2]
platform = espressif8266
framework = arduino
board = nodemcuv2
build_flags = ${common.build_flags}
lib_deps =
${common.lib_deps_builtin}
${common.lib_deps_external}

6
examples/TurnOnArgoAC/TurnOnArgoAC.ino
View File

@@ -1,6 +1,6 @@
/* Copyright 2017 crankyoldgit
* An IR LED circuit *MUST* be connected to the ESP8266 on a pin
* as specified by IR_LED below.
* as specified by kIrLed below.
*
* TL;DR: The IR LED needs to be driven by a transistor for a good result.
*
@@ -30,8 +30,8 @@
#include <IRsend.h>
#include <ir_Argo.h>
#define IR_LED 4 // ESP8266 GPIO pin to use. Recommended: 4 (D2).
IRArgoAC argoir(IR_LED); // Set the GPIO to be used to sending the message.
const uint16_t kIrLed = 4; // ESP8266 GPIO pin to use. Recommended: 4 (D2).
IRArgoAC argoir(kIrLed); // Set the GPIO to be used to sending the message.
void setup() {
argoir.begin();

8
examples/TurnOnDaikinAC/TurnOnDaikinAC.ino
View File

@@ -1,7 +1,7 @@
/* Copyright 2017 sillyfrog
*
* An IR LED circuit *MUST* be connected to the ESP8266 on a pin
* as specified by IR_LED below.
* as specified by kIrLed below.
*
* TL;DR: The IR LED needs to be driven by a transistor for a good result.
*
@@ -31,8 +31,8 @@
#include <IRsend.h>
#include <ir_Daikin.h>
#define IR_LED 4 // ESP8266 GPIO pin to use. Recommended: 4 (D2).
IRDaikinESP daikinir(IR_LED); // Set the GPIO to be used to sending the message
const uint16_t kIrLed = 4; // ESP8266 GPIO pin to use. Recommended: 4 (D2).
IRDaikinESP daikinir(kIrLed); // Set the GPIO to be used to sending the message
void setup() {
daikinir.begin();
@@ -46,7 +46,7 @@ void loop() {
// Set up what we want to send. See ir_Daikin.cpp for all the options.
daikinir.on();
daikinir.setFan(1);
daikinir.setMode(DAIKIN_COOL);
daikinir.setMode(kDaikinCool);
daikinir.setTemp(25);
daikinir.setSwingVertical(false);
daikinir.setSwingHorizontal(false);

3
examples/TurnOnFujitsuAC/TurnOnFujitsuAC.ino
View File

@@ -2,7 +2,8 @@
#include <IRsend.h>
#include <ir_Fujitsu.h>
IRFujitsuAC fujitsu(5); // IR led controlled by Pin D1.
const uint16_t kIrLed = 4; // ESP8266 GPIO pin to use. Recommended: 4 (D2).
IRFujitsuAC fujitsu(kIrLed);
void printState() {
// Display the settings.

8
examples/TurnOnKelvinatorAC/TurnOnKelvinatorAC.ino
View File

@@ -1,7 +1,7 @@
/* Copyright 2016 David Conran
*
* An IR LED circuit *MUST* be connected to the ESP8266 on a pin
* as specified by IR_LED below.
* as specified by kIrLed below.
*
* TL;DR: The IR LED needs to be driven by a transistor for a good result.
*
@@ -30,8 +30,8 @@
#include <IRsend.h>
#include <ir_Kelvinator.h>
#define IR_LED 4 // ESP8266 GPIO pin to use. Recommended: 4 (D2).
IRKelvinatorAC kelvir(IR_LED); // Set the GPIO to be used for sending messages.
const uint16_t kIrLed = 4; // ESP8266 GPIO pin to use. Recommended: 4 (D2).
IRKelvinatorAC kelvir(kIrLed); // Set the GPIO to be used for sending messages.
void printState() {
// Display the settings.
@@ -47,7 +47,7 @@ void printState() {
// Display the encoded IR sequence.
unsigned char* ir_code = kelvir.getRaw();
Serial.print("IR Code: 0x");
for (uint8_t i = 0; i < KELVINATOR_STATE_LENGTH; i++)
for (uint8_t i = 0; i < kKelvinatorStateLength; i++)
Serial.printf("%02X", ir_code[i]);
Serial.println();
}

8
examples/TurnOnMitsubishiAC/TurnOnMitsubishiAC.ino
View File

@@ -1,7 +1,7 @@
/* Copyright 2017 David Conran
*
* An IR LED circuit *MUST* be connected to the ESP8266 on a pin
* as specified by IR_LED below.
* as specified by kIrLed below.
*
* TL;DR: The IR LED needs to be driven by a transistor for a good result.
*
@@ -30,8 +30,8 @@
#include <IRsend.h>
#include <ir_Mitsubishi.h>
#define IR_LED 4 // ESP8266 GPIO pin to use. Recommended: 4 (D2).
IRMitsubishiAC mitsubir(IR_LED); // Set the GPIO used for sending messages.
const uint16_t kIrLed = 4; // ESP8266 GPIO pin to use. Recommended: 4 (D2).
IRMitsubishiAC mitsubir(kIrLed); // Set the GPIO used for sending messages.
void printState() {
// Display the settings.
@@ -43,7 +43,7 @@ void printState() {
// Display the encoded IR sequence.
unsigned char* ir_code = mitsubir.getRaw();
Serial.print("IR Code: 0x");
for (uint8_t i = 0; i < MITSUBISHI_AC_STATE_LENGTH; i++)
for (uint8_t i = 0; i < kMitsubishiACStateLength; i++)
Serial.printf("%02X", ir_code[i]);
Serial.println();
}

8
examples/TurnOnToshibaAC/TurnOnToshibaAC.ino
View File

@@ -1,7 +1,7 @@
/* Copyright 2017 David Conran
*
* An IR LED circuit *MUST* be connected to the ESP8266 on a pin
* as specified by IR_LED below.
* as specified by kIrLed below.
*
* TL;DR: The IR LED needs to be driven by a transistor for a good result.
*
@@ -30,8 +30,8 @@
#include <IRsend.h>
#include <ir_Toshiba.h>
#define IR_LED 4 // ESP8266 GPIO pin to use. Recommended: 4 (D2).
IRToshibaAC toshibair(IR_LED); // Set the GPIO to be used for sending messages.
const uint16_t kIrLed = 4; // ESP8266 GPIO pin to use. Recommended: 4 (D2).
IRToshibaAC toshibair(kIrLed); // Set the GPIO to be used for sending messages.
void printState() {
// Display the settings.
@@ -42,7 +42,7 @@ void printState() {
// Display the encoded IR sequence.
unsigned char* ir_code = toshibair.getRaw();
Serial.print("IR Code: 0x");
for (uint8_t i = 0; i < TOSHIBA_AC_STATE_LENGTH; i++)
for (uint8_t i = 0; i < kToshibaACStateLength; i++)
Serial.printf("%02X", ir_code[i]);
Serial.println();
}

6
examples/TurnOnTrotecAC/TurnOnTrotecAC.ino
View File

@@ -1,6 +1,6 @@
/* Copyright 2017 stufisher
* An IR LED circuit *MUST* be connected to the ESP8266 on a pin
* as specified by IR_LED below.
* as specified by kIrLed below.
*
* TL;DR: The IR LED needs to be driven by a transistor for a good result.
*
@@ -30,8 +30,8 @@
#include <IRsend.h>
#include <ir_Trotec.h>
#define IR_LED 4 // ESP8266 GPIO pin to use. Recommended: 4 (D2).
IRTrotecESP trotecir(IR_LED); // Set the GPIO to be used for sending messages.
const uint16_t kIrLed = 4; // ESP8266 GPIO pin to use. Recommended: 4 (D2).
IRTrotecESP trotecir(kIrLed); // Set the GPIO to be used for sending messages.
void setup() {
trotecir.begin();

1315
keywords.txt
View File

File diff suppressed because it is too large Load Diff

2
library.json
View File

@@ -1,6 +1,6 @@
{
"name": "IRremoteESP8266",
"version": "2.4.3",
"version": "2.5.0",
"keywords": "infrared, ir, remote, esp8266",
"description": "Send and receive infrared signals with multiple protocols (ESP8266)",
"repository":

2
library.properties
View File

@@ -1,5 +1,5 @@
name=IRremoteESP8266
version=2.4.3
version=2.5.0
author=Sebastien Warin, Mark Szabo, Ken Shirriff, David Conran
maintainer=Mark Szabo, David Conran, Sebastien Warin, Roi Dayan, Massimiliano Pinto
sentence=Send and receive infrared signals with multiple protocols (ESP8266)

107
src/IRrecv.cpp
View File

@@ -14,6 +14,7 @@ extern "C" {
#endif
#include <algorithm>
#include "IRremoteESP8266.h"
#include "IRutils.h"
#ifdef UNIT_TEST
#undef ICACHE_RAM_ATTR
@@ -35,7 +36,7 @@ irparams_t *irparams_save; // A copy of the interrupt state while decoding.
static void ICACHE_RAM_ATTR read_timeout(void *arg __attribute__((unused))) {
os_intr_lock();
if (irparams.rawlen)
irparams.rcvstate = STATE_STOP;
irparams.rcvstate = kStopState;
os_intr_unlock();
}
@@ -57,20 +58,20 @@ static void ICACHE_RAM_ATTR gpio_intr() {
if (rawlen >= irparams.bufsize) {
irparams.overflow = true;
irparams.rcvstate = STATE_STOP;
irparams.rcvstate = kStopState;
}
if (irparams.rcvstate == STATE_STOP)
if (irparams.rcvstate == kStopState)
return;
if (irparams.rcvstate == STATE_IDLE) {
irparams.rcvstate = STATE_MARK;
if (irparams.rcvstate == kIdleState) {
irparams.rcvstate = kMarkState;
irparams.rawbuf[rawlen] = 1;
} else {
if (now < start)
irparams.rawbuf[rawlen] = (UINT32_MAX - start + now) / RAWTICK;
irparams.rawbuf[rawlen] = (UINT32_MAX - start + now) / kRawTick;
else
irparams.rawbuf[rawlen] = (now - start) / RAWTICK;
irparams.rawbuf[rawlen] = (now - start) / kRawTick;
}
irparams.rawlen++;
@@ -85,9 +86,9 @@ static void ICACHE_RAM_ATTR gpio_intr() {
// Class constructor
// Args:
// recvpin: GPIO pin the IR receiver module's data pin is connected to.
// bufsize: Nr. of entries to have in the capture buffer. (Default: RAWBUF)
// bufsize: Nr. of entries to have in the capture buffer. (Default: kRawBuf)
// timeout: Nr. of milli-Seconds of no signal before we stop capturing data.
// (Default: TIMEOUT_MS)
// (Default: kTimeoutMs)
// save_buffer: Use a second (save) buffer to decode from. (Def: false)
// Returns:
// An IRrecv class object.
@@ -97,7 +98,7 @@ IRrecv::IRrecv(uint16_t recvpin, uint16_t bufsize, uint8_t timeout,
irparams.bufsize = bufsize;
// Ensure we are going to be able to store all possible values in the
// capture buffer.
irparams.timeout = std::min(timeout, (uint8_t) MAX_TIMEOUT_MS);
irparams.timeout = std::min(timeout, (uint8_t) kMaxTimeoutMs);
irparams.rawbuf = new uint16_t[bufsize];
if (irparams.rawbuf == NULL) {
DPRINTLN("Could not allocate memory for the primary IR buffer.\n"
@@ -122,7 +123,7 @@ IRrecv::IRrecv(uint16_t recvpin, uint16_t bufsize, uint8_t timeout,
irparams_save = NULL;
}
#if DECODE_HASH
unknown_threshold = UNKNOWN_THRESHOLD;
unknown_threshold = kUnknownThreshold;
#endif // DECODE_HASH
}
@@ -159,7 +160,7 @@ void IRrecv::disableIRIn() {
}
void IRrecv::resume() {
irparams.rcvstate = STATE_IDLE;
irparams.rcvstate = kIdleState;
irparams.rawlen = 0;
irparams.overflow = false;
}
@@ -167,7 +168,7 @@ void IRrecv::resume() {
// Make a copy of the interrupt state & buffer data.
// Needed because irparams is marked as volatile, thus memcpy() isn't allowed.
// Only call this when you know the interrupt handlers won't modify anything.
// i.e. In STATE_STOP.
// i.e. In kStopState.
//
// Args:
// src: Pointer to an irparams_t structure to copy from.
@@ -223,7 +224,7 @@ void IRrecv::setUnknownThreshold(uint16_t length) {
bool IRrecv::decode(decode_results *results, irparams_t *save) {
// Proceed only if an IR message been received.
#ifndef UNIT_TEST
if (irparams.rcvstate != STATE_STOP)
if (irparams.rcvstate != kStopState)
return false;
#endif
@@ -309,6 +310,11 @@ bool IRrecv::decode(decode_results *results, irparams_t *save) {
if (decodeMitsubishi(results))
return true;
#endif
#if DECODE_MITSUBISHI_AC
DPRINTLN("Attempting Mitsubishi AC decode");
if (decodeMitsubishiAC(results))
return true;
#endif
#if DECODE_MITSUBISHI2
DPRINTLN("Attempting Mitsubishi2 decode");
if (decodeMitsubishi2(results))
@@ -341,7 +347,7 @@ bool IRrecv::decode(decode_results *results, irparams_t *save) {
DPRINTLN("Attempting Denon decode");
if (decodeDenon(results, DENON_48_BITS) ||
decodeDenon(results, DENON_BITS) ||
decodeDenon(results, DENON_LEGACY_BITS))
decodeDenon(results, kDenonLegacyBits))
return true;
#endif
#if DECODE_PANASONIC
@@ -351,11 +357,11 @@ bool IRrecv::decode(decode_results *results, irparams_t *save) {
#endif
#if DECODE_LG
DPRINTLN("Attempting LG (28-bit) decode");
if (decodeLG(results, LG_BITS, true))
if (decodeLG(results, kLgBits, true))
return true;
DPRINTLN("Attempting LG (32-bit) decode");
// LG32 should be tried before Samsung
if (decodeLG(results, LG32_BITS, true))
if (decodeLG(results, kLg32Bits, true))
return true;
#endif
#if DECODE_GICABLE
@@ -444,7 +450,7 @@ bool IRrecv::decode(decode_results *results, irparams_t *save) {
// other protocols that are NEC-like as well, as turning off strict may
// cause this to match other valid protocols.
DPRINTLN("Attempting NEC (non-strict) decode");
if (decodeNEC(results, NEC_BITS, false)) {
if (decodeNEC(results, kNECBits, false)) {
results->decode_type = NEC_LIKE;
return true;
}
@@ -474,17 +480,32 @@ bool IRrecv::decode(decode_results *results, irparams_t *save) {
#if DECODE_HITACHI_AC2
// HitachiAC2 should be checked before HitachiAC
DPRINTLN("Attempting Hitachi AC2 decode");
if (decodeHitachiAC(results, HITACHI_AC2_BITS))
if (decodeHitachiAC(results, kHitachiAc2Bits))
return true;
#endif
#if DECODE_HITACHI_AC
DPRINTLN("Attempting Hitachi AC decode");
if (decodeHitachiAC(results, HITACHI_AC_BITS))
if (decodeHitachiAC(results, kHitachiAcBits))
return true;
#endif
#if DECODE_HITACHI_AC1
DPRINTLN("Attempting Hitachi AC1 decode");
if (decodeHitachiAC(results, HITACHI_AC1_BITS))
if (decodeHitachiAC(results, kHitachiAc1Bits))
return true;
#endif
#if DECODE_WHIRLPOOL_AC
DPRINTLN("Attempting Whirlpool AC decode");
if (decodeWhirlpoolAC(results))
return true;
#endif
#if DECODE_SAMSUNG_AC
DPRINTLN("Attempting Samsung AC decode");
if (decodeSamsungAC(results))
return true;
#endif
#if DECODE_LUTRON
DPRINTLN("Attempting Lutron decode");
if (decodeLutron(results))
return true;
#endif
#if DECODE_HASH
@@ -540,7 +561,7 @@ uint32_t IRrecv::ticksHigh(uint32_t usecs, uint8_t tolerance, uint16_t delta) {
// Boolean: true if it matches, false if it doesn't.
bool IRrecv::match(uint32_t measured, uint32_t desired,
uint8_t tolerance, uint16_t delta) {
measured *= RAWTICK; // Convert to uSecs.
measured *= kRawTick; // Convert to uSecs.
DPRINT("Matching: ");
DPRINT(ticksLow(desired, tolerance, delta));
DPRINT(" <= ");
@@ -566,7 +587,7 @@ bool IRrecv::match(uint32_t measured, uint32_t desired,
// Boolean: true if it matches, false if it doesn't.
bool IRrecv::matchAtLeast(uint32_t measured, uint32_t desired,
uint8_t tolerance, uint16_t delta) {
measured *= RAWTICK; // Convert to uSecs.
measured *= kRawTick; // Convert to uSecs.
DPRINT("Matching ATLEAST ");
DPRINT(measured);
DPRINT(" vs ");
@@ -602,7 +623,7 @@ bool IRrecv::matchAtLeast(uint32_t measured, uint32_t desired,
bool IRrecv::matchMark(uint32_t measured, uint32_t desired,
uint8_t tolerance, int16_t excess) {
DPRINT("Matching MARK ");
DPRINT(measured * RAWTICK);
DPRINT(measured * kRawTick);
DPRINT(" vs ");
DPRINT(desired);
DPRINT(" + ");
@@ -625,7 +646,7 @@ bool IRrecv::matchMark(uint32_t measured, uint32_t desired,
bool IRrecv::matchSpace(uint32_t measured, uint32_t desired,
uint8_t tolerance, int16_t excess) {
DPRINT("Matching SPACE ");
DPRINT(measured * RAWTICK);
DPRINT(measured * kRawTick);
DPRINT(" vs ");
DPRINT(desired);
DPRINT(" - ");
@@ -669,7 +690,7 @@ bool IRrecv::decodeHash(decode_results *results) {
// Require at least some samples to prevent triggering on noise
if (results->rawlen < unknown_threshold)
return false;
int32_t hash = FNV_BASIS_32;
int32_t hash = kFnvBasis32;
// 'rawlen - 2' to avoid the look ahead from going out of bounds.
// Should probably be -3 to avoid comparing the trailing space entry,
// however it is left this way for compatibility with previously captured
@@ -677,7 +698,7 @@ bool IRrecv::decodeHash(decode_results *results) {
for (uint16_t i = 1; i < results->rawlen - 2; i++) {
int16_t value = compare(results->rawbuf[i], results->rawbuf[i + 2]);
// Add value into the hash
hash = (hash * FNV_PRIME_32) ^ value;
hash = (hash * kFnvPrime32) ^ value;
}
results->value = hash & 0xFFFFFFFF;
results->bits = results->rawlen / 2;
@@ -689,7 +710,8 @@ bool IRrecv::decodeHash(decode_results *results) {
#endif // DECODE_HASH
// Match & decode the typical data section of an IR message.
// The data value constructed as the Most Significant Bit first.
// The data value is stored in the least significant bits reguardless of the
// bit ordering requested.
//
// Args:
// data_ptr: A pointer to where we are at in the capture buffer.
@@ -698,16 +720,21 @@ bool IRrecv::decodeHash(decode_results *results) {
// onespace: Nr. of uSeconds in an expected space signal for a '1' bit.
// zeromark: Nr. of uSeconds in an expected mark signal for a '0' bit.
// zerospace: Nr. of uSeconds in an expected space signal for a '0' bit.
// tolerance: Percentage error margin to allow.
// tolerance: Percentage error margin to allow. (Def: kTolerance)
// excess: Nr. of useconds. (Def: kMarkExcess)
// MSBfirst: Bit order to save the data in. (Def: true)
// Returns:
// A match_result_t structure containing the success (or not), the data value,
// and how many buffer entries were used.
match_result_t IRrecv::matchData(volatile uint16_t *data_ptr,
const uint16_t nbits, const uint16_t onemark,
const uint16_t nbits,
const uint16_t onemark,
const uint32_t onespace,
const uint16_t zeromark,
const uint32_t zerospace,
const uint8_t tolerance) {
const uint8_t tolerance,
const int16_t excess,
const bool MSBfirst) {
match_result_t result;
result.success = false; // Fail by default.
result.data = 0;
@@ -715,17 +742,21 @@ match_result_t IRrecv::matchData(volatile uint16_t *data_ptr,
result.used < nbits * 2;
result.used += 2, data_ptr += 2) {
// Is the bit a '1'?
if (matchMark(*data_ptr, onemark, tolerance) &&
matchSpace(*(data_ptr + 1), onespace, tolerance))
if (matchMark(*data_ptr, onemark, tolerance, excess) &&
matchSpace(*(data_ptr + 1), onespace, tolerance, excess)) {
result.data = (result.data << 1) | 1;
// or is the bit a '0'?
else if (matchMark(*data_ptr, zeromark, tolerance) &&
matchSpace(*(data_ptr + 1), zerospace, tolerance))
result.data <<= 1;
else
} else if (matchMark(*data_ptr, zeromark, tolerance, excess) &&
matchSpace(*(data_ptr + 1), zerospace, tolerance, excess)) {
result.data <<= 1; // The bit is a '0'.
} else {
if (!MSBfirst)
result.data = reverseBits(result.data, result.used / 2);
return result; // It's neither, so fail.
}
}
result.success = true;
if (!MSBfirst)
result.data = reverseBits(result.data, nbits);
return result;
}

158
src/IRrecv.h
View File

@@ -15,40 +15,43 @@
#include "IRremoteESP8266.h"
// Constants
#define HEADER 2U // Usual nr. of header entries.
#define FOOTER 2U // Usual nr. of footer (stop bits) entries.
#define OFFSET_START 1U // Usual rawbuf entry to start processing from.
const uint16_t kHeader = 2; // Usual nr. of header entries.
const uint16_t kFooter = 2; // Usual nr. of footer (stop bits) entries.
const uint16_t kStartOffset = 1; // Usual rawbuf entry to start from.
#define MS_TO_USEC(x) (x * 1000U) // Convert milli-Seconds to micro-Seconds.
// Marks tend to be 100us too long, and spaces 100us too short
// when received due to sensor lag.
#define MARK_EXCESS 50U
#define RAWBUF 100U // Default length of raw capture buffer
#define REPEAT UINT64_MAX
#define UNKNOWN_THRESHOLD 6U // Default min size of reported UNKNOWN messages.
const uint16_t kMarkExcess = 50;
const uint16_t kRawBuf = 100; // Default length of raw capture buffer
const uint64_t kRepeat = UINT64_MAX;
// Default min size of reported UNKNOWN messages.
const uint16_t kUnknownThreshold = 6;
// receiver states
#define STATE_IDLE 2U
#define STATE_MARK 3U
#define STATE_SPACE 4U
#define STATE_STOP 5U
#define TOLERANCE 25U // default percent tolerance in measurements
#define RAWTICK 2U // Capture tick to uSec factor.
const uint8_t kIdleState = 2;
const uint8_t kMarkState = 3;
const uint8_t kSpaceState = 4;
const uint8_t kStopState = 5;
const uint8_t kTolerance = 25; // default percent tolerance in measurements.
const uint16_t kRawTick = 2; // Capture tick to uSec factor.
// How long (ms) before we give up wait for more data?
// Don't exceed MAX_TIMEOUT_MS without a good reason.
// That is the capture buffers maximum value size. (UINT16_MAX / RAWTICK)
// Don't exceed kMaxTimeoutMs without a good reason.
// That is the capture buffers maximum value size. (UINT16_MAX / kRawTick)
// Typically messages/protocols tend to repeat around the 100ms timeframe,
// thus we should timeout before that to give us some time to try to decode
// before we need to start capturing a possible new message.
// Typically 15ms suits most applications. However, some protocols demand a
// higher value. e.g. 90ms for XMP-1 and some aircon units.
#define TIMEOUT_MS 15U // In MilliSeconds.
#define MAX_TIMEOUT_MS (RAWTICK * UINT16_MAX / MS_TO_USEC(1))
const uint8_t kTimeoutMs = 15; // In MilliSeconds.
#define TIMEOUT_MS kTimeoutMs // For legacy documentation.
const uint16_t kMaxTimeoutMs = kRawTick * (UINT16_MAX / MS_TO_USEC(1));
// Use FNV hash algorithm: http://isthe.com/chongo/tech/comp/fnv/#FNV-param
#define FNV_PRIME_32 16777619UL
#define FNV_BASIS_32 2166136261UL
const uint32_t kFnvPrime32 = 16777619UL;
const uint32_t kFnvBasis32 = 2166136261UL;
// Hitachi AC is the current largest state size.
#define STATE_SIZE_MAX HITACHI_AC2_STATE_LENGTH
const uint16_t kStateSizeMax = kHitachiAc2StateLength;
// Types
// information for the interrupt handler
@@ -88,7 +91,7 @@ class decode_results {
uint32_t command; // Decoded command.
};
#if DECODE_AC // Only include state if we must. It's big.
uint8_t state[STATE_SIZE_MAX]; // Complex multi-byte A/C result.
uint8_t state[kStateSizeMax]; // Complex multi-byte A/C result.
#endif
};
uint16_t bits; // Number of bits in decoded value
@@ -101,8 +104,8 @@ class decode_results {
// main class for receiving IR
class IRrecv {
public:
explicit IRrecv(uint16_t recvpin, uint16_t bufsize = RAWBUF,
uint8_t timeout = TIMEOUT_MS,
explicit IRrecv(uint16_t recvpin, uint16_t bufsize = kRawBuf,
uint8_t timeout = kTimeoutMs,
bool save_buffer = false); // Constructor
~IRrecv(); // Destructor
bool decode(decode_results *results, irparams_t *save = NULL);
@@ -114,13 +117,13 @@ class IRrecv {
void setUnknownThreshold(uint16_t length);
#endif
static bool match(uint32_t measured, uint32_t desired,
uint8_t tolerance = TOLERANCE, uint16_t delta = 0);
uint8_t tolerance = kTolerance, uint16_t delta = 0);
static bool matchMark(uint32_t measured, uint32_t desired,
uint8_t tolerance = TOLERANCE,
int16_t excess = MARK_EXCESS);
uint8_t tolerance = kTolerance,
int16_t excess = kMarkExcess);
static bool matchSpace(uint32_t measured, uint32_t desired,
uint8_t tolerance = TOLERANCE,
int16_t excess = MARK_EXCESS);
uint8_t tolerance = kTolerance,
int16_t excess = kMarkExcess);
#ifndef UNIT_TEST
private:
@@ -132,84 +135,95 @@ class IRrecv {
// These are called by decode
void copyIrParams(volatile irparams_t *src, irparams_t *dst);
int16_t compare(uint16_t oldval, uint16_t newval);
static uint32_t ticksLow(uint32_t usecs, uint8_t tolerance = TOLERANCE,
static uint32_t ticksLow(uint32_t usecs, uint8_t tolerance = kTolerance,
uint16_t delta = 0);
static uint32_t ticksHigh(uint32_t usecs, uint8_t tolerance = TOLERANCE,
static uint32_t ticksHigh(uint32_t usecs, uint8_t tolerance = kTolerance,
uint16_t delta = 0);
bool matchAtLeast(uint32_t measured, uint32_t desired,
uint8_t tolerance = TOLERANCE, uint16_t delta = 0);
uint8_t tolerance = kTolerance, uint16_t delta = 0);
match_result_t matchData(volatile uint16_t *data_ptr, const uint16_t nbits,
const uint16_t onemark, const uint32_t onespace,
const uint16_t zeromark, const uint32_t zerospace,
const uint8_t tolerance = TOLERANCE);
const uint8_t tolerance = kTolerance,
const int16_t excess = kMarkExcess,
const bool MSBfirst = true);
bool decodeHash(decode_results *results);
#if (DECODE_NEC || DECODE_SHERWOOD || DECODE_AIWA_RC_T501 || SEND_SANYO)
bool decodeNEC(decode_results *results, uint16_t nbits = NEC_BITS,
bool decodeNEC(decode_results *results, uint16_t nbits = kNECBits,
bool strict = true);
#endif
#if DECODE_SONY
bool decodeSony(decode_results *results, uint16_t nbits = SONY_MIN_BITS,
bool decodeSony(decode_results *results, uint16_t nbits = kSonyMinBits,
bool strict = false);
#endif
#if DECODE_SANYO
// DISABLED due to poor quality.
// bool decodeSanyo(decode_results *results,
// uint16_t nbits = SANYO_SA8650B_BITS,
// uint16_t nbits = kSanyoSA8650BBits,
// bool strict = false);
bool decodeSanyoLC7461(decode_results *results,
uint16_t nbits = SANYO_LC7461_BITS,
uint16_t nbits = kSanyoLC7461Bits,
bool strict = true);
#endif
#if DECODE_MITSUBISHI
bool decodeMitsubishi(decode_results *results,
uint16_t nbits = MITSUBISHI_BITS,
uint16_t nbits = kMitsubishiBits,
bool strict = true);
#endif
#if DECODE_MITSUBISHI2
bool decodeMitsubishi2(decode_results *results,
uint16_t nbits = MITSUBISHI_BITS,
uint16_t nbits = kMitsubishiBits,
bool strict = true);
#endif
#if DECODE_MITSUBISHI_AC
bool decodeMitsubishiAC(decode_results *results,
uint16_t nbits = kMitsubishiACBits,
bool strict = false);
#endif
#if (DECODE_RC5 || DECODE_R6 || DECODE_LASERTAG)
int16_t getRClevel(decode_results *results, uint16_t *offset, uint16_t *used,
uint16_t bitTime, uint8_t tolerance = TOLERANCE,
int16_t excess = MARK_EXCESS, uint16_t delta = 0);
uint16_t bitTime, uint8_t tolerance = kTolerance,
int16_t excess = kMarkExcess, uint16_t delta = 0);
#endif
#if DECODE_RC5
bool decodeRC5(decode_results *results, uint16_t nbits = RC5X_BITS,
bool decodeRC5(decode_results *results, uint16_t nbits = kRC5XBits,
bool strict = true);
#endif
#if DECODE_RC6
bool decodeRC6(decode_results *results, uint16_t nbits = RC6_MODE0_BITS,
bool decodeRC6(decode_results *results, uint16_t nbits = kRC6Mode0Bits,
bool strict = false);
#endif
#if DECODE_RCMM
bool decodeRCMM(decode_results *results, uint16_t nbits = RCMM_BITS,
bool decodeRCMM(decode_results *results, uint16_t nbits = kRCMMBits,
bool strict = false);
#endif
#if (DECODE_PANASONIC || DECODE_DENON)
bool decodePanasonic(decode_results *results, uint16_t nbits = PANASONIC_BITS,
bool decodePanasonic(decode_results *results, uint16_t nbits = kPanasonicBits,
bool strict = false,
uint32_t manufacturer = PANASONIC_MANUFACTURER);
uint32_t manufacturer = kPanasonicManufacturer);
#endif
#if DECODE_LG
bool decodeLG(decode_results *results, uint16_t nbits = LG_BITS,
bool decodeLG(decode_results *results, uint16_t nbits = kLgBits,
bool strict = false);
#endif
#if DECODE_JVC
bool decodeJVC(decode_results *results, uint16_t nbits = JVC_BITS,
bool decodeJVC(decode_results *results, uint16_t nbits = kJvcBits,
bool strict = true);
#endif
#if DECODE_SAMSUNG
bool decodeSAMSUNG(decode_results *results, uint16_t nbits = SAMSUNG_BITS,
bool decodeSAMSUNG(decode_results *results, uint16_t nbits = kSamsungBits,
bool strict = true);
#endif
#if DECODE_SAMSUNG_AC
bool decodeSamsungAC(decode_results *results, uint16_t nbits = kSamsungAcBits,
bool strict = true);
#endif
#if DECODE_WHYNTER
bool decodeWhynter(decode_results *results, uint16_t nbits = WHYNTER_BITS,
bool decodeWhynter(decode_results *results, uint16_t nbits = kWhynterBits,
bool strict = true);
#endif
#if DECODE_COOLIX
bool decodeCOOLIX(decode_results *results, uint16_t nbits = COOLIX_BITS,
bool decodeCOOLIX(decode_results *results, uint16_t nbits = kCoolixBits,
bool strict = true);
#endif
#if DECODE_DENON
@@ -217,80 +231,88 @@ class IRrecv {
bool strict = true);
#endif
#if DECODE_DISH
bool decodeDISH(decode_results *results, uint16_t nbits = DISH_BITS,
bool decodeDISH(decode_results *results, uint16_t nbits = kDishBits,
bool strict = true);
#endif
#if (DECODE_SHARP || DECODE_DENON)
bool decodeSharp(decode_results *results, uint16_t nbits = SHARP_BITS,
bool decodeSharp(decode_results *results, uint16_t nbits = kSharpBits,
bool strict = true, bool expansion = true);
#endif
#if DECODE_AIWA_RC_T501
bool decodeAiwaRCT501(decode_results *results,
uint16_t nbits = AIWA_RC_T501_BITS, bool strict = true);
uint16_t nbits = kAiwaRcT501Bits, bool strict = true);
#endif
#if DECODE_NIKAI
bool decodeNikai(decode_results *results, uint16_t nbits = NIKAI_BITS,
bool decodeNikai(decode_results *results, uint16_t nbits = kNikaiBits,
bool strict = true);
#endif
#if DECODE_MAGIQUEST
bool decodeMagiQuest(decode_results *results, uint16_t nbits = MAGIQUEST_BITS,
bool decodeMagiQuest(decode_results *results, uint16_t nbits = kMagiquestBits,
bool strict = true);
#endif
#if DECODE_KELVINATOR
bool decodeKelvinator(decode_results *results,
uint16_t nbits = KELVINATOR_BITS,
uint16_t nbits = kKelvinatorBits,
bool strict = true);
#endif
#if DECODE_DAIKIN
bool decodeDaikin(decode_results *results, uint16_t nbits = DAIKIN_RAW_BITS,
bool decodeDaikin(decode_results *results, uint16_t nbits = kDaikinRawBits,
bool strict = true);
#endif
#if DECODE_TOSHIBA_AC
bool decodeToshibaAC(decode_results *results,
uint16_t nbytes = TOSHIBA_AC_BITS,
uint16_t nbytes = kToshibaACBits,
bool strict = true);
#endif
#if DECODE_MIDEA
bool decodeMidea(decode_results *results, uint16_t nbits = MIDEA_BITS,
bool decodeMidea(decode_results *results, uint16_t nbits = kMideaBits,
bool strict = true);
#endif
#if DECODE_FUJITSU_AC
bool decodeFujitsuAC(decode_results *results,
uint16_t nbits = FUJITSU_AC_BITS,
uint16_t nbits = kFujitsuAcBits,
bool strict = false);
#endif
#if DECODE_LASERTAG
bool decodeLasertag(decode_results *results, uint16_t nbits = LASERTAG_BITS,
bool decodeLasertag(decode_results *results, uint16_t nbits = kLasertagBits,
bool strict = true);
#endif
#if DECODE_CARRIER_AC
bool decodeCarrierAC(decode_results *results,
uint16_t nbits = CARRIER_AC_BITS,
uint16_t nbits = kCarrierAcBits,
bool strict = true);
#endif
#if DECODE_GREE
bool decodeGree(decode_results *results,
uint16_t nbits = GREE_BITS, bool strict = true);
uint16_t nbits = kGreeBits, bool strict = true);
#endif
#if (DECODE_HAIER_AC | DECODE_HAIER_AC_YRW02)
bool decodeHaierAC(decode_results *results,
uint16_t nbits = HAIER_AC_BITS, bool strict = true);
uint16_t nbits = kHaierACBits, bool strict = true);
#endif
#if DECODE_HAIER_AC_YRW02
bool decodeHaierACYRW02(decode_results *results,
uint16_t nbits = HAIER_AC_YRW02_BITS,
uint16_t nbits = kHaierACYRW02Bits,
bool strict = true);
#endif
#if (DECODE_HITACHI_AC || DECODE_HITACHI_AC2)
bool decodeHitachiAC(decode_results *results,
uint16_t nbits = HITACHI_AC_BITS, bool strict = true);
uint16_t nbits = kHitachiAcBits, bool strict = true);
#endif
#if DECODE_HITACHI_AC1
bool decodeHitachiAC1(decode_results *results,
uint16_t nbits = HITACHI_AC1_BITS, bool strict = true);
uint16_t nbits = kHitachiAc1Bits, bool strict = true);
#endif
#if DECODE_GICABLE
bool decodeGICable(decode_results *results, uint16_t nbits = GICABLE_BITS,
bool decodeGICable(decode_results *results, uint16_t nbits = kGicableBits,
bool strict = true);
#endif
#if DECODE_WHIRLPOOL_AC
bool decodeWhirlpoolAC(decode_results *results,
uint16_t nbits = kWhirlpoolAcBits, bool strict = true);
#endif
#if DECODE_LUTRON
bool decodeLutron(decode_results *results, uint16_t nbits = kLutronBits,
bool strict = true);
#endif
};

242
src/IRremoteESP8266.h
View File

@@ -48,7 +48,7 @@
#endif
// Library Version
#define _IRREMOTEESP8266_VERSION_ "2.4.3"
#define _IRREMOTEESP8266_VERSION_ "2.5.0"
// Supported IR protocols
// Each protocol you include costs memory and, during decode, costs time
// Disable (set to false) all the protocols you do not need/want!
@@ -85,6 +85,9 @@
#define DECODE_SAMSUNG true
#define SEND_SAMSUNG true
#define DECODE_SAMSUNG_AC true
#define SEND_SAMSUNG_AC true
#define DECODE_WHYNTER true
#define SEND_WHYNTER true
@@ -115,7 +118,7 @@
#define DECODE_KELVINATOR true
#define SEND_KELVINATOR true
#define DECODE_MITSUBISHI_AC false // Not written.
#define DECODE_MITSUBISHI_AC true // Beta.
#define SEND_MITSUBISHI_AC true
#define DECODE_FUJITSU_AC true
@@ -178,10 +181,17 @@
#define DECODE_HAIER_AC_YRW02 true
#define SEND_HAIER_AC_YRW02 true
#define DECODE_WHIRLPOOL_AC true
#define SEND_WHIRLPOOL_AC true
#define DECODE_LUTRON true
#define SEND_LUTRON true
#if (DECODE_ARGO || DECODE_DAIKIN || DECODE_FUJITSU_AC || DECODE_GREE || \
DECODE_KELVINATOR || DECODE_MITSUBISHI_AC || DECODE_TOSHIBA_AC || \
DECODE_TROTEC || DECODE_HAIER_AC || DECODE_HITACHI_AC || \
DECODE_HITACHI_AC1 || DECODE_HITACHI_AC2 || DECODE_HAIER_AC_YRW02)
DECODE_HITACHI_AC1 || DECODE_HITACHI_AC2 || DECODE_HAIER_AC_YRW02 || \
DECODE_WHIRLPOOL_AC || DECODE_SAMSUNG_AC)
#define DECODE_AC true // We need some common infrastructure for decoding A/Cs.
#else
#define DECODE_AC false // We don't need that infrastructure.
@@ -244,91 +254,157 @@ enum decode_type_t {
HITACHI_AC1,
HITACHI_AC2,
GICABLE,
HAIER_AC_YRW02
HAIER_AC_YRW02,
WHIRLPOOL_AC,
SAMSUNG_AC,
LUTRON
};
// Message lengths & required repeat values
#define AIWA_RC_T501_BITS 15U
#define AIWA_RC_T501_MIN_REPEAT 1U
#define COOLIX_BITS 24U
#define CARRIER_AC_BITS 32U
#define CARRIER_AC_MIN_REPEAT 0U
const uint16_t kNoRepeat = 0;
const uint16_t kSingleRepeat = 1;
const uint16_t kAiwaRcT501Bits = 15;
const uint16_t kAiwaRcT501MinRepeats = kSingleRepeat;
const uint16_t kArgoStateLength = 12;
const uint16_t kCoolixBits = 24;
const uint16_t kCarrierAcBits = 32;
const uint16_t kCarrierAcMinRepeat = kNoRepeat;
// Daikin has a lot of static stuff that is discarded
#define DAIKIN_RAW_BITS 583U
#define DAIKIN_COMMAND_LENGTH 27U
#define DAIKIN_BITS (DAIKIN_COMMAND_LENGTH * 8)
#define DENON_BITS SHARP_BITS
#define DENON_48_BITS PANASONIC_BITS
#define DENON_LEGACY_BITS 14U
#define DISH_BITS 16U
#define DISH_MIN_REPEAT 3U
#define GICABLE_BITS 16U
#define GICABLE_MIN_REPEAT 1U
#define GREE_STATE_LENGTH 8U
#define GREE_BITS (GREE_STATE_LENGTH * 8)
#define HAIER_AC_STATE_LENGTH 9U
#define HAIER_AC_BITS (HAIER_AC_STATE_LENGTH * 8)
#define HAIER_AC_YRW02_STATE_LENGTH 14U
#define HAIER_AC_YRW02_BITS (HAIER_AC_YRW02_STATE_LENGTH * 8)
#define HITACHI_AC_STATE_LENGTH 28U
#define HITACHI_AC_BITS (HITACHI_AC_STATE_LENGTH * 8)
#define HITACHI_AC1_STATE_LENGTH 13U
#define HITACHI_AC1_BITS (HITACHI_AC1_STATE_LENGTH * 8)
#define HITACHI_AC2_STATE_LENGTH 53U
#define HITACHI_AC2_BITS (HITACHI_AC2_STATE_LENGTH * 8)
#define JVC_BITS 16U
#define KELVINATOR_STATE_LENGTH 16U
#define KELVINATOR_BITS (KELVINATOR_STATE_LENGTH * 8)
#define LG_BITS 28U
#define LG32_BITS 32U
#define MITSUBISHI_BITS 16U
const uint16_t kDaikinRawBits = 583;
const uint16_t kDaikinStateLength = 27;
const uint16_t kDaikinBits = kDaikinStateLength * 8;
const uint16_t kDenonBits = 15;
const uint16_t kDenonLegacyBits = 14;
const uint16_t kDishBits = 16;
const uint16_t kDishMinRepeat = 3;
const uint16_t kFujitsuAcMinRepeat = kNoRepeat;
const uint16_t kFujitsuAcStateLength = 16;
const uint16_t kFujitsuAcStateLengthShort = 7;
const uint16_t kFujitsuAcBits = kFujitsuAcStateLength * 8;
const uint16_t kFujitsuAcMinBits = (kFujitsuAcStateLengthShort - 1) * 8;
const uint16_t kGicableBits = 16;
const uint16_t kGicableMinRepeat = kSingleRepeat;
const uint16_t kGreeStateLength = 8;
const uint16_t kGreeBits = kGreeStateLength * 8;
const uint16_t kHaierACStateLength = 9;
const uint16_t kHaierACBits = kHaierACStateLength * 8;
const uint16_t kHaierACYRW02StateLength = 14;
const uint16_t kHaierACYRW02Bits = kHaierACYRW02StateLength * 8;
const uint16_t kHitachiAcStateLength = 28;
const uint16_t kHitachiAcBits = kHitachiAcStateLength * 8;
const uint16_t kHitachiAc1StateLength = 13;
const uint16_t kHitachiAc1Bits = kHitachiAc1StateLength * 8;
const uint16_t kHitachiAc2StateLength = 53;
const uint16_t kHitachiAc2Bits = kHitachiAc2StateLength * 8;
const uint16_t kJvcBits = 16;
const uint16_t kKelvinatorStateLength = 16;
const uint16_t kKelvinatorBits = kKelvinatorStateLength * 8;
const uint16_t kLasertagBits = 13;
const uint16_t kLasertagMinRepeat = kNoRepeat;
const uint16_t kLgBits = 28;
const uint16_t kLg32Bits = 32;
const uint16_t kLutronBits = 35;
const uint16_t kMagiquestBits = 56;
const uint16_t kMideaBits = 48;
const uint16_t kMideaMinRepeat = kNoRepeat;
const uint16_t kMitsubishiBits = 16;
// TODO(anyone): Verify that the Mitsubishi repeat is really needed.
#define MITSUBISHI_MIN_REPEAT 1U // Based on marcosamarinho's code.
#define MITSUBISHI_AC_STATE_LENGTH 18U
#define MITSUBISHI_AC_MIN_REPEAT 1U
#define FUJITSU_AC_MIN_REPEAT 0U
#define FUJITSU_AC_STATE_LENGTH 16U
#define FUJITSU_AC_STATE_LENGTH_SHORT 7U
#define FUJITSU_AC_BITS (FUJITSU_AC_STATE_LENGTH * 8)
#define FUJITSU_AC_MIN_BITS ((FUJITSU_AC_STATE_LENGTH_SHORT - 1) * 8)
#define NEC_BITS 32U
#define PANASONIC_BITS 48U
#define PANASONIC_MANUFACTURER 0x4004ULL
#define PRONTO_MIN_LENGTH 6U
#define RC5_RAW_BITS 14U
#define RC5_BITS RC5_RAW_BITS - 2U
#define RC5X_BITS RC5_RAW_BITS - 1U
#define RC6_MODE0_BITS 20U // Excludes the 'start' bit.
#define RC6_36_BITS 36U // Excludes the 'start' bit.
#define RCMM_BITS 24U
#define SAMSUNG_BITS 32U
#define SANYO_SA8650B_BITS 12U
#define SANYO_LC7461_ADDRESS_BITS 13U
#define SANYO_LC7461_COMMAND_BITS 8U
#define SANYO_LC7461_BITS ((SANYO_LC7461_ADDRESS_BITS + \
SANYO_LC7461_COMMAND_BITS) * 2)
#define SHARP_ADDRESS_BITS 5U
#define SHARP_COMMAND_BITS 8U
#define SHARP_BITS (SHARP_ADDRESS_BITS + SHARP_COMMAND_BITS + 2) // 15U
#define SHERWOOD_BITS NEC_BITS
#define SHERWOOD_MIN_REPEAT 1U
#define SONY_12_BITS 12U
#define SONY_15_BITS 15U
#define SONY_20_BITS 20U
#define SONY_MIN_BITS SONY_12_BITS
#define SONY_MIN_REPEAT 2U
#define TOSHIBA_AC_STATE_LENGTH 9U
#define TOSHIBA_AC_BITS (TOSHIBA_AC_STATE_LENGTH * 8)
#define TOSHIBA_AC_MIN_REPEAT 1U
#define TROTEC_COMMAND_LENGTH 9U
#define WHYNTER_BITS 32U
#define ARGO_COMMAND_LENGTH 12U
#define NIKAI_BITS 24U
#define MAGIQUEST_BITS 56U
#define MIDEA_BITS 48U
#define MIDEA_MIN_REPEAT 0U
#define LASERTAG_BITS 13U
#define LASERTAG_MIN_REPEAT 0U
// Based on marcosamarinho's code.
const uint16_t kMitsubishiMinRepeat = kSingleRepeat;
const uint16_t kMitsubishiACStateLength = 18;
const uint16_t kMitsubishiACBits = kMitsubishiACStateLength * 8;
const uint16_t kMitsubishiACMinRepeat = kSingleRepeat;
const uint16_t kNikaiBits = 24;
const uint16_t kNECBits = 32;
const uint16_t kPanasonicBits = 48;
const uint32_t kPanasonicManufacturer = 0x4004;
const uint16_t kProntoMinLength = 6;
const uint16_t kRC5RawBits = 14;
const uint16_t kRC5Bits = kRC5RawBits - 2;
const uint16_t kRC5XBits = kRC5RawBits - 1;
const uint16_t kRC6Mode0Bits = 20; // Excludes the 'start' bit.
const uint16_t kRC6_36Bits = 36; // Excludes the 'start' bit.
const uint16_t kRCMMBits = 24;
const uint16_t kSamsungBits = 32;
const uint16_t kSamsungAcStateLength = 14;
const uint16_t kSamsungAcBits = kSamsungAcStateLength * 8;
const uint16_t kSanyoSA8650BBits = 12;
const uint16_t kSanyoLC7461AddressBits = 13;
const uint16_t kSanyoLC7461CommandBits = 8;
const uint16_t kSanyoLC7461Bits = (kSanyoLC7461AddressBits +
kSanyoLC7461CommandBits) * 2;
const uint8_t kSharpAddressBits = 5;
const uint8_t kSharpCommandBits = 8;
const uint16_t kSharpBits = kSharpAddressBits + kSharpCommandBits + 2; // 15
const uint8_t kSherwoodBits = kNECBits;
const uint16_t kSherwoodMinRepeat = kSingleRepeat;
const uint16_t kSony12Bits = 12;
const uint16_t kSony15Bits = 15;
const uint16_t kSony20Bits = 20;
const uint16_t kSonyMinBits = 12;
const uint16_t kSonyMinRepeat = 2;
const uint16_t kToshibaACStateLength = 9;
const uint16_t kToshibaACBits = kToshibaACStateLength * 8;
const uint16_t kToshibaACMinRepeat = kSingleRepeat;
const uint16_t kTrotecStateLength = 9;
const uint16_t kWhirlpoolAcStateLength = 21;
const uint16_t kWhirlpoolAcBits = kWhirlpoolAcStateLength * 8;
const uint16_t kWhynterBits = 32;
// Legacy defines. (Deprecated)
#define AIWA_RC_T501_BITS kAiwaRcT501Bits
#define ARGO_COMMAND_LENGTH kArgoStateLength
#define COOLIX_BITS kCoolixBits
#define CARRIER_AC_BITS kCarrierAcBits
#define DAIKIN_COMMAND_LENGTH kDaikinStateLength
#define DENON_BITS kDenonBits
#define DENON_48_BITS kPanasonicBits
#define DENON_LEGACY_BITS kDenonLegacyBits
#define DISH_BITS kDishBits
#define FUJITSU_AC_MIN_REPEAT kFujitsuAcMinRepeat
#define FUJITSU_AC_STATE_LENGTH kFujitsuAcStateLength
#define FUJITSU_AC_STATE_LENGTH_SHORT kFujitsuAcStateLengthShort
#define FUJITSU_AC_BITS kFujitsuAcBits
#define FUJITSU_AC_MIN_BITS kFujitsuAcMinBits
#define GICABLE_BITS kGicableBits
#define GREE_STATE_LENGTH kGreeStateLength
#define HAIER_AC_STATE_LENGTH kHaierACStateLength
#define HAIER_AC_YRW02_STATE_LENGTH kHaierACYRW02StateLength
#define HITACHI_AC_STATE_LENGTH kHitachiAcStateLength
#define HITACHI_AC_BITS kHitachiAcBits
#define HITACHI_AC1_STATE_LENGTH kHitachiAc1StateLength
#define HITACHI_AC1_BITS kHitachiAc1Bits
#define HITACHI_AC2_STATE_LENGTH kHitachiAc2StateLength
#define HITACHI_AC2_BITS kHitachiAc2Bits
#define JVC_BITS kJvcBits
#define KELVINATOR_STATE_LENGTH kKelvinatorStateLength
#define LASERTAG_BITS kLasertagBits
#define LG_BITS kLgBits
#define LG32_BITS kLg32Bits
#define MAGIQUEST_BITS kMagiquestBits
#define MIDEA_BITS kMideaBits
#define MITSUBISHI_BITS kMitsubishiBits
#define MITSUBISHI_AC_STATE_LENGTH kMitsubishiACStateLength
#define NEC_BITS kNECBits
#define NIKAI_BITS kNikaiBits
#define PANASONIC_BITS kPanasonicBits
#define RC5_BITS kRC5Bits
#define RC5X_BITS kRC5XBits
#define RC6_MODE0_BITS kRC6Mode0Bits
#define RC6_36_BITS kRC6_36Bits
#define RCMM_BITS kRCMMBits
#define SANYO_LC7461_BITS kSanyoLC7461Bits
#define SAMSUNG_BITS kSamsungBits
#define SANYO_SA8650B_BITS kSanyoSA8650BBits
#define SHARP_BITS kSharpBits
#define SHERWOOD_BITS kSherwoodBits
#define SONY_12_BITS kSony12Bits
#define SONY_15_BITS kSony15Bits
#define SONY_20_BITS kSony20Bits
#define TOSHIBA_AC_STATE_LENGTH kToshibaACStateLength
#define TROTEC_COMMAND_LENGTH kTrotecStateLength
#define WHYNTER_BITS kWhynterBits
// Turn on Debugging information by uncommenting the following line.
// #define DEBUG 1

18
src/IRsend.cpp
View File

@@ -36,7 +36,7 @@
// An IRsend object.
IRsend::IRsend(uint16_t IRsendPin, bool inverted,
bool use_modulation) : IRpin(IRsendPin),
periodOffset(PERIOD_OFFSET) {
periodOffset(kPeriodOffset) {
if (inverted) {
outputOn = LOW;
outputOff = HIGH;
@@ -46,9 +46,9 @@ IRsend::IRsend(uint16_t IRsendPin, bool inverted,
}
modulation = use_modulation;
if (modulation)
_dutycycle = DUTY_DEFAULT;
_dutycycle = kDutyDefault;
else
_dutycycle = DUTY_MAX;
_dutycycle = kDutyMax;
}
// Enable the pin for output.
@@ -104,15 +104,15 @@ uint32_t IRsend::calcUSecPeriod(uint32_t hz, bool use_offset) {
void IRsend::enableIROut(uint32_t freq, uint8_t duty) {
// Set the duty cycle to use if we want freq. modulation.
if (modulation) {
_dutycycle = std::min(duty, (uint8_t) DUTY_MAX);
_dutycycle = std::min(duty, kDutyMax);
} else {
_dutycycle = DUTY_MAX;
_dutycycle = kDutyMax;
}
if (freq < 1000) // Were we given kHz? Supports the old call usage.
freq *= 1000;
uint32_t period = calcUSecPeriod(freq);
// Nr. of uSeconds the LED will be on per pulse.
onTimePeriod = (period * _dutycycle) / DUTY_MAX;
onTimePeriod = (period * _dutycycle) / kDutyMax;
// Nr. of uSeconds the LED will be off per pulse.
offTimePeriod = period - onTimePeriod;
}
@@ -124,7 +124,7 @@ void IRsend::enableIROut(uint32_t freq, uint8_t duty) {
void IRsend::_delayMicroseconds(uint32_t usec) {
// delayMicroseconds() is only accurate to 16383us.
// Ref: https://www.arduino.cc/en/Reference/delayMicroseconds
if (usec <= MAX_ACCURATE_USEC_DELAY) {
if (usec <= kMaxAccurateUsecDelay) {
#ifndef UNIT_TEST
delayMicroseconds(usec);
#endif
@@ -146,9 +146,9 @@ void IRsend::_delayMicroseconds(uint32_t usec) {
// NOTE: Use this only if you know what you are doing as it may cause the WDT
// to reset the ESP8266.
void IRsend::_delayMicroseconds(uint32_t usec) {
for (; usec > MAX_ACCURATE_USEC_DELAY; usec -= MAX_ACCURATE_USEC_DELAY)
for (; usec > kMaxAccurateUsecDelay; usec -= kMaxAccurateUsecDelay)
#ifndef UNIT_TEST
delayMicroseconds(MAX_ACCURATE_USEC_DELAY);
delayMicroseconds(kMaxAccurateUsecDelay);
delayMicroseconds(static_cast<uint16_t>(usec));
#endif // UNIT_TEST
}

181
src/IRsend.h
View File

@@ -22,12 +22,12 @@
// Offset (in microseconds) to use in Period time calculations to account for
// code excution time in producing the software PWM signal.
// Value was calculated on Wemos D1 mini using v2.4.1 with v2.4.0 ESP core
#define PERIOD_OFFSET -5
#define DUTY_DEFAULT 50
#define DUTY_MAX 100 // Percentage
const int8_t kPeriodOffset = -5;
const uint8_t kDutyDefault = 50; // Percentage
const uint8_t kDutyMax = 100; // Percentage
// delayMicroseconds() is only accurate to 16383us.
// Ref: https://www.arduino.cc/en/Reference/delayMicroseconds
#define MAX_ACCURATE_USEC_DELAY 16383U
const uint16_t kMaxAccurateUsecDelay = 16383;
// Classes
class IRsend {
@@ -35,7 +35,7 @@ class IRsend {
explicit IRsend(uint16_t IRsendPin, bool inverted = false,
bool use_modulation = true);
void begin();
void enableIROut(uint32_t freq, uint8_t duty = DUTY_DEFAULT);
void enableIROut(uint32_t freq, uint8_t duty = kDutyDefault);
VIRTUAL void _delayMicroseconds(uint32_t usec);
VIRTUAL uint16_t mark(uint16_t usec);
VIRTUAL void space(uint32_t usec);
@@ -68,7 +68,8 @@ class IRsend {
const uint16_t repeat, const uint8_t dutycycle);
void send(uint16_t type, uint64_t data, uint16_t nbits);
#if (SEND_NEC || SEND_SHERWOOD || SEND_AIWA_RC_T501 || SEND_SANYO)
void sendNEC(uint64_t data, uint16_t nbits = NEC_BITS, uint16_t repeat = 0);
void sendNEC(uint64_t data, uint16_t nbits = kNECBits,
uint16_t repeat = kNoRepeat);
uint32_t encodeNEC(uint16_t address, uint16_t command);
#endif
#if SEND_SONY
@@ -77,22 +78,28 @@ void send(uint16_t type, uint64_t data, uint16_t nbits);
// Legacy use of this procedure was to only send a single code so call it with
// repeat=0 for backward compatibility. As of v2.0 it defaults to sending
// a Sony command that will be accepted be a device.
void sendSony(uint64_t data, uint16_t nbits = SONY_20_BITS,
uint16_t repeat = SONY_MIN_REPEAT);
void sendSony(uint64_t data, uint16_t nbits = kSony20Bits,
uint16_t repeat = kSonyMinRepeat);
uint32_t encodeSony(uint16_t nbits, uint16_t command, uint16_t address,
uint16_t extended = 0);
#endif
#if SEND_SHERWOOD
void sendSherwood(uint64_t data, uint16_t nbits = SHERWOOD_BITS,
uint16_t repeat = SHERWOOD_MIN_REPEAT);
void sendSherwood(uint64_t data, uint16_t nbits = kSherwoodBits,
uint16_t repeat = kSherwoodMinRepeat);
#endif
#if SEND_SAMSUNG
void sendSAMSUNG(uint64_t data, uint16_t nbits = SAMSUNG_BITS,
uint16_t repeat = 0);
void sendSAMSUNG(uint64_t data, uint16_t nbits = kSamsungBits,
uint16_t repeat = kNoRepeat);
uint32_t encodeSAMSUNG(uint8_t customer, uint8_t command);
#endif
#if SEND_SAMSUNG_AC
void sendSamsungAC(unsigned char data[],
uint16_t nbytes = kSamsungAcStateLength,
uint16_t repeat = kNoRepeat);
#endif
#if SEND_LG
void sendLG(uint64_t data, uint16_t nbits = LG_BITS, uint16_t repeat = 0);
void sendLG(uint64_t data, uint16_t nbits = kLgBits,
uint16_t repeat = kNoRepeat);
uint32_t encodeLG(uint16_t address, uint16_t command);
#endif
#if (SEND_SHARP || SEND_DENON)
@@ -100,41 +107,44 @@ void send(uint16_t type, uint64_t data, uint16_t nbits);
uint16_t expansion = 1, uint16_t check = 0,
bool MSBfirst = false);
void sendSharp(uint16_t address, uint16_t command,
uint16_t nbits = SHARP_BITS, uint16_t repeat = 0);
void sendSharpRaw(uint64_t data, uint16_t nbits = SHARP_BITS,
uint16_t repeat = 0);
uint16_t nbits = kSharpBits, uint16_t repeat = kNoRepeat);
void sendSharpRaw(uint64_t data, uint16_t nbits = kSharpBits,
uint16_t repeat = kNoRepeat);
#endif
#if SEND_JVC
void sendJVC(uint64_t data, uint16_t nbits = JVC_BITS, uint16_t repeat = 0);
void sendJVC(uint64_t data, uint16_t nbits = kJvcBits,
uint16_t repeat = kNoRepeat);
uint16_t encodeJVC(uint8_t address, uint8_t command);
#endif
#if SEND_DENON
void sendDenon(uint64_t data, uint16_t nbits = DENON_BITS,
uint16_t repeat = 0);
uint16_t repeat = kNoRepeat);
#endif
#if SEND_SANYO
uint64_t encodeSanyoLC7461(uint16_t address, uint8_t command);
void sendSanyoLC7461(uint64_t data, uint16_t nbits = SANYO_LC7461_BITS,
uint16_t repeat = 0);
void sendSanyoLC7461(uint64_t data, uint16_t nbits = kSanyoLC7461Bits,
uint16_t repeat = kNoRepeat);
#endif
#if SEND_DISH
// sendDISH() should typically be called with repeat=3 as DISH devices
// expect the code to be sent at least 4 times. (code + 3 repeats = 4 codes)
// Legacy use of this procedure was only to send a single code
// so use repeat=0 for backward compatibility.
void sendDISH(uint64_t data, uint16_t nbits = DISH_BITS,
uint16_t repeat = DISH_MIN_REPEAT);
void sendDISH(uint64_t data, uint16_t nbits = kDishBits,
uint16_t repeat = kDishMinRepeat);
#endif
#if (SEND_PANASONIC || SEND_DENON)
void sendPanasonic64(uint64_t data, uint16_t nbits = PANASONIC_BITS,
uint16_t repeat = 0);
void sendPanasonic64(uint64_t data, uint16_t nbits = kPanasonicBits,
uint16_t repeat = kNoRepeat);
void sendPanasonic(uint16_t address, uint32_t data,
uint16_t nbits = PANASONIC_BITS, uint16_t repeat = 0);
uint16_t nbits = kPanasonicBits,
uint16_t repeat = kNoRepeat);
uint64_t encodePanasonic(uint16_t manufacturer, uint8_t device,
uint8_t subdevice, uint8_t function);
#endif
#if SEND_RC5
void sendRC5(uint64_t data, uint16_t nbits = RC5X_BITS, uint16_t repeat = 0);
void sendRC5(uint64_t data, uint16_t nbits = kRC5XBits,
uint16_t repeat = kNoRepeat);
uint16_t encodeRC5(uint8_t address, uint8_t command,
bool key_released = false);
uint16_t encodeRC5X(uint8_t address, uint8_t command,
@@ -142,131 +152,142 @@ void send(uint16_t type, uint64_t data, uint16_t nbits);
uint64_t toggleRC5(uint64_t data);
#endif
#if SEND_RC6
void sendRC6(uint64_t data, uint16_t nbits = RC6_MODE0_BITS,
uint16_t repeat = 0);
void sendRC6(uint64_t data, uint16_t nbits = kRC6Mode0Bits,
uint16_t repeat = kNoRepeat);
uint64_t encodeRC6(uint32_t address, uint8_t command,
uint16_t mode = RC6_MODE0_BITS);
uint64_t toggleRC6(uint64_t data, uint16_t nbits = RC6_MODE0_BITS);
uint16_t mode = kRC6Mode0Bits);
uint64_t toggleRC6(uint64_t data, uint16_t nbits = kRC6Mode0Bits);
#endif
#if SEND_RCMM
void sendRCMM(uint64_t data, uint16_t nbits = RCMM_BITS, uint16_t repeat = 0);
void sendRCMM(uint64_t data, uint16_t nbits = kRCMMBits,
uint16_t repeat = kNoRepeat);
#endif
#if SEND_COOLIX
void sendCOOLIX(uint64_t data, uint16_t nbits = COOLIX_BITS,
uint16_t repeat = 0);
void sendCOOLIX(uint64_t data, uint16_t nbits = kCoolixBits,
uint16_t repeat = kNoRepeat);
#endif
#if SEND_WHYNTER
void sendWhynter(uint64_t data, uint16_t nbits = WHYNTER_BITS,
uint16_t repeat = 0);
void sendWhynter(uint64_t data, uint16_t nbits = kWhynterBits,
uint16_t repeat = kNoRepeat);
#endif
#if SEND_MITSUBISHI
void sendMitsubishi(uint64_t data, uint16_t nbits = MITSUBISHI_BITS,
uint16_t repeat = MITSUBISHI_MIN_REPEAT);
void sendMitsubishi(uint64_t data, uint16_t nbits = kMitsubishiBits,
uint16_t repeat = kMitsubishiMinRepeat);
#endif
#if SEND_MITSUBISHI2
void sendMitsubishi2(uint64_t data, uint16_t nbits = MITSUBISHI_BITS,
uint16_t repeat = MITSUBISHI_MIN_REPEAT);
void sendMitsubishi2(uint64_t data, uint16_t nbits = kMitsubishiBits,
uint16_t repeat = kMitsubishiMinRepeat);
#endif
#if SEND_MITSUBISHI_AC
void sendMitsubishiAC(unsigned char data[],
uint16_t nbytes = MITSUBISHI_AC_STATE_LENGTH,
uint16_t repeat = MITSUBISHI_AC_MIN_REPEAT);
uint16_t nbytes = kMitsubishiACStateLength,
uint16_t repeat = kMitsubishiACMinRepeat);
#endif
#if SEND_FUJITSU_AC
void sendFujitsuAC(unsigned char data[],
uint16_t nbytes,
uint16_t repeat = FUJITSU_AC_MIN_REPEAT);
uint16_t repeat = kFujitsuAcMinRepeat);
#endif
#if SEND_GLOBALCACHE
void sendGC(uint16_t buf[], uint16_t len);
#endif
#if SEND_KELVINATOR
void sendKelvinator(unsigned char data[],
uint16_t nbytes = KELVINATOR_STATE_LENGTH,
uint16_t repeat = 0);
uint16_t nbytes = kKelvinatorStateLength,
uint16_t repeat = kNoRepeat);
#endif
#if SEND_DAIKIN
void sendDaikin(unsigned char data[],
uint16_t nbytes = DAIKIN_COMMAND_LENGTH,
uint16_t repeat = 0);
uint16_t nbytes = kDaikinStateLength,
uint16_t repeat = kNoRepeat);
void sendDaikinGapHeader();
#endif
#if SEND_AIWA_RC_T501
void sendAiwaRCT501(uint64_t data, uint16_t nbits = AIWA_RC_T501_BITS,
uint16_t repeat = AIWA_RC_T501_MIN_REPEAT);
void sendAiwaRCT501(uint64_t data, uint16_t nbits = kAiwaRcT501Bits,
uint16_t repeat = kAiwaRcT501MinRepeats);
#endif
#if SEND_GREE
void sendGree(uint64_t data, uint16_t nbits = GREE_BITS, uint16_t repeat = 0);
void sendGree(uint8_t data[], uint16_t nbytes = GREE_STATE_LENGTH,
uint16_t repeat = 0);
void sendGree(uint64_t data, uint16_t nbits = kGreeBits,
uint16_t repeat = kNoRepeat);
void sendGree(uint8_t data[], uint16_t nbytes = kGreeStateLength,
uint16_t repeat = kNoRepeat);
#endif
#if SEND_PRONTO
void sendPronto(uint16_t data[], uint16_t len, uint16_t repeat = 0);
void sendPronto(uint16_t data[], uint16_t len, uint16_t repeat = kNoRepeat);
#endif
#if SEND_ARGO
void sendArgo(unsigned char data[],
uint16_t nbytes = ARGO_COMMAND_LENGTH,
uint16_t repeat = 0);
uint16_t nbytes = kArgoStateLength,
uint16_t repeat = kNoRepeat);
#endif
#if SEND_TROTEC
void sendTrotec(unsigned char data[],
uint16_t nbytes = TROTEC_COMMAND_LENGTH,
uint16_t repeat = 0);
uint16_t nbytes = kTrotecStateLength,
uint16_t repeat = kNoRepeat);
#endif
#if SEND_NIKAI
void sendNikai(uint64_t data, uint16_t nbits = NIKAI_BITS,
uint16_t repeat = 0);
void sendNikai(uint64_t data, uint16_t nbits = kNikaiBits,
uint16_t repeat = kNoRepeat);
#endif
#if SEND_TOSHIBA_AC
void sendToshibaAC(unsigned char data[],
uint16_t nbytes = TOSHIBA_AC_STATE_LENGTH,
uint16_t repeat = TOSHIBA_AC_MIN_REPEAT);
uint16_t nbytes = kToshibaACStateLength,
uint16_t repeat = kToshibaACMinRepeat);
#endif
#if SEND_MIDEA
void sendMidea(uint64_t data, uint16_t nbits = MIDEA_BITS,
uint16_t repeat = MIDEA_MIN_REPEAT);
void sendMidea(uint64_t data, uint16_t nbits = kMideaBits,
uint16_t repeat = kMideaMinRepeat);
#endif
#if SEND_MAGIQUEST
void sendMagiQuest(uint64_t data, uint16_t nbits = MAGIQUEST_BITS,
uint16_t repeat = 0);
void sendMagiQuest(uint64_t data, uint16_t nbits = kMagiquestBits,
uint16_t repeat = kNoRepeat);
uint64_t encodeMagiQuest(uint32_t wand_id, uint16_t magnitude);
#endif
#if SEND_LASERTAG
void sendLasertag(uint64_t data, uint16_t nbits = LASERTAG_BITS,
uint16_t repeat = LASERTAG_MIN_REPEAT);
void sendLasertag(uint64_t data, uint16_t nbits = kLasertagBits,
uint16_t repeat = kLasertagMinRepeat);
#endif
#if SEND_CARRIER_AC
void sendCarrierAC(uint64_t data, uint16_t nbits = CARRIER_AC_BITS,
uint16_t repeat = CARRIER_AC_MIN_REPEAT);
void sendCarrierAC(uint64_t data, uint16_t nbits = kCarrierAcBits,
uint16_t repeat = kCarrierAcMinRepeat);
#endif
#if (SEND_HAIER_AC || SEND_HAIER_AC_YRW02)
void sendHaierAC(unsigned char data[],
uint16_t nbytes = HAIER_AC_STATE_LENGTH,
uint16_t repeat = 0);
uint16_t nbytes = kHaierACStateLength,
uint16_t repeat = kNoRepeat);
#endif
#if SEND_HAIER_AC_YRW02
void sendHaierACYRW02(unsigned char data[],
uint16_t nbytes = HAIER_AC_YRW02_STATE_LENGTH,
uint16_t repeat = 0);
uint16_t nbytes = kHaierACYRW02StateLength,
uint16_t repeat = kNoRepeat);
#endif
#if SEND_HITACHI_AC
void sendHitachiAC(unsigned char data[],
uint16_t nbytes = HITACHI_AC_STATE_LENGTH,
uint16_t repeat = 0);
uint16_t nbytes = kHitachiAcStateLength,
uint16_t repeat = kNoRepeat);
#endif
#if SEND_HITACHI_AC1
void sendHitachiAC1(unsigned char data[],
uint16_t nbytes = HITACHI_AC1_STATE_LENGTH,
uint16_t repeat = 0);
uint16_t nbytes = kHitachiAc1StateLength,
uint16_t repeat = kNoRepeat);
#endif
#if SEND_HITACHI_AC2
void sendHitachiAC2(unsigned char data[],
uint16_t nbytes = HITACHI_AC2_STATE_LENGTH,
uint16_t repeat = 0);
uint16_t nbytes = kHitachiAc2StateLength,
uint16_t repeat = kNoRepeat);
#endif
#if SEND_GICABLE
void sendGICable(uint64_t data, uint16_t nbits = GICABLE_BITS,
uint16_t repeat = GICABLE_MIN_REPEAT);
void sendGICable(uint64_t data, uint16_t nbits = kGicableBits,
uint16_t repeat = kGicableMinRepeat);
#endif
#if SEND_WHIRLPOOL_AC
void sendWhirlpoolAC(unsigned char data[],
uint16_t nbytes = kWhirlpoolAcStateLength,
uint16_t repeat = kNoRepeat);
#endif
#if SEND_LUTRON
void sendLutron(uint64_t data, uint16_t nbits = kLutronBits,
uint16_t repeat = kNoRepeat);
#endif
protected:

11
src/IRutils.cpp
View File

@@ -120,6 +120,7 @@ std::string typeToString(const decode_type_t protocol,
case KELVINATOR: result = "KELVINATOR"; break;
case LG: result = "LG"; break;
case LASERTAG: result = "LASERTAG"; break;
case LUTRON: result = "LUTRON"; break;
case MAGIQUEST: result = "MAGIQUEST"; break;
case MIDEA: result = "MIDEA"; break;
case MITSUBISHI: result = "MITSUBISHI"; break;
@@ -136,6 +137,7 @@ std::string typeToString(const decode_type_t protocol,
case RC6: result = "RC6"; break;
case RCMM: result = "RCMM"; break;
case SAMSUNG: result = "SAMSUNG"; break;
case SAMSUNG_AC: result = "SAMSUNG_AC"; break;
case SANYO: result = "SANYO"; break;
case SANYO_LC7461: result = "SANYO_LC7461"; break;
case SHARP: result = "SHARP"; break;
@@ -143,6 +145,7 @@ std::string typeToString(const decode_type_t protocol,
case SONY: result = "SONY"; break;
case TOSHIBA_AC: result = "TOSHIBA_AC"; break;
case TROTEC: result = "TROTEC"; break;
case WHIRLPOOL_AC: result = "WHIRLPOOL_AC"; break;
case WHYNTER: result = "WHYNTER"; break;
}
if (isRepeat) result += " (Repeat)";
@@ -162,7 +165,9 @@ bool hasACState(const decode_type_t protocol) {
case HITACHI_AC2:
case KELVINATOR:
case MITSUBISHI_AC:
case SAMSUNG_AC:
case TOSHIBA_AC:
case WHIRLPOOL_AC:
return true;
default:
return false;
@@ -178,7 +183,7 @@ bool hasACState(const decode_type_t protocol) {
uint16_t getCorrectedRawLength(const decode_results *results) {
uint16_t extended_length = results->rawlen - 1;
for (uint16_t i = 0; i < results->rawlen - 1; i++) {
uint32_t usecs = results->rawbuf[i] * RAWTICK;
uint32_t usecs = results->rawbuf[i] * kRawTick;
// Add two extra entries for multiple larger than UINT16_MAX it is.
extended_length += (usecs / (UINT16_MAX + 1)) * 2;
}
@@ -204,7 +209,7 @@ std::string resultToSourceCode(const decode_results *results) {
// Dump data
for (uint16_t i = 1; i < results->rawlen; i++) {
uint32_t usecs;
for (usecs = results->rawbuf[i] * RAWTICK;
for (usecs = results->rawbuf[i] * kRawTick;
usecs > UINT16_MAX;
usecs -= UINT16_MAX) {
output += uint64ToString(UINT16_MAX);
@@ -281,7 +286,7 @@ std::string resultToTimingInfo(const decode_results *results) {
output += "-"; // even
else
output += " +"; // odd
value = uint64ToString(results->rawbuf[i] * RAWTICK);
value = uint64ToString(results->rawbuf[i] * kRawTick);
// Space pad the value till it is at least 6 chars long.
while (value.length() < 6)
value = " " + value;

33
src/ir_Aiwa.cpp
View File

@@ -13,12 +13,12 @@
// Added by David Conran. (Inspired by IRremoteESP8266's implementation:
// https://github.com/z3t0/Arduino-IRremote)
#define AIWA_RC_T501_PRE_BITS 26U
#define AIWA_RC_T501_POST_BITS 1U
const uint16_t kAiwaRcT501PreBits = 26;
const uint16_t kAiwaRcT501PostBits = 1;
// NOTE: These are the compliment (inverted) of lirc values as
// lirc uses a '0' for a mark, and a '1' for a space.
#define AIWA_RC_T501_PRE_DATA 0x1D8113FULL // 26-bits
#define AIWA_RC_T501_POST_DATA 1ULL
const uint64_t kAiwaRcT501PreData = 0x1D8113FULL; // 26-bits
const uint64_t kAiwaRcT501PostData = 1ULL;
#if SEND_AIWA_RC_T501
// Send an Aiwa RC T501 formatted message.
@@ -26,7 +26,7 @@
// Args:
// data: The message to be sent.
// nbits: The number of bits of the message to be sent.
// Typically AIWA_RC_T501_BITS. Max is 37 = (64 - 27)
// Typically kAiwaRcT501Bits. Max is 37 = (64 - 27)
// repeat: The number of times the command is to be repeated.
//
// Status: BETA / Should work.
@@ -38,9 +38,9 @@ void IRsend::sendAiwaRCT501(uint64_t data, uint16_t nbits, uint16_t repeat) {
// So use sendNEC instead, however the twist is it has a fixed 26 bit
// prefix, and a fixed postfix bit.
uint64_t new_data = (
(AIWA_RC_T501_PRE_DATA << (nbits + AIWA_RC_T501_POST_BITS)) |
(data << AIWA_RC_T501_POST_BITS) | AIWA_RC_T501_POST_DATA);
nbits += AIWA_RC_T501_PRE_BITS + AIWA_RC_T501_POST_BITS;
(kAiwaRcT501PreData << (nbits + kAiwaRcT501PostBits)) |
(data << kAiwaRcT501PostBits) | kAiwaRcT501PostData);
nbits += kAiwaRcT501PreBits + kAiwaRcT501PostBits;
if (nbits > sizeof(new_data) * 8)
return; // We are overflowing. Abort, and don't send.
sendNEC(new_data, nbits, repeat);
@@ -52,7 +52,7 @@ void IRsend::sendAiwaRCT501(uint64_t data, uint16_t nbits, uint16_t repeat) {
//
// Args:
// results: Ptr to the data to decode and where to store the decode result.
// nbits: The number of data bits to expect. Typically AIWA_RC_T501_BITS.
// nbits: The number of data bits to expect. Typically kAiwaRcT501Bits.
// strict: Flag indicating if we should perform strict matching.
// Returns:
// boolean: True if it can decode it, false if it can't.
@@ -71,12 +71,11 @@ void IRsend::sendAiwaRCT501(uint64_t data, uint16_t nbits, uint16_t repeat) {
bool IRrecv::decodeAiwaRCT501(decode_results *results, uint16_t nbits,
bool strict) {
// Compliance
if (strict && nbits != AIWA_RC_T501_BITS)
if (strict && nbits != kAiwaRcT501Bits)
return false; // Doesn't match our protocol defn.
// Add on the pre & post bits to our requested bit length.
uint16_t expected_nbits = nbits + AIWA_RC_T501_PRE_BITS +
AIWA_RC_T501_POST_BITS;
uint16_t expected_nbits = nbits + kAiwaRcT501PreBits + kAiwaRcT501PostBits;
uint64_t new_data;
if (expected_nbits > sizeof(new_data) * 8)
return false; // We can't possibly match something that big.
@@ -88,19 +87,19 @@ bool IRrecv::decodeAiwaRCT501(decode_results *results, uint16_t nbits,
new_data = results->value;
if (actual_bits < expected_nbits)
return false; // The data we caught was undersized. Throw it back.
if ((new_data & 0x1ULL) != AIWA_RC_T501_POST_DATA)
if ((new_data & 0x1ULL) != kAiwaRcT501PostData)
return false; // The post data doesn't match, so it can't be this protocol.
// Trim off the post data bit.
new_data >>= AIWA_RC_T501_POST_BITS;
actual_bits -= AIWA_RC_T501_POST_BITS;
new_data >>= kAiwaRcT501PostBits;
actual_bits -= kAiwaRcT501PostBits;
// Extract out our likely new value and put it back in the results.
actual_bits -= AIWA_RC_T501_PRE_BITS;
actual_bits -= kAiwaRcT501PreBits;
results->value = new_data & ((1ULL << actual_bits) - 1);
// Check the prefix data matches.
new_data >>= actual_bits; // Trim off the new data to expose the prefix.
if (new_data != AIWA_RC_T501_PRE_DATA) // Check the prefix.
if (new_data != kAiwaRcT501PreData) // Check the prefix.
return false;
// Compliance

36
src/ir_Argo.cpp
View File

@@ -11,29 +11,29 @@ Copyright 2017 Schmolders
// Constants
// using SPACE modulation. MARK is always const 400u
#define ARGO_HDR_MARK 6400U // Mark
#define ARGO_HDR_SPACE 3300U // Space
#define ARGO_BIT_MARK 400U
#define ARGO_ONE_SPACE 2200U
#define ARGO_ZERO_SPACE 900U
const uint16_t kArgoHdrMark = 6400;
const uint16_t kArgoHdrSpace = 3300;
const uint16_t kArgoBitMark = 400;
const uint16_t kArgoOneSpace = 2200;
const uint16_t kArgoZeroSpace = 900;
#if SEND_ARGO
// Send an Argo A/C message.
//
// Args:
// data: An array of ARGO_COMMAND_LENGTH bytes containing the IR command.
// data: An array of kArgoStateLength bytes containing the IR command.
//
// Status: ALPHA / Untested.
void IRsend::sendArgo(unsigned char data[], uint16_t nbytes, uint16_t repeat) {
// Check if we have enough bytes to send a proper message.
if (nbytes < ARGO_COMMAND_LENGTH) return;
if (nbytes < kArgoStateLength) return;
// TODO(kaschmo): validate
sendGeneric(ARGO_HDR_MARK, ARGO_HDR_SPACE,
ARGO_BIT_MARK, ARGO_ONE_SPACE,
ARGO_BIT_MARK, ARGO_ZERO_SPACE,
sendGeneric(kArgoHdrMark, kArgoHdrSpace,
kArgoBitMark, kArgoOneSpace,
kArgoBitMark, kArgoZeroSpace,
0, 0, // No Footer.
data, nbytes, 38, false, repeat, 50);
data, nbytes, 38, false, repeat, kDutyDefault);
}
#endif // SEND_ARGO
@@ -70,7 +70,7 @@ void IRArgoAC::checksum() {
}
void IRArgoAC::stateReset() {
for (uint8_t i = 0; i < ARGO_COMMAND_LENGTH; i++)
for (uint8_t i = 0; i < kArgoStateLength; i++)
argo[i] = 0x0;
// Argo Message. Store MSB left.
@@ -84,8 +84,8 @@ void IRArgoAC::stateReset() {
this->off();
this->setTemp(20);
this->setRoomTemp(25);
this->setCoolMode(ARGO_COOL_AUTO);
this->setFan(ARGO_FAN_AUTO);
this->setCoolMode(kArgoCoolAuto);
this->setFan(kArgoFanAuto);
}
uint8_t* IRArgoAC::getRaw() {
@@ -135,10 +135,10 @@ bool IRArgoAC::getMax() {
// Set the temp in deg C
// Sending 0 equals +4
void IRArgoAC::setTemp(uint8_t temp) {
if (temp < ARGO_MIN_TEMP)
temp = ARGO_MIN_TEMP;
else if (temp > ARGO_MAX_TEMP)
temp = ARGO_MAX_TEMP;
if (temp < kArgoMinTemp)
temp = kArgoMinTemp;
else if (temp > kArgoMaxTemp)
temp = kArgoMaxTemp;
// Store in attributes
set_temp = temp;

70
src/ir_Argo.h
View File

@@ -29,32 +29,50 @@
// Constants. Store MSB left.
#define ARGO_COOL_ON 0U // 0b000
#define ARGO_COOL_OFF 3U // 0b110
#define ARGO_COOL_AUTO 2U // 0b010
#define ARGO_COOl_HUM 1U // 0b100
const uint8_t kArgoCoolOn = 0; // 0b000
const uint8_t kArgoCoolOff = 3; // 0b110
const uint8_t kArgoCoolAuto = 2; // 0b010
const uint8_t kArgoCoolHum = 1; // 0b100
const uint8_t kArgoHeatOn = 0; // 0b001
const uint8_t kArgoHeatAuto = 1; // 0b101
const uint8_t kArgoHeatBlink = 2; // 0b011 // ??no idea what mode that is
const uint8_t kArgoMinTemp = 10; // Celsius offset +4
const uint8_t kArgoMaxTemp = 32; // Celsius
const uint8_t kArgoFanAuto = 0; // 0b00
const uint8_t kArgoFan3 = 3; // 0b11
const uint8_t kArgoFan2 = 2; // 0b01
const uint8_t kArgoFan1 = 1; // 0b10
const uint8_t kArgoFlapAuto = 0; // 0b000
const uint8_t kArgoFlap1 = 1; // 0b100
const uint8_t kArgoFlap2 = 2; // 0b010
const uint8_t kArgoFlap3 = 3; // 0b110
const uint8_t kArgoFlap4 = 4; // 0b001
const uint8_t kArgoFlap5 = 5; // 0b101
const uint8_t kArgoFlap6 = 6; // 0b011
const uint8_t kArgoFlapFull = 7; // 0b111
#define ARGO_HEAT_ON 0U // 0b001
#define ARGO_HEAT_AUTO 1U // 0b101
#define ARGO_HEAT_BLINK 2U // 0b011 // ??no idea what mode that is
#define ARGO_MIN_TEMP 10U // Celsius offset +4
#define ARGO_MAX_TEMP 32U // Celsius
#define ARGO_FAN_AUTO 0U // 0b00
#define ARGO_FAN_3 3U // 0b11
#define ARGO_FAN_2 2U // 0b01
#define ARGO_FAN_1 1U // 0b10
#define ARGO_FLAP_AUTO 0U // 0b000
#define ARGO_FLAP_1 1U // 0b100
#define ARGO_FLAP_2 2U // 0b010
#define ARGO_FLAP_3 3U // 0b110
#define ARGO_FLAP_4 4U // 0b001
#define ARGO_FLAP_5 5U // 0b101
#define ARGO_FLAP_6 6U // 0b011
#define ARGO_FLAP_FULL 7U // 0b111
// Legacy defines. (Deperecated)
#define ARGO_COOL_ON kArgoCoolOn
#define ARGO_COOL_OFF kArgoCoolOff
#define ARGO_COOL_AUTO kArgoCoolAuto
#define ARGO_COOl_HUM kArgoCoolHum
#define ARGO_HEAT_ON kArgoHeatOn
#define ARGO_HEAT_AUTO kArgoHeatAuto
#define ARGO_HEAT_BLINK kArgoHeatBlink
#define ARGO_MIN_TEMP kArgoMinTemp
#define ARGO_MAX_TEMP kArgoMaxTemp
#define ARGO_FAN_AUTO kArgoFanAuto
#define ARGO_FAN_3 kArgoFan3
#define ARGO_FAN_2 kArgoFan2
#define ARGO_FAN_1 kArgoFan1
#define ARGO_FLAP_AUTO kArgoFlapAuto
#define ARGO_FLAP_1 kArgoFlap1
#define ARGO_FLAP_2 kArgoFlap2
#define ARGO_FLAP_3 kArgoFlap3
#define ARGO_FLAP_4 kArgoFlap4
#define ARGO_FLAP_5 kArgoFlap5
#define ARGO_FLAP_6 kArgoFlap6
#define ARGO_FLAP_FULL kArgoFlapFull
class IRArgoAC {
@@ -103,7 +121,7 @@ class IRArgoAC {
private:
// # of bytes per command
uint8_t argo[ARGO_COMMAND_LENGTH]; // Defined in IRremoteESP8266.h
uint8_t argo[kArgoStateLength]; // Defined in IRremoteESP8266.h
void stateReset();
void checksum();
IRsend _irsend; // instance of the IR send class

48
src/ir_Carrier.cpp
View File

@@ -18,19 +18,19 @@
// Constants
// Ref:
// https://github.com/markszabo/IRremoteESP8266/issues/385
#define CARRIER_AC_HDR_MARK 8532U
#define CARRIER_AC_HDR_SPACE 4228U
#define CARRIER_AC_BIT_MARK 628U
#define CARRIER_AC_ONE_SPACE 1320U
#define CARRIER_AC_ZERO_SPACE 532U
#define CARRIER_AC_GAP 20000U
const uint16_t kCarrierAcHdrMark = 8532;
const uint16_t kCarrierAcHdrSpace = 4228;
const uint16_t kCarrierAcBitMark = 628;
const uint16_t kCarrierAcOneSpace = 1320;
const uint16_t kCarrierAcZeroSpace = 532;
const uint16_t kCarrierAcGap = 20000;
#if SEND_CARRIER_AC
// Send a Carrier HVAC formatted message.
//
// Args:
// data: The message to be sent.
// nbits: The bit size of the message being sent. typically CARRIER_AC_BITS.
// nbits: The bit size of the message being sent. typically kCarrierAcBits.
// repeat: The number of times the message is to be repeated.
//
// Status: BETA / Appears to work on real devices.
@@ -40,11 +40,11 @@ void IRsend::sendCarrierAC(uint64_t data, uint16_t nbits, uint16_t repeat) {
uint64_t temp_data = data;
// Carrier sends the data block three times. normal + inverted + normal.
for (uint16_t i = 0; i < 3; i++) {
sendGeneric(CARRIER_AC_HDR_MARK, CARRIER_AC_HDR_SPACE,
CARRIER_AC_BIT_MARK, CARRIER_AC_ONE_SPACE,
CARRIER_AC_BIT_MARK, CARRIER_AC_ZERO_SPACE,
CARRIER_AC_BIT_MARK, CARRIER_AC_GAP,
temp_data, nbits, 38, true, 0, 50);
sendGeneric(kCarrierAcHdrMark, kCarrierAcHdrSpace,
kCarrierAcBitMark, kCarrierAcOneSpace,
kCarrierAcBitMark, kCarrierAcZeroSpace,
kCarrierAcBitMark, kCarrierAcGap,
temp_data, nbits, 38, true, 0, kDutyDefault);
temp_data = invertBits(temp_data, nbits);
}
}
@@ -58,7 +58,7 @@ void IRsend::sendCarrierAC(uint64_t data, uint16_t nbits, uint16_t repeat) {
// Args:
// results: Ptr to the data to decode and where to store the decode result.
// nbits: Nr. of bits to expect in the data portion.
// Typically CARRIER_AC_BITS.
// Typically kCarrierAcBits.
// strict: Flag to indicate if we strictly adhere to the specification.
// Returns:
// boolean: True if it can decode it, false if it can't.
@@ -67,36 +67,36 @@ void IRsend::sendCarrierAC(uint64_t data, uint16_t nbits, uint16_t repeat) {
//
bool IRrecv::decodeCarrierAC(decode_results *results, uint16_t nbits,
bool strict) {
if (results->rawlen < ((2 * nbits + HEADER + FOOTER) * 3) - 1)
if (results->rawlen < ((2 * nbits + kHeader + kFooter) * 3) - 1)
return false; // Can't possibly be a valid Carrier message.
if (strict && nbits != CARRIER_AC_BITS)
if (strict && nbits != kCarrierAcBits)
return false; // We expect Carrier to be 32 bits of message.
uint64_t data = 0;
uint64_t prev_data = 0;
uint16_t offset = OFFSET_START;
uint16_t offset = kStartOffset;
for (uint8_t i = 0; i < 3; i++) {
prev_data = data;
// Header
if (!matchMark(results->rawbuf[offset++], CARRIER_AC_HDR_MARK))
if (!matchMark(results->rawbuf[offset++], kCarrierAcHdrMark))
return false;
if (!matchSpace(results->rawbuf[offset++], CARRIER_AC_HDR_SPACE))
if (!matchSpace(results->rawbuf[offset++], kCarrierAcHdrSpace))
return false;
// Data
match_result_t data_result = matchData(&(results->rawbuf[offset]), nbits,
CARRIER_AC_BIT_MARK,
CARRIER_AC_ONE_SPACE,
CARRIER_AC_BIT_MARK,
CARRIER_AC_ZERO_SPACE);
kCarrierAcBitMark,
kCarrierAcOneSpace,
kCarrierAcBitMark,
kCarrierAcZeroSpace);
if (data_result.success == false) return false;
data = data_result.data;
offset += data_result.used;
// Footer
if (!matchMark(results->rawbuf[offset++], CARRIER_AC_BIT_MARK))
if (!matchMark(results->rawbuf[offset++], kCarrierAcBitMark))
return false;
if (offset < results->rawlen &&
!matchAtLeast(results->rawbuf[offset++], CARRIER_AC_GAP))
!matchAtLeast(results->rawbuf[offset++], kCarrierAcGap))
return false;
// Compliance.
if (strict) {

371
src/ir_Coolix.cpp
View File

@@ -1,6 +1,11 @@
// Copyright bakrus
// Copyright 2017 David Conran
#include "ir_Coolix.h"
#include <algorithm>
#ifndef ARDUINO
#include <string>
#endif
#include "IRrecv.h"
#include "IRsend.h"
#include "IRutils.h"
@@ -12,32 +17,36 @@
// CCCCC OOOO0 OOOO0 LLLLLLL IIIII XX XX
// Coolix A/C / heatpump added by (send) bakrus & (decode) crankyoldgit
//
// Supports:
// RG57K7(B)/BGEF remote control for Beko BINR 070/071 split-type aircon.
// Ref:
// https://github.com/markszabo/IRremoteESP8266/issues/484
// Constants
// Pulse parms are *50-100 for the Mark and *50+100 for the space
// First MARK is the one after the long gap
// pulse parameters in usec
#define COOLIX_TICK 560U // Approximately 21 cycles at 38kHz
#define COOLIX_BIT_MARK_TICKS 1U
#define COOLIX_BIT_MARK (COOLIX_BIT_MARK_TICKS * COOLIX_TICK)
#define COOLIX_ONE_SPACE_TICKS 3U
#define COOLIX_ONE_SPACE (COOLIX_ONE_SPACE_TICKS * COOLIX_TICK)
#define COOLIX_ZERO_SPACE_TICKS 1U
#define COOLIX_ZERO_SPACE (COOLIX_ZERO_SPACE_TICKS * COOLIX_TICK)
#define COOLIX_HDR_MARK_TICKS 8U
#define COOLIX_HDR_MARK (COOLIX_HDR_MARK_TICKS * COOLIX_TICK)
#define COOLIX_HDR_SPACE_TICKS 8U
#define COOLIX_HDR_SPACE (COOLIX_HDR_SPACE_TICKS * COOLIX_TICK)
#define COOLIX_MIN_GAP_TICKS (COOLIX_HDR_MARK_TICKS + \
COOLIX_ZERO_SPACE_TICKS)
#define COOLIX_MIN_GAP (COOLIX_MIN_GAP_TICKS * COOLIX_TICK)
const uint16_t kCoolixTick = 560; // Approximately 21 cycles at 38kHz
const uint16_t kCoolixBitMarkTicks = 1;
const uint16_t kCoolixBitMark = kCoolixBitMarkTicks * kCoolixTick;
const uint16_t kCoolixOneSpaceTicks = 3;
const uint16_t kCoolixOneSpace = kCoolixOneSpaceTicks * kCoolixTick;
const uint16_t kCoolixZeroSpaceTicks = 1;
const uint16_t kCoolixZeroSpace = kCoolixZeroSpaceTicks * kCoolixTick;
const uint16_t kCoolixHdrMarkTicks = 8;
const uint16_t kCoolixHdrMark = kCoolixHdrMarkTicks * kCoolixTick;
const uint16_t kCoolixHdrSpaceTicks = 8;
const uint16_t kCoolixHdrSpace = kCoolixHdrSpaceTicks * kCoolixTick;
const uint16_t kCoolixMinGapTicks = kCoolixHdrMarkTicks + kCoolixZeroSpaceTicks;
const uint16_t kCoolixMinGap = kCoolixMinGapTicks * kCoolixTick;
#if SEND_COOLIX
// Send a Coolix message
//
// Args:
// data: Contents of the message to be sent.
// nbits: Nr. of bits of data to be sent. Typically COOLIX_BITS.
// nbits: Nr. of bits of data to be sent. Typically kCoolixBits.
// repeat: Nr. of additional times the message is to be sent.
//
// Status: BETA / Probably works.
@@ -54,8 +63,8 @@ void IRsend::sendCOOLIX(uint64_t data, uint16_t nbits, uint16_t repeat) {
for (uint16_t r = 0; r <= repeat; r++) {
// Header
mark(COOLIX_HDR_MARK);
space(COOLIX_HDR_SPACE);
mark(kCoolixHdrMark);
space(kCoolixHdrSpace);
// Data
// Break data into byte segments, starting at the Most Significant
@@ -64,28 +73,315 @@ void IRsend::sendCOOLIX(uint64_t data, uint16_t nbits, uint16_t repeat) {
// Grab a bytes worth of data.
uint8_t segment = (data >> (nbits - i)) & 0xFF;
// Normal
sendData(COOLIX_BIT_MARK, COOLIX_ONE_SPACE,
COOLIX_BIT_MARK, COOLIX_ZERO_SPACE,
sendData(kCoolixBitMark, kCoolixOneSpace,
kCoolixBitMark, kCoolixZeroSpace,
segment, 8, true);
// Inverted.
sendData(COOLIX_BIT_MARK, COOLIX_ONE_SPACE,
COOLIX_BIT_MARK, COOLIX_ZERO_SPACE,
sendData(kCoolixBitMark, kCoolixOneSpace,
kCoolixBitMark, kCoolixZeroSpace,
segment ^ 0xFF, 8, true);
}
// Footer
mark(COOLIX_BIT_MARK);
space(COOLIX_MIN_GAP); // Pause before repeating
mark(kCoolixBitMark);
space(kCoolixMinGap); // Pause before repeating
}
}
#endif
// IRCoolixAC class
// Supports:
// RG57K7(B)/BGEF remote control for Beko BINR 070/071 split-type aircon.
// Ref:
// https://github.com/markszabo/IRremoteESP8266/issues/484
IRCoolixAC::IRCoolixAC(uint16_t pin) : _irsend(pin) {
stateReset();
}
void IRCoolixAC::stateReset() {
remote_state = kCoolixDefaultState;
}
void IRCoolixAC::begin() {
_irsend.begin();
}
#if SEND_COOLIX
void IRCoolixAC::send() {
_irsend.sendCOOLIX(remote_state);
}
#endif // SEND_COOLIX
uint32_t IRCoolixAC::getRaw() {
return remote_state;
}
void IRCoolixAC::setRaw(const uint32_t new_code) {
remote_state = new_code;
}
void IRCoolixAC::setTempRaw(const uint8_t code) {
remote_state &= ~kCoolixTempMask; // Clear the old temp.
remote_state |= (code << 4);
}
uint8_t IRCoolixAC::getTempRaw() {
return (remote_state & kCoolixTempMask) >> 4;
}
void IRCoolixAC::setTemp(const uint8_t desired) {
// Range check.
uint8_t temp = std::min(desired, kCoolixTempMax);
temp = std::max(temp, kCoolixTempMin);
setTempRaw(kCoolixTempMap[temp - kCoolixTempMin]);
}
uint8_t IRCoolixAC::getTemp() {
uint8_t code = getTempRaw();
uint8_t i;
for (i = 0; i < kCoolixTempRange; i++)
if (kCoolixTempMap[i] == code)
return kCoolixTempMin + i;
return kCoolixUnknown; // Not a temp we expected.
}
void IRCoolixAC::setSensorTempRaw(const uint8_t code) {
remote_state &= ~kCoolixSensorTempMask; // Clear previous sensor temp.
remote_state |= ((code & 0xF) << 8);
}
void IRCoolixAC::setSensorTemp(const uint8_t desired) {
uint8_t temp = desired;
temp = std::min(temp, kCoolixSensorTempMax);
temp = std::max(temp, kCoolixSensorTempMin);
setSensorTempRaw(temp - kCoolixSensorTempMin);
setZoneFollow(true); // Setting a Sensor temp means you want to Zone Follow.
}
uint8_t IRCoolixAC::getSensorTemp() {
return ((remote_state & kCoolixSensorTempMask) >> 8) + kCoolixSensorTempMin;
}
bool IRCoolixAC::getPower() {
// There is only an off state. Everything else is "on".
return remote_state != kCoolixOff;
}
void IRCoolixAC::setPower(const bool power) {
if (!power) remote_state = kCoolixOff;
// There really is no distinct "on" setting, so do nothing.
}
bool IRCoolixAC::getSwing() {
return remote_state == kCoolixSwing;
}
void IRCoolixAC::setSwing() {
// Assumes that repeated sending "swing" toggles the action on the device.
remote_state = kCoolixSwing;
}
bool IRCoolixAC::getSleep() {
return remote_state == kCoolixSleep;
}
void IRCoolixAC::setSleep() {
remote_state = kCoolixSleep;
}
bool IRCoolixAC::getTurbo() {
return remote_state == kCoolixTurbo;
}
void IRCoolixAC::setTurbo() {
// Assumes that repeated sending "turbo" toggles the action on the device.
remote_state = kCoolixTurbo;
}
bool IRCoolixAC::getLed() {
return remote_state == kCoolixLed;
}
void IRCoolixAC::setLed() {
// Assumes that repeated sending "Led" toggles the action on the device.
remote_state = kCoolixLed;
}
bool IRCoolixAC::getClean() {
return remote_state == kCoolixClean;
}
void IRCoolixAC::setClean() {
remote_state = kCoolixClean;
}
bool IRCoolixAC::getZoneFollow() {
return remote_state & kCoolixZoneFollowMask;
}
// Internal use only.
void IRCoolixAC::setZoneFollow(bool state) {
if (state) {
remote_state |= kCoolixZoneFollowMask;
} else {
remote_state &= ~kCoolixZoneFollowMask;
}
}
void IRCoolixAC::clearSensorTemp() {
setZoneFollow(false);
setSensorTempRaw(kCoolixSensorTempIgnoreCode);
}
void IRCoolixAC::setMode(const uint8_t mode) {
uint32_t actualmode = mode;
// Fan mode is a special case of Dry.
if (mode == kCoolixFan)
actualmode = kCoolixDry;
switch (actualmode) {
case kCoolixCool:
case kCoolixAuto:
case kCoolixHeat:
case kCoolixDry:
remote_state = (remote_state & ~kCoolixModeMask) | (actualmode << 2);
// Force the temp into a known-good state.
setTemp(getTemp());
}
if (mode == kCoolixFan)
setTempRaw(kCoolixFanTempCode);
}
uint8_t IRCoolixAC::getMode() {
uint8_t mode = (remote_state & kCoolixModeMask) >> 2;
if (mode == kCoolixDry)
if (getTempRaw() == kCoolixFanTempCode)
return kCoolixFan;
return mode;
}
uint8_t IRCoolixAC::getFan() {
return (remote_state & kCoolixFanMask) >> 13;
}
void IRCoolixAC::setFan(const uint8_t speed) {
uint8_t newspeed = speed;
switch (speed) {
case kCoolixFanMin:
case kCoolixFanMed:
case kCoolixFanMax:
case kCoolixFanAuto:
case kCoolixFanZoneFollow:
case kCoolixFanFixed:
break;
default: // Unknown speed requested.
newspeed = kCoolixFanAuto;
}
remote_state &= ~kCoolixFanMask;
remote_state |= ((newspeed << 13) & kCoolixFanMask);
}
// Convert the internal state into a human readable string.
#ifdef ARDUINO
String IRCoolixAC::toString() {
String result = "";
#else
std::string IRCoolixAC::toString() {
std::string result = "";
#endif // ARDUINO
result += "Power: ";
if (getPower()) {
result += "On";
} else {
result += "Off";
return result; // If it's off, there is no other info.
}
result += ", Fan: " + uint64ToString(getFan());
switch (getFan()) {
case kCoolixFanAuto:
result += " (AUTO)";
break;
case kCoolixFanMax:
result += " (MAX)";
break;
case kCoolixFanMin:
result += " (MIN)";
break;
case kCoolixFanMed:
result += " (MED)";
break;
case kCoolixFanZoneFollow:
result += " (ZONEFOLLOW)";
break;
case kCoolixFanFixed:
result += " (FIXED)";
break;
default:
result += " (UNKNOWN)";
}
// Special modes.
if (getSwing()) {
result += ", Swing: Toggle";
return result;
}
if (getSleep()) {
result += ", Sleep: Toggle";
return result;
}
if (getTurbo()) {
result += ", Turbo: Toggle";
return result;
}
if (getLed()) {
result += ", Led: Toggle";
return result;
}
if (getClean()) {
result += ", Mode: Self clean";
return result;
}
result += ", Mode: " + uint64ToString(getMode());
switch (getMode()) {
case kCoolixAuto:
result += " (AUTO)";
break;
case kCoolixCool:
result += " (COOL)";
break;
case kCoolixHeat:
result += " (HEAT)";
break;
case kCoolixDry:
result += " (DRY)";
break;
case kCoolixFan:
result += " (FAN)";
break;
default:
result += " (UNKNOWN)";
}
if (getMode() != kCoolixFan) // Fan mode doesn't have a temperature.
result += ", Temp: " + uint64ToString(getTemp()) + "C";
result += ", Zone Follow: ";
if (getZoneFollow())
result += "On";
else
result += "Off";
result += ", Sensor Temp: ";
if (getSensorTemp() > kCoolixSensorTempMax)
result += "Ignored";
else
result += uint64ToString(getSensorTemp()) + "C";
return result;
}
#if DECODE_COOLIX
// Decode the supplied Coolix message.
//
// Args:
// results: Ptr to the data to decode and where to store the decode result.
// nbits: The number of data bits to expect. Typically COOLIX_BITS.
// nbits: The number of data bits to expect. Typically kCoolixBits.
// strict: Flag indicating if we should perform strict matching.
// Returns:
// boolean: True if it can decode it, false if it can't.
@@ -95,42 +391,43 @@ bool IRrecv::decodeCOOLIX(decode_results *results, uint16_t nbits,
bool strict) {
// The protocol sends the data normal + inverted, alternating on
// each byte. Hence twice the number of expected data bits.
if (results->rawlen < 2 * 2 * nbits + HEADER + FOOTER - 1)
if (results->rawlen < 2 * 2 * nbits + kHeader + kFooter - 1)
return false; // Can't possibly be a valid COOLIX message.
if (strict && nbits != COOLIX_BITS)
if (strict && nbits != kCoolixBits)
return false; // Not strictly a COOLIX message.
if (nbits % 8 != 0) // nbits has to be a multiple of nr. of bits in a byte.
return false;
uint64_t data = 0;
uint64_t inverted = 0;
uint16_t offset = OFFSET_START;
uint16_t offset = kStartOffset;
if (nbits > sizeof(data) * 8)
return false; // We can't possibly capture a Coolix packet that big.
// Header
if (!matchMark(results->rawbuf[offset], COOLIX_HDR_MARK)) return false;
if (!matchMark(results->rawbuf[offset], kCoolixHdrMark)) return false;
// Calculate how long the common tick time is based on the header mark.
uint32_t m_tick = results->rawbuf[offset++] * RAWTICK / COOLIX_HDR_MARK_TICKS;
if (!matchSpace(results->rawbuf[offset], COOLIX_HDR_SPACE)) return false;
uint32_t m_tick = results->rawbuf[offset++] *
kRawTick / kCoolixHdrMarkTicks;
if (!matchSpace(results->rawbuf[offset], kCoolixHdrSpace)) return false;
// Calculate how long the common tick time is based on the header space.
uint32_t s_tick = results->rawbuf[offset++] * RAWTICK /
COOLIX_HDR_SPACE_TICKS;
uint32_t s_tick = results->rawbuf[offset++] * kRawTick /
kCoolixHdrSpaceTicks;
// Data
// Twice as many bits as there are normal plus inverted bits.
for (uint16_t i = 0; i < nbits * 2; i++, offset++) {
bool flip = (i / 8) % 2;
if (!matchMark(results->rawbuf[offset++], COOLIX_BIT_MARK_TICKS * m_tick))
if (!matchMark(results->rawbuf[offset++], kCoolixBitMarkTicks * m_tick))
return false;
if (matchSpace(results->rawbuf[offset], COOLIX_ONE_SPACE_TICKS * s_tick)) {
if (matchSpace(results->rawbuf[offset], kCoolixOneSpaceTicks * s_tick)) {
if (flip)
inverted = (inverted << 1) | 1;
else
data = (data << 1) | 1;
} else if (matchSpace(results->rawbuf[offset],
COOLIX_ZERO_SPACE_TICKS * s_tick)) {
kCoolixZeroSpaceTicks * s_tick)) {
if (flip)
inverted <<= 1;
else
@@ -141,10 +438,10 @@ bool IRrecv::decodeCOOLIX(decode_results *results, uint16_t nbits,
}
// Footer
if (!matchMark(results->rawbuf[offset++], COOLIX_BIT_MARK_TICKS * m_tick))
if (!matchMark(results->rawbuf[offset++], kCoolixBitMarkTicks * m_tick))
return false;
if (offset < results->rawlen &&
!matchAtLeast(results->rawbuf[offset], COOLIX_MIN_GAP_TICKS * s_tick))
!matchAtLeast(results->rawbuf[offset], kCoolixMinGapTicks * s_tick))
return false;
// Compliance

140
src/ir_Coolix.h Normal file
View File

@@ -0,0 +1,140 @@
// Coolix A/C
//
// Copyright 2018 David Conran
#ifndef IR_COOLIX_H_
#define IR_COOLIX_H_
#define __STDC_LIMIT_MACROS
#include <stdint.h>
#ifndef UNIT_TEST
#include <Arduino.h>
#else
#include <string>
#endif
#include "IRremoteESP8266.h"
#include "IRsend.h"
// CCCCC OOOOO OOOOO LL IIIII XX XX
// CC C OO OO OO OO LL III XX XX
// CC OO OO OO OO LL III XXXX
// CC C OO OO OO OO LL III XX XX
// CCCCC OOOO0 OOOO0 LLLLLLL IIIII XX XX
// Supports:
// RG57K7(B)/BGEF remote control for Beko BINR 070/071 split-type aircon.
// Ref:
// https://github.com/markszabo/IRremoteESP8266/issues/484
// Kudos:
// Hamper: For the breakdown and mapping of the bit values.
// Constants
// Modes
const uint8_t kCoolixCool = 0b00;
const uint8_t kCoolixDry = 0b01;
const uint8_t kCoolixAuto = 0b10;
const uint8_t kCoolixHeat = 0b11;
const uint8_t kCoolixFan = 4; // Synthetic.
const uint32_t kCoolixModeMask = 0b000000000000000000001100; // 0xC
const uint32_t kCoolixZoneFollowMask = 0b000010000000000000000000; // 0x80000
// Fan Control
const uint8_t kCoolixFanMin = 0b100;
const uint8_t kCoolixFanMed = 0b010;
const uint8_t kCoolixFanMax = 0b001;
const uint8_t kCoolixFanAuto = 0b101;
const uint8_t kCoolixFanZoneFollow = 0b110;
const uint8_t kCoolixFanFixed = 0b111;
const uint32_t kCoolixFanMask = 0b000000001110000000000000; // 0x00E000
// Temperature
const uint8_t kCoolixTempMin = 17; // Celsius
const uint8_t kCoolixTempMax = 30; // Celsius
const uint8_t kCoolixTempRange = kCoolixTempMax - kCoolixTempMin + 1;
const uint8_t kCoolixFanTempCode = 0b1110; // Part of Fan Mode.
const uint32_t kCoolixTempMask = 0b11110000;
const uint8_t kCoolixTempMap[kCoolixTempRange] = {
0b0000, // 17C
0b0001, // 18c
0b0011, // 19C
0b0010, // 20C
0b0110, // 21C
0b0111, // 22C
0b0101, // 23C
0b0100, // 24C
0b1100, // 25C
0b1101, // 26C
0b1001, // 27C
0b1000, // 28C
0b1010, // 29C
0b1011 // 30C
};
const uint8_t kCoolixSensorTempMin = 16; // Celsius
const uint8_t kCoolixSensorTempMax = 30; // Celsius
const uint8_t kCoolixSensorTempIgnoreCode = 0b1111;
const uint32_t kCoolixSensorTempMask = 0b000000000000111100000000; // 0xF00
// Fixed states/messages.
const uint8_t kCoolixPrefix = 0b1011; // 0xB
const uint8_t kCoolixUnknown = 0xFF;
const uint32_t kCoolixOff = 0b101100100111101111100000; // 0xB27BE0
const uint32_t kCoolixSwing = 0b101100100110101111100000; // 0xB26BE0
const uint32_t kCoolixSleep = 0b101100101110000000000011; // 0xB2E003
const uint32_t kCoolixTurbo = 0b101101011111010110100010; // 0xB5F5A2
const uint32_t kCoolixLed = 0b101101011111010110100101; // 0xB5F5A5
const uint32_t kCoolixClean = 0b101101011111010110101010; // 0xB5F5AA
// On, 25C, Mode: Auto, Fan: Auto, Zone Follow: Off, Sensor Temp: Ignore.
const uint32_t kCoolixDefaultState = 0b101100101011111111001000; // 0xB2BFC8
// Classes
class IRCoolixAC {
public:
explicit IRCoolixAC(uint16_t pin);
void stateReset();
#if SEND_COOLIX
void send();
#endif // SEND_COOLIX
void begin();
void on();
void off();
void setPower(const bool state);
bool getPower();
void setTemp(const uint8_t temp);
uint8_t getTemp();
void setSensorTemp(const uint8_t desired);
uint8_t getSensorTemp();
void clearSensorTemp();
void setFan(const uint8_t fan);
uint8_t getFan();
void setMode(const uint8_t mode);
uint8_t getMode();
void setSwing();
bool getSwing();
void setSleep();
bool getSleep();
void setTurbo();
bool getTurbo();
void setLed();
bool getLed();
void setClean();
bool getClean();
bool getZoneFollow();
uint32_t getRaw();
void setRaw(const uint32_t new_code);
#ifdef ARDUINO
String toString();
#else
std::string toString();
#endif
private:
// The state of the IR remote in IR code form.
uint32_t remote_state;
IRsend _irsend;
void setTempRaw(const uint8_t code);
uint8_t getTempRaw();
void setSensorTempRaw(const uint8_t code);
void setZoneFollow(const bool state);
};
#endif // IR_COOLIX_H_

214
src/ir_Daikin.cpp
View File

@@ -43,7 +43,7 @@ Copyright 2017 sillyfrog, crankyoldgit
// Send a Daikin A/C message.
//
// Args:
// data: An array of DAIKIN_COMMAND_LENGTH bytes containing the IR command.
// data: An array of kDaikinStateLength bytes containing the IR command.
//
// Status: STABLE
//
@@ -52,34 +52,34 @@ Copyright 2017 sillyfrog, crankyoldgit
// https://github.com/mharizanov/Daikin-AC-remote-control-over-the-Internet/tree/master/IRremote
void IRsend::sendDaikin(unsigned char data[], uint16_t nbytes,
uint16_t repeat) {
if (nbytes < DAIKIN_COMMAND_LENGTH)
if (nbytes < kDaikinStateLength)
return; // Not enough bytes to send a proper message.
for (uint16_t r = 0; r <= repeat; r++) {
// Send the header, 0b00000
sendGeneric(0, 0, // No header for the header
DAIKIN_BIT_MARK, DAIKIN_ONE_SPACE,
DAIKIN_BIT_MARK, DAIKIN_ZERO_SPACE,
DAIKIN_BIT_MARK, DAIKIN_ZERO_SPACE + DAIKIN_GAP,
kDaikinBitMark, kDaikinOneSpace,
kDaikinBitMark, kDaikinZeroSpace,
kDaikinBitMark, kDaikinZeroSpace + kDaikinGap,
(uint64_t) 0b00000, 5, 38, false, 0, 50);
// Leading header
// Do this as a constant to save RAM and keep in flash memory
sendGeneric(DAIKIN_HDR_MARK, DAIKIN_HDR_SPACE,
DAIKIN_BIT_MARK, DAIKIN_ONE_SPACE,
DAIKIN_BIT_MARK, DAIKIN_ZERO_SPACE,
DAIKIN_BIT_MARK, DAIKIN_ZERO_SPACE + DAIKIN_GAP,
DAIKIN_FIRST_HEADER64, 64, 38, false, 0, 50);
sendGeneric(kDaikinHdrMark, kDaikinHdrSpace,
kDaikinBitMark, kDaikinOneSpace,
kDaikinBitMark, kDaikinZeroSpace,
kDaikinBitMark, kDaikinZeroSpace + kDaikinGap,
kDaikinFirstHeader64, 64, 38, false, 0, 50);
// Data #1
sendGeneric(DAIKIN_HDR_MARK, DAIKIN_HDR_SPACE,
DAIKIN_BIT_MARK, DAIKIN_ONE_SPACE,
DAIKIN_BIT_MARK, DAIKIN_ZERO_SPACE,
DAIKIN_BIT_MARK, DAIKIN_ZERO_SPACE + DAIKIN_GAP,
sendGeneric(kDaikinHdrMark, kDaikinHdrSpace,
kDaikinBitMark, kDaikinOneSpace,
kDaikinBitMark, kDaikinZeroSpace,
kDaikinBitMark, kDaikinZeroSpace + kDaikinGap,
data, 8, 38, false, 0, 50);
// Data #2
sendGeneric(DAIKIN_HDR_MARK, DAIKIN_HDR_SPACE,
DAIKIN_BIT_MARK, DAIKIN_ONE_SPACE,
DAIKIN_BIT_MARK, DAIKIN_ZERO_SPACE,
DAIKIN_BIT_MARK, DAIKIN_ZERO_SPACE + DAIKIN_GAP,
sendGeneric(kDaikinHdrMark, kDaikinHdrSpace,
kDaikinBitMark, kDaikinOneSpace,
kDaikinBitMark, kDaikinZeroSpace,
kDaikinBitMark, kDaikinZeroSpace + kDaikinGap,
data + 8, nbytes - 8, 38, false, 0, 50);
}
}
@@ -138,7 +138,7 @@ void IRDaikinESP::checksum() {
}
void IRDaikinESP::stateReset() {
for (uint8_t i = 0; i < DAIKIN_COMMAND_LENGTH; i++)
for (uint8_t i = 0; i < kDaikinStateLength; i++)
daikin[i] = 0x0;
daikin[0] = 0x11;
@@ -165,18 +165,18 @@ uint8_t* IRDaikinESP::getRaw() {
}
void IRDaikinESP::setRaw(uint8_t new_code[]) {
for (uint8_t i = 0; i < DAIKIN_COMMAND_LENGTH; i++)
for (uint8_t i = 0; i < kDaikinStateLength; i++)
daikin[i] = new_code[i];
}
void IRDaikinESP::on() {
// state = ON;
setBit(DAIKIN_BYTE_POWER, DAIKIN_BIT_POWER);
setBit(kDaikinBytePower, kDaikinBitPower);
}
void IRDaikinESP::off() {
// state = OFF;
clearBit(DAIKIN_BYTE_POWER, DAIKIN_BIT_POWER);
clearBit(kDaikinBytePower, kDaikinBitPower);
}
void IRDaikinESP::setPower(bool state) {
@@ -187,15 +187,15 @@ void IRDaikinESP::setPower(bool state) {
}
bool IRDaikinESP::getPower() {
return (getBit(DAIKIN_BYTE_POWER, DAIKIN_BIT_POWER) > 0);
return (getBit(kDaikinBytePower, kDaikinBitPower) > 0);
}
// Set the temp in deg C
void IRDaikinESP::setTemp(uint8_t temp) {
if (temp < DAIKIN_MIN_TEMP)
temp = DAIKIN_MIN_TEMP;
else if (temp > DAIKIN_MAX_TEMP)
temp = DAIKIN_MAX_TEMP;
if (temp < kDaikinMinTemp)
temp = kDaikinMinTemp;
else if (temp > kDaikinMaxTemp)
temp = kDaikinMaxTemp;
daikin[14] = temp * 2;
}
@@ -203,14 +203,14 @@ uint8_t IRDaikinESP::getTemp() {
return daikin[14] / 2;
}
// Set the speed of the fan, 1-5 or DAIKIN_FAN_AUTO or DAIKIN_FAN_QUIET
// Set the speed of the fan, 1-5 or kDaikinFanAuto or kDaikinFanQuiet
void IRDaikinESP::setFan(uint8_t fan) {
// Set the fan speed bits, leave low 4 bits alone
uint8_t fanset;
if (fan == DAIKIN_FAN_QUIET || fan == DAIKIN_FAN_AUTO)
if (fan == kDaikinFanQuiet || fan == kDaikinFanAuto)
fanset = fan;
else if (fan < DAIKIN_FAN_MIN || fan > DAIKIN_FAN_MAX)
fanset = DAIKIN_FAN_AUTO;
else if (fan < kDaikinFanMin || fan > kDaikinFanMax)
fanset = kDaikinFanAuto;
else
fanset = 2 + fan;
daikin[16] &= 0x0F;
@@ -219,31 +219,31 @@ void IRDaikinESP::setFan(uint8_t fan) {
uint8_t IRDaikinESP::getFan() {
uint8_t fan = daikin[16] >> 4;
if (fan != DAIKIN_FAN_QUIET && fan != DAIKIN_FAN_AUTO)
if (fan != kDaikinFanQuiet && fan != kDaikinFanAuto)
fan -= 2;
return fan;
}
uint8_t IRDaikinESP::getMode() {
/*
DAIKIN_COOL
DAIKIN_HEAT
DAIKIN_FAN
DAIKIN_AUTO
DAIKIN_DRY
kDaikinCool
kDaikinHeat
kDaikinFan
kDaikinAuto
kDaikinDry
*/
return daikin[13] >> 4;
}
void IRDaikinESP::setMode(uint8_t mode) {
switch (mode) {
case DAIKIN_COOL:
case DAIKIN_HEAT:
case DAIKIN_FAN:
case DAIKIN_DRY:
case kDaikinCool:
case kDaikinHeat:
case kDaikinFan:
case kDaikinDry:
break;
default:
mode = DAIKIN_AUTO;
mode = kDaikinAuto;
}
mode <<= 4;
daikin[13] &= 0b10001111;
@@ -274,78 +274,78 @@ bool IRDaikinESP::getSwingHorizontal() {
void IRDaikinESP::setQuiet(bool state) {
if (state) {
setBit(DAIKIN_BYTE_SILENT, DAIKIN_BIT_SILENT);
setBit(kDaikinByteSilent, kDaikinBitSilent);
// Powerful & Quiet mode being on are mutually exclusive.
setPowerful(false);
} else {
clearBit(DAIKIN_BYTE_SILENT, DAIKIN_BIT_SILENT);
clearBit(kDaikinByteSilent, kDaikinBitSilent);
}
}
bool IRDaikinESP::getQuiet() {
return (getBit(DAIKIN_BYTE_SILENT, DAIKIN_BIT_SILENT) > 0);
return (getBit(kDaikinByteSilent, kDaikinBitSilent) > 0);
}
void IRDaikinESP::setPowerful(bool state) {
if (state) {
setBit(DAIKIN_BYTE_POWERFUL, DAIKIN_BIT_POWERFUL);
setBit(kDaikinBytePowerful, kDaikinBitPowerful);
// Powerful, Quiet, & Econo mode being on are mutually exclusive.
setQuiet(false);
setEcono(false);
} else {
clearBit(DAIKIN_BYTE_POWERFUL, DAIKIN_BIT_POWERFUL);
clearBit(kDaikinBytePowerful, kDaikinBitPowerful);
}
}
bool IRDaikinESP::getPowerful() {
return (getBit(DAIKIN_BYTE_POWERFUL, DAIKIN_BIT_POWERFUL) > 0);
return (getBit(kDaikinBytePowerful, kDaikinBitPowerful) > 0);
}
void IRDaikinESP::setSensor(bool state) {
if (state)
setBit(DAIKIN_BYTE_SENSOR, DAIKIN_BIT_SENSOR);
setBit(kDaikinByteSensor, kDaikinBitSensor);
else
clearBit(DAIKIN_BYTE_SENSOR, DAIKIN_BIT_SENSOR);
clearBit(kDaikinByteSensor, kDaikinBitSensor);
}
bool IRDaikinESP::getSensor() {
return (getBit(DAIKIN_BYTE_SENSOR, DAIKIN_BIT_SENSOR) > 0);
return (getBit(kDaikinByteSensor, kDaikinBitSensor) > 0);
}
void IRDaikinESP::setEcono(bool state) {
if (state) {
setBit(DAIKIN_BYTE_ECONO, DAIKIN_BIT_ECONO);
setBit(kDaikinByteEcono, kDaikinBitEcono);
// Powerful & Econo mode being on are mutually exclusive.
setPowerful(false);
} else {
clearBit(DAIKIN_BYTE_ECONO, DAIKIN_BIT_ECONO);
clearBit(kDaikinByteEcono, kDaikinBitEcono);
}
}
bool IRDaikinESP::getEcono() {
return (getBit(DAIKIN_BYTE_ECONO, DAIKIN_BIT_ECONO) > 0);
return (getBit(kDaikinByteEcono, kDaikinBitEcono) > 0);
}
void IRDaikinESP::setEye(bool state) {
if (state)
setBit(DAIKIN_BYTE_EYE, DAIKIN_BIT_EYE);
setBit(kDaikinByteEye, kDaikinBitEye);
else
clearBit(DAIKIN_BYTE_EYE, DAIKIN_BIT_EYE);
clearBit(kDaikinByteEye, kDaikinBitEye);
}
bool IRDaikinESP::getEye() {
return (getBit(DAIKIN_BYTE_EYE, DAIKIN_BIT_EYE) > 0);
return (getBit(kDaikinByteEye, kDaikinBitEye) > 0);
}
void IRDaikinESP::setMold(bool state) {
if (state)
setBit(DAIKIN_BYTE_MOLD, DAIKIN_BIT_MOLD);
setBit(kDaikinByteMold, kDaikinBitMold);
else
clearBit(DAIKIN_BYTE_MOLD, DAIKIN_BIT_MOLD);
clearBit(kDaikinByteMold, kDaikinBitMold);
}
bool IRDaikinESP::getMold() {
return (getBit(DAIKIN_BYTE_MOLD, DAIKIN_BIT_MOLD) > 0);
return (getBit(kDaikinByteMold, kDaikinBitMold) > 0);
}
void IRDaikinESP::setBit(uint8_t byte, uint8_t bitmask) {
@@ -363,7 +363,7 @@ uint8_t IRDaikinESP::getBit(uint8_t byte, uint8_t bitmask) {
// starttime: Number of minutes after midnight, in 10 minutes increments
void IRDaikinESP::enableOnTimer(uint16_t starttime) {
setBit(DAIKIN_BYTE_ON_TIMER, DAIKIN_BIT_ON_TIMER);
setBit(kDaikinByteOnTimer, kDaikinBitOnTimer);
daikin[18] = (uint8_t) (starttime & 0x00FF);
// only keep 4 bits
daikin[19] &= 0xF0;
@@ -372,7 +372,7 @@ void IRDaikinESP::enableOnTimer(uint16_t starttime) {
void IRDaikinESP::disableOnTimer() {
enableOnTimer(0x600);
clearBit(DAIKIN_BYTE_ON_TIMER, DAIKIN_BIT_ON_TIMER);
clearBit(kDaikinByteOnTimer, kDaikinBitOnTimer);
}
uint16_t IRDaikinESP::getOnTime() {
@@ -384,12 +384,12 @@ uint16_t IRDaikinESP::getOnTime() {
}
bool IRDaikinESP::getOnTimerEnabled() {
return getBit(DAIKIN_BYTE_ON_TIMER, DAIKIN_BIT_ON_TIMER);
return getBit(kDaikinByteOnTimer, kDaikinBitOnTimer);
}
// endtime: Number of minutes after midnight, in 10 minutes increments
void IRDaikinESP::enableOffTimer(uint16_t endtime) {
setBit(DAIKIN_BYTE_OFF_TIMER, DAIKIN_BIT_OFF_TIMER);
setBit(kDaikinByteOffTimer, kDaikinBitOffTimer);
daikin[20] = (uint8_t)((endtime >> 4) & 0xFF);
daikin[19] &= 0x0F;
daikin[19] |= (uint8_t) ((endtime & 0x000F) << 4);
@@ -397,7 +397,7 @@ void IRDaikinESP::enableOffTimer(uint16_t endtime) {
void IRDaikinESP::disableOffTimer() {
enableOffTimer(0x600);
clearBit(DAIKIN_BYTE_OFF_TIMER, DAIKIN_BIT_OFF_TIMER);
clearBit(kDaikinByteOffTimer, kDaikinBitOffTimer);
}
uint16_t IRDaikinESP::getOffTime() {
@@ -411,7 +411,7 @@ uint16_t IRDaikinESP::getOffTime() {
}
bool IRDaikinESP::getOffTimerEnabled() {
return getBit(DAIKIN_BYTE_OFF_TIMER, DAIKIN_BIT_OFF_TIMER);
return getBit(kDaikinByteOffTimer, kDaikinBitOffTimer);
}
void IRDaikinESP::setCurrentTime(uint16_t numMins) {
@@ -462,19 +462,19 @@ std::string IRDaikinESP::toString() {
result += "Off";
result += ", Mode: " + uint64ToString(getMode());
switch (getMode()) {
case DAIKIN_AUTO:
case kDaikinAuto:
result += " (AUTO)";
break;
case DAIKIN_COOL:
case kDaikinCool:
result += " (COOL)";
break;
case DAIKIN_HEAT:
case kDaikinHeat:
result += " (HEAT)";
break;
case DAIKIN_DRY:
case kDaikinDry:
result += " (DRY)";
break;
case DAIKIN_FAN:
case kDaikinFan:
result += " (FAN)";
break;
default:
@@ -483,16 +483,16 @@ std::string IRDaikinESP::toString() {
result += ", Temp: " + uint64ToString(getTemp()) + "C";
result += ", Fan: " + uint64ToString(getFan());
switch (getFan()) {
case DAIKIN_FAN_AUTO:
case kDaikinFanAuto:
result += " (AUTO)";
break;
case DAIKIN_FAN_QUIET:
case kDaikinFanQuiet:
result += " (QUIET)";
break;
case DAIKIN_FAN_MIN:
case kDaikinFanMin:
result += " (MIN)";
break;
case DAIKIN_FAN_MAX:
case kDaikinFanMax:
result += " (MAX)";
break;
}
@@ -555,7 +555,7 @@ void IRDaikinESP::printState() {
std::string strbits;
#endif // ARDUINO
DPRINTLN("Raw Bits:");
for (uint8_t i = 0; i < DAIKIN_COMMAND_LENGTH; i++) {
for (uint8_t i = 0; i < kDaikinStateLength; i++) {
strbits = uint64ToString(daikin[i], BIN);
while (strbits.length() < 8)
strbits = "0" + strbits;
@@ -646,8 +646,8 @@ void IRDaikinESP::setCommand(uint32_t value) {
#if DECODE_DAIKIN
void addbit(bool val, unsigned char data[]) {
uint8_t curbit = data[DAIKIN_CURBIT];
uint8_t curindex = data[DAIKIN_CURINDEX];
uint8_t curbit = data[kDaikinCurBit];
uint8_t curindex = data[kDaikinCurIndex];
if (val) {
unsigned char bit = 1;
bit = bit << curbit;
@@ -658,23 +658,23 @@ void addbit(bool val, unsigned char data[]) {
curbit = 0;
curindex++;
}
data[DAIKIN_CURBIT] = curbit;
data[DAIKIN_CURINDEX] = curindex;
data[kDaikinCurBit] = curbit;
data[kDaikinCurIndex] = curindex;
}
bool checkheader(decode_results *results, uint16_t* offset) {
if (!IRrecv::matchMark(results->rawbuf[(*offset)++], DAIKIN_BIT_MARK,
DAIKIN_TOLERANCE, DAIKIN_MARK_EXCESS))
if (!IRrecv::matchMark(results->rawbuf[(*offset)++], kDaikinBitMark,
kDaikinTolerance, kDaikinMarkExcess))
return false;
if (!IRrecv::matchSpace(results->rawbuf[(*offset)++],
DAIKIN_ZERO_SPACE + DAIKIN_GAP,
DAIKIN_TOLERANCE, DAIKIN_MARK_EXCESS))
kDaikinZeroSpace + kDaikinGap,
kDaikinTolerance, kDaikinMarkExcess))
return false;
if (!IRrecv::matchMark(results->rawbuf[(*offset)++], DAIKIN_HDR_MARK,
DAIKIN_TOLERANCE, DAIKIN_MARK_EXCESS))
if (!IRrecv::matchMark(results->rawbuf[(*offset)++], kDaikinHdrMark,
kDaikinTolerance, kDaikinMarkExcess))
return false;
if (!IRrecv::matchSpace(results->rawbuf[(*offset)++], DAIKIN_HDR_SPACE,
DAIKIN_TOLERANCE, DAIKIN_MARK_EXCESS))
if (!IRrecv::matchSpace(results->rawbuf[(*offset)++], kDaikinHdrSpace,
kDaikinTolerance, kDaikinMarkExcess))
return false;
return true;
@@ -684,14 +684,14 @@ bool readbits(decode_results *results, uint16_t *offset,
unsigned char daikin_code[], uint16_t countbits) {
for (uint16_t i = 0; i < countbits && *offset < results->rawlen - 1;
i++, (*offset)++) {
if (!IRrecv::matchMark(results->rawbuf[(*offset)++], DAIKIN_BIT_MARK,
DAIKIN_TOLERANCE, DAIKIN_MARK_EXCESS))
if (!IRrecv::matchMark(results->rawbuf[(*offset)++], kDaikinBitMark,
kDaikinTolerance, kDaikinMarkExcess))
return false;
if (IRrecv::matchSpace(results->rawbuf[*offset], DAIKIN_ONE_SPACE,
DAIKIN_TOLERANCE, DAIKIN_MARK_EXCESS))
if (IRrecv::matchSpace(results->rawbuf[*offset], kDaikinOneSpace,
kDaikinTolerance, kDaikinMarkExcess))
addbit(1, daikin_code);
else if (IRrecv::matchSpace(results->rawbuf[*offset], DAIKIN_ZERO_SPACE,
DAIKIN_TOLERANCE, DAIKIN_MARK_EXCESS))
else if (IRrecv::matchSpace(results->rawbuf[*offset], kDaikinZeroSpace,
kDaikinTolerance, kDaikinMarkExcess))
addbit(0, daikin_code);
else
return false;
@@ -702,7 +702,7 @@ bool readbits(decode_results *results, uint16_t *offset,
// Decode the supplied Daikin A/C message.
// Args:
// results: Ptr to the data to decode and where to store the decode result.
// nbits: Nr. of bits to expect in the data portion. (DAIKIN_RAW_BITS)
// nbits: Nr. of bits to expect in the data portion. (kDaikinRawBits)
// strict: Flag to indicate if we strictly adhere to the specification.
// Returns:
// boolean: True if it can decode it, false if it can't.
@@ -716,21 +716,21 @@ bool readbits(decode_results *results, uint16_t *offset,
// https://github.com/mharizanov/Daikin-AC-remote-control-over-the-Internet/tree/master/IRremote
bool IRrecv::decodeDaikin(decode_results *results, uint16_t nbits,
bool strict) {
if (results->rawlen < DAIKIN_RAW_BITS)
if (results->rawlen < kDaikinRawBits)
return false;
// Compliance
if (strict && nbits != DAIKIN_RAW_BITS)
if (strict && nbits != kDaikinRawBits)
return false;
uint16_t offset = OFFSET_START;
unsigned char daikin_code[DAIKIN_COMMAND_LENGTH + 2];
for (uint8_t i = 0; i < DAIKIN_COMMAND_LENGTH+2; i++)
uint16_t offset = kStartOffset;
unsigned char daikin_code[kDaikinStateLength + 2];
for (uint8_t i = 0; i < kDaikinStateLength+2; i++)
daikin_code[i] = 0;
// Header (#1)
for (uint8_t i = 0; i < 10; i++) {
if (!matchMark(results->rawbuf[offset++], DAIKIN_BIT_MARK))
if (!matchMark(results->rawbuf[offset++], kDaikinBitMark))
return false;
}
if (!checkheader(results, &offset)) return false;
@@ -741,7 +741,7 @@ bool IRrecv::decodeDaikin(decode_results *results, uint16_t nbits,
// Ignore everything that has just been captured as it is not needed.
// Some remotes may not send this portion, my remote did, but it's not
// required.
for (uint8_t i = 0; i < DAIKIN_COMMAND_LENGTH + 2; i++)
for (uint8_t i = 0; i < kDaikinStateLength + 2; i++)
daikin_code[i] = 0;
// Header (#2)
@@ -754,14 +754,14 @@ bool IRrecv::decodeDaikin(decode_results *results, uint16_t nbits,
if (!checkheader(results, &offset)) return false;
// Data (#3), read up everything else
if (!readbits(results, &offset, daikin_code, DAIKIN_BITS - (8 * 8)))
if (!readbits(results, &offset, daikin_code, kDaikinBits - (8 * 8)))
return false;
// Footer
if (!matchMark(results->rawbuf[offset++], DAIKIN_BIT_MARK))
if (!matchMark(results->rawbuf[offset++], kDaikinBitMark))
return false;
if (offset < results->rawlen && !matchAtLeast(results->rawbuf[offset],
DAIKIN_GAP))
kDaikinGap))
return false;
// Compliance
@@ -780,9 +780,9 @@ bool IRrecv::decodeDaikin(decode_results *results, uint16_t nbits,
#endif // DAIKIN_DEBUG
// Copy across the bits to state
for (uint8_t i = 0; i < DAIKIN_COMMAND_LENGTH; i++)
for (uint8_t i = 0; i < kDaikinStateLength; i++)
results->state[i] = daikin_code[i];
results->bits = DAIKIN_COMMAND_LENGTH * 8;
results->bits = kDaikinStateLength * 8;
results->decode_type = DAIKIN;
return true;
}

109
src/ir_Daikin.h
View File

@@ -76,57 +76,62 @@
*/
// Constants
#define DAIKIN_COOL 0b011
#define DAIKIN_HEAT 0b100
#define DAIKIN_FAN 0b110
#define DAIKIN_AUTO 0b000
#define DAIKIN_DRY 0b010
#define DAIKIN_MIN_TEMP 10U // Celsius
#define DAIKIN_MAX_TEMP 32U // Celsius
#define DAIKIN_FAN_MIN (uint8_t) 1U
#define DAIKIN_FAN_MAX (uint8_t) 5U
#define DAIKIN_FAN_AUTO (uint8_t) 0b1010
#define DAIKIN_FAN_QUIET (uint8_t) 0b1011
#define DAIKIN_BYTE_POWER 13
#define DAIKIN_BIT_POWER 0b00000001
#define DAIKIN_BYTE_POWERFUL 21
#define DAIKIN_BIT_POWERFUL 0b00000001
#define DAIKIN_BYTE_SILENT 21
#define DAIKIN_BIT_SILENT 0b00100000
#define DAIKIN_BYTE_SENSOR 24
#define DAIKIN_BIT_SENSOR 0b00000010
#define DAIKIN_BYTE_ECONO 24
#define DAIKIN_BIT_ECONO 0b00000100
#define DAIKIN_BYTE_EYE 24
#define DAIKIN_BIT_EYE 0b10000000
#define DAIKIN_BYTE_MOLD 25
#define DAIKIN_BIT_MOLD 0b00000010
#define DAIKIN_BYTE_OFF_TIMER 13
#define DAIKIN_BIT_OFF_TIMER 0b00000100
#define DAIKIN_BYTE_ON_TIMER 13
#define DAIKIN_BIT_ON_TIMER 0b00000010
#define DAIKIN_CURBIT DAIKIN_COMMAND_LENGTH
#define DAIKIN_CURINDEX (DAIKIN_COMMAND_LENGTH + 1)
#define OFFSET_ERR 65432
#define DAIKIN_TOLERANCE 35
#define DAIKIN_MARK_EXCESS MARK_EXCESS
#define DAIKIN_HDR_MARK 3650U // DAIKIN_BIT_MARK * 8
#define DAIKIN_HDR_SPACE 1623U // DAIKIN_BIT_MARK * 4
#define DAIKIN_BIT_MARK 428U
#define DAIKIN_ZERO_SPACE 428U
#define DAIKIN_ONE_SPACE 1280U
#define DAIKIN_GAP 29000U
const uint8_t kDaikinAuto = 0b000;
const uint8_t kDaikinDry = 0b010;
const uint8_t kDaikinCool = 0b011;
const uint8_t kDaikinHeat = 0b100;
const uint8_t kDaikinFan = 0b110;
const uint8_t kDaikinMinTemp = 10; // Celsius
const uint8_t kDaikinMaxTemp = 32; // Celsius
const uint8_t kDaikinFanMin = 1;
const uint8_t kDaikinFanMax = 5;
const uint8_t kDaikinFanAuto = 0b1010;
const uint8_t kDaikinFanQuiet = 0b1011;
const uint8_t kDaikinBytePower = 13;
const uint8_t kDaikinBitPower = 0b00000001;
const uint8_t kDaikinBytePowerful = 21;
const uint8_t kDaikinBitPowerful = 0b00000001;
const uint8_t kDaikinByteSilent = 21;
const uint8_t kDaikinBitSilent = 0b00100000;
const uint8_t kDaikinByteSensor = 24;
const uint8_t kDaikinBitSensor = 0b00000010;
const uint8_t kDaikinByteEcono = 24;
const uint8_t kDaikinBitEcono = 0b00000100;
const uint8_t kDaikinByteEye = 24;
const uint8_t kDaikinBitEye = 0b10000000;
const uint8_t kDaikinByteMold = 25;
const uint8_t kDaikinBitMold = 0b00000010;
const uint8_t kDaikinByteOffTimer = 13;
const uint8_t kDaikinBitOffTimer = 0b00000100;
const uint8_t kDaikinByteOnTimer = 13;
const uint8_t kDaikinBitOnTimer = 0b00000010;
const uint8_t kDaikinCurBit = kDaikinStateLength;
const uint8_t kDaikinCurIndex = kDaikinStateLength + 1;
const uint8_t kDaikinTolerance = 35;
const uint16_t kDaikinMarkExcess = kMarkExcess;
const uint16_t kDaikinHdrMark = 3650; // kDaikinBitMark * 8
const uint16_t kDaikinHdrSpace = 1623; // kDaikinBitMark * 4
const uint16_t kDaikinBitMark = 428;
const uint16_t kDaikinZeroSpace = 428;
const uint16_t kDaikinOneSpace = 1280;
const uint16_t kDaikinGap = 29000;
// Note bits in each octet swapped so can be sent as a single value
#define DAIKIN_FIRST_HEADER64 \
0b1101011100000000000000001100010100000000001001111101101000010001
const uint64_t kDaikinFirstHeader64 =
0b1101011100000000000000001100010100000000001001111101101000010001;
// Legacy defines.
#define DAIKIN_COOL kDaikinCool
#define DAIKIN_HEAT kDaikinHeat
#define DAIKIN_FAN kDaikinFan
#define DAIKIN_AUTO kDaikinAuto
#define DAIKIN_DRY kDaikinDry
#define DAIKIN_MIN_TEMP kDaikinMinTemp
#define kDaikinMaxTemp kDaikinMaxTemp
#define DAIKIN_FAN_MIN kDaikinFanMin
#define DAIKIN_FAN_MAX kDaikinFanMax
#define DAIKIN_FAN_AUTO kDaikinFanAuto
#define DAIKIN_FAN_QUIET kDaikinFanQuiet
class IRDaikinESP {
public:
@@ -180,7 +185,7 @@ class IRDaikinESP {
uint32_t getCommand();
void setCommand(uint32_t value);
static bool validChecksum(const uint8_t state[],
const uint16_t length = DAIKIN_COMMAND_LENGTH);
const uint16_t length = kDaikinStateLength);
#ifdef ARDUINO
String toString();
static String renderTime(uint16_t timemins);
@@ -191,7 +196,7 @@ class IRDaikinESP {
private:
// # of bytes per command
uint8_t daikin[DAIKIN_COMMAND_LENGTH];
uint8_t daikin[kDaikinStateLength];
void stateReset();
static uint8_t calcBlockChecksum(const uint8_t *block, const uint16_t length);
void checksum();

73
src/ir_Denon.cpp
View File

@@ -18,25 +18,24 @@
// Constants
// Ref:
// https://github.com/z3t0/Arduino-IRremote/blob/master/ir_Denon.cpp
#define DENON_TICK 263U
#define DENON_HDR_MARK_TICKS 1U
#define DENON_HDR_MARK (DENON_HDR_MARK_TICKS * DENON_TICK)
#define DENON_HDR_SPACE_TICKS 3U
#define DENON_HDR_SPACE (DENON_HDR_SPACE_TICKS * DENON_TICK)
#define DENON_BIT_MARK_TICKS 1U
#define DENON_BIT_MARK (DENON_BIT_MARK_TICKS * DENON_TICK)
#define DENON_ONE_SPACE_TICKS 7U
#define DENON_ONE_SPACE (DENON_ONE_SPACE_TICKS * DENON_TICK)
#define DENON_ZERO_SPACE_TICKS 3U
#define DENON_ZERO_SPACE (DENON_ZERO_SPACE_TICKS * DENON_TICK)
#define DENON_MIN_COMMAND_LENGTH_TICKS 510U
#define DENON_MIN_COMMAND_LENGTH (DENON_MIN_COMMAND_LENGTH_TICKS * DENON_TICK)
#define DENON_MIN_GAP_TICKS (DENON_MIN_COMMAND_LENGTH_TICKS - \
(DENON_HDR_MARK_TICKS + DENON_HDR_SPACE_TICKS + \
DENON_BITS * (DENON_BIT_MARK_TICKS + DENON_ONE_SPACE_TICKS) + \
DENON_BIT_MARK_TICKS))
#define DENON_MIN_GAP (DENON_MIN_GAP_TICKS * DENON_TICK)
#define DENON_MANUFACTURER 0x2A4CULL
const uint16_t kDenonTick = 263;
const uint16_t kDenonHdrMarkTicks = 1;
const uint16_t kDenonHdrMark = kDenonHdrMarkTicks * kDenonTick;
const uint16_t kDenonHdrSpaceTicks = 3;
const uint16_t kDenonHdrSpace = kDenonHdrSpaceTicks * kDenonTick;
const uint16_t kDenonBitMarkTicks = 1;
const uint16_t kDenonBitMark = kDenonBitMarkTicks * kDenonTick;
const uint16_t kDenonOneSpaceTicks = 7;
const uint16_t kDenonOneSpace = kDenonOneSpaceTicks * kDenonTick;
const uint16_t kDenonZeroSpaceTicks = 3;
const uint16_t kDenonZeroSpace = kDenonZeroSpaceTicks * kDenonTick;
const uint16_t kDenonMinCommandLengthTicks = 510;
const uint16_t kDenonMinGapTicks = kDenonMinCommandLengthTicks -
(kDenonHdrMarkTicks + kDenonHdrSpaceTicks +
kDenonBits * (kDenonBitMarkTicks + kDenonOneSpaceTicks) +
kDenonBitMarkTicks);
const uint32_t kDenonMinGap = kDenonMinGapTicks * kDenonTick;
const uint64_t kDenonManufacturer = 0x2A4CULL;
#if SEND_DENON
// Send a Denon message
@@ -55,9 +54,9 @@
// https://github.com/z3t0/Arduino-IRremote/blob/master/ir_Denon.cpp
// http://assets.denon.com/documentmaster/us/denon%20master%20ir%20hex.xls
void IRsend::sendDenon(uint64_t data, uint16_t nbits, uint16_t repeat) {
if (nbits >= PANASONIC_BITS) // Is this really Panasonic?
if (nbits >= kPanasonicBits) // Is this really Panasonic?
sendPanasonic64(data, nbits, repeat);
else if (nbits == DENON_LEGACY_BITS)
else if (nbits == kDenonLegacyBits)
// Support legacy (broken) calls of sendDenon().
sendSharpRaw(data & (~0x2000ULL), nbits + 1, repeat);
else
@@ -84,7 +83,7 @@ bool IRrecv::decodeDenon(decode_results *results, uint16_t nbits, bool strict) {
switch (nbits) {
case DENON_BITS:
case DENON_48_BITS:
case DENON_LEGACY_BITS:
case kDenonLegacyBits:
break;
default:
return false;
@@ -99,40 +98,40 @@ bool IRrecv::decodeDenon(decode_results *results, uint16_t nbits, bool strict) {
// manufacturer code.
if (!decodeSharp(results, nbits, true, false) &&
!decodePanasonic(results, nbits, true, DENON_MANUFACTURER)) {
!decodePanasonic(results, nbits, true, kDenonManufacturer)) {
// We couldn't decode it as expected, so try the old legacy method.
// NOTE: I don't think this following protocol actually exists.
// Looks like a partial version of the Sharp protocol.
// Check we have enough data
if (results->rawlen < 2 * nbits + HEADER + FOOTER - 1)
if (results->rawlen < 2 * nbits + kHeader + kFooter - 1)
return false;
if (strict && nbits != DENON_LEGACY_BITS)
if (strict && nbits != kDenonLegacyBits)
return false;
uint64_t data = 0;
uint16_t offset = OFFSET_START;
uint16_t offset = kStartOffset;
// Header
if (!matchMark(results->rawbuf[offset], DENON_HDR_MARK)) return false;
if (!matchMark(results->rawbuf[offset], kDenonHdrMark)) return false;
// Calculate how long the common tick time is based on the header mark.
uint32_t m_tick = results->rawbuf[offset++] * RAWTICK /
DENON_HDR_MARK_TICKS;
if (!matchSpace(results->rawbuf[offset], DENON_HDR_SPACE)) return false;
uint32_t s_tick = results->rawbuf[offset++] * RAWTICK /
DENON_HDR_SPACE_TICKS;
uint32_t m_tick = results->rawbuf[offset++] * kRawTick /
kDenonHdrMarkTicks;
if (!matchSpace(results->rawbuf[offset], kDenonHdrSpace)) return false;
uint32_t s_tick = results->rawbuf[offset++] * kRawTick /
kDenonHdrSpaceTicks;
// Data
match_result_t data_result = matchData(&(results->rawbuf[offset]), nbits,
DENON_BIT_MARK_TICKS * m_tick,
DENON_ONE_SPACE_TICKS * s_tick,
DENON_BIT_MARK_TICKS * m_tick,
DENON_ZERO_SPACE_TICKS * s_tick);
kDenonBitMarkTicks * m_tick,
kDenonOneSpaceTicks * s_tick,
kDenonBitMarkTicks * m_tick,
kDenonZeroSpaceTicks * s_tick);
if (data_result.success == false) return false;
data = data_result.data;
offset += data_result.used;
// Footer
if (!matchMark(results->rawbuf[offset++], DENON_BIT_MARK_TICKS * m_tick))
if (!matchMark(results->rawbuf[offset++], kDenonBitMarkTicks * m_tick))
return false;
// Success

64
src/ir_Dish.cpp
View File

@@ -18,19 +18,19 @@
// Ref:
// https://github.com/marcosamarinho/IRremoteESP8266/blob/master/ir_Dish.cpp
// http://www.hifi-remote.com/wiki/index.php?title=Dish
#define DISH_TICK 100U
#define DISH_HDR_MARK_TICKS 4U
#define DISH_HDR_MARK (DISH_HDR_MARK_TICKS * DISH_TICK)
#define DISH_HDR_SPACE_TICKS 61U
#define DISH_HDR_SPACE (DISH_HDR_SPACE_TICKS * DISH_TICK)
#define DISH_BIT_MARK_TICKS 4U
#define DISH_BIT_MARK (DISH_BIT_MARK_TICKS * DISH_TICK)
#define DISH_ONE_SPACE_TICKS 17U
#define DISH_ONE_SPACE (DISH_ONE_SPACE_TICKS * DISH_TICK)
#define DISH_ZERO_SPACE_TICKS 28U
#define DISH_ZERO_SPACE (DISH_ZERO_SPACE_TICKS * DISH_TICK)
#define DISH_RPT_SPACE_TICKS DISH_HDR_SPACE_TICKS
#define DISH_RPT_SPACE (DISH_RPT_SPACE_TICKS * DISH_TICK)
const uint16_t kDishTick = 100;
const uint16_t kDishHdrMarkTicks = 4;
const uint16_t kDishHdrMark = kDishHdrMarkTicks * kDishTick;
const uint16_t kDishHdrSpaceTicks = 61;
const uint16_t kDishHdrSpace = kDishHdrSpaceTicks * kDishTick;
const uint16_t kDishBitMarkTicks = 4;
const uint16_t kDishBitMark = kDishBitMarkTicks * kDishTick;
const uint16_t kDishOneSpaceTicks = 17;
const uint16_t kDishOneSpace = kDishOneSpaceTicks * kDishTick;
const uint16_t kDishZeroSpaceTicks = 28;
const uint16_t kDishZeroSpace = kDishZeroSpaceTicks * kDishTick;
const uint16_t kDishRptSpaceTicks = kDishHdrSpaceTicks;
const uint16_t kDishRptSpace = kDishRptSpaceTicks * kDishTick;
#if SEND_DISH
// Send an IR command to a DISH NETWORK device.
@@ -57,13 +57,13 @@
void IRsend::sendDISH(uint64_t data, uint16_t nbits, uint16_t repeat) {
enableIROut(57600); // Set modulation freq. to 57.6kHz.
// Header is only ever sent once.
mark(DISH_HDR_MARK);
space(DISH_HDR_SPACE);
mark(kDishHdrMark);
space(kDishHdrSpace);
sendGeneric(0, 0, // No headers from here on in.
DISH_BIT_MARK, DISH_ONE_SPACE,
DISH_BIT_MARK, DISH_ZERO_SPACE,
DISH_BIT_MARK, DISH_RPT_SPACE,
kDishBitMark, kDishOneSpace,
kDishBitMark, kDishZeroSpace,
kDishBitMark, kDishRptSpace,
data, nbits, 57600, true, repeat, 50);
}
#endif
@@ -73,7 +73,7 @@ void IRsend::sendDISH(uint64_t data, uint16_t nbits, uint16_t repeat) {
//
// Args:
// results: Ptr to the data to decode and where to store the decode result.
// nbits: Nr. of bits to expect in the data portion. Typically DISH_BITS.
// nbits: Nr. of bits to expect in the data portion. Typically kDishBits.
// strict: Flag to indicate if we strictly adhere to the specification.
// Returns:
// boolean: True if it can decode it, false if it can't.
@@ -89,34 +89,34 @@ void IRsend::sendDISH(uint64_t data, uint16_t nbits, uint16_t repeat) {
// http://lirc.sourceforge.net/remotes/echostar/301_501_3100_5100_58xx_59xx
// https://github.com/marcosamarinho/IRremoteESP8266/blob/master/ir_Dish.cpp
bool IRrecv::decodeDISH(decode_results *results, uint16_t nbits, bool strict) {
if (results->rawlen < 2 * nbits + HEADER + FOOTER - 1)
if (results->rawlen < 2 * nbits + kHeader + kFooter - 1)
return false; // Not enough entries to be valid.
if (strict && nbits != DISH_BITS)
if (strict && nbits != kDishBits)
return false; // Not strictly compliant.
uint64_t data = 0;
uint16_t offset = OFFSET_START;
uint16_t offset = kStartOffset;
// Header
if (!match(results->rawbuf[offset], DISH_HDR_MARK)) return false;
if (!match(results->rawbuf[offset], kDishHdrMark)) return false;
// Calculate how long the common tick time is based on the header mark.
uint32_t m_tick = results->rawbuf[offset++] * RAWTICK / DISH_HDR_MARK_TICKS;
if (!matchSpace(results->rawbuf[offset], DISH_HDR_SPACE)) return false;
uint32_t m_tick = results->rawbuf[offset++] * kRawTick / kDishHdrMarkTicks;
if (!matchSpace(results->rawbuf[offset], kDishHdrSpace)) return false;
// Calculate how long the common tick time is based on the header space.
uint32_t s_tick = results->rawbuf[offset++] * RAWTICK / DISH_HDR_SPACE_TICKS;
uint32_t s_tick = results->rawbuf[offset++] * kRawTick / kDishHdrSpaceTicks;
// Data
match_result_t data_result = matchData(&(results->rawbuf[offset]), nbits,
DISH_BIT_MARK_TICKS * m_tick,
DISH_ONE_SPACE_TICKS * s_tick,
DISH_BIT_MARK_TICKS * m_tick,
DISH_ZERO_SPACE_TICKS * s_tick);
kDishBitMarkTicks * m_tick,
kDishOneSpaceTicks * s_tick,
kDishBitMarkTicks * m_tick,
kDishZeroSpaceTicks * s_tick);
if (data_result.success == false) return false;
data = data_result.data;
offset += data_result.used;
// Footer
if (!matchMark(results->rawbuf[offset++], DISH_BIT_MARK_TICKS * m_tick))
if (!matchMark(results->rawbuf[offset++], kDishBitMarkTicks * m_tick))
return false;
// Compliance
@@ -124,7 +124,7 @@ bool IRrecv::decodeDISH(decode_results *results, uint16_t nbits, bool strict) {
// The DISH protocol calls for a repeated message, so strictly speaking
// there should be a code following this. Only require it if we are set to
// strict matching.
if (!matchSpace(results->rawbuf[offset], DISH_RPT_SPACE_TICKS * s_tick))
if (!matchSpace(results->rawbuf[offset], kDishRptSpaceTicks * s_tick))
return false;
}

219
src/ir_Fujitsu.cpp
View File

@@ -17,12 +17,12 @@
// Ref:
// These values are based on averages of measurements
#define FUJITSU_AC_HDR_MARK 3324U
#define FUJITSU_AC_HDR_SPACE 1574U
#define FUJITSU_AC_BIT_MARK 448U
#define FUJITSU_AC_ONE_SPACE 1182U
#define FUJITSU_AC_ZERO_SPACE 390U
#define FUJITSU_AC_MIN_GAP 8100U
const uint16_t kFujitsuAcHdrMark = 3324;
const uint16_t kFujitsuAcHdrSpace = 1574;
const uint16_t kFujitsuAcBitMark = 448;
const uint16_t kFujitsuAcOneSpace = 1182;
const uint16_t kFujitsuAcZeroSpace = 390;
const uint16_t kFujitsuAcMinGap = 8100;
#if SEND_FUJITSU_AC
// Send a Fujitsu A/C message.
@@ -30,21 +30,21 @@
// Args:
// data: An array of bytes containing the IR command.
// nbytes: Nr. of bytes of data in the array. Typically one of:
// FUJITSU_AC_STATE_LENGTH
// FUJITSU_AC_STATE_LENGTH - 1
// FUJITSU_AC_STATE_LENGTH_SHORT
// FUJITSU_AC_STATE_LENGTH_SHORT - 1
// kFujitsuAcStateLength
// kFujitsuAcStateLength - 1
// kFujitsuAcStateLengthShort
// kFujitsuAcStateLengthShort - 1
// repeat: Nr. of times the message is to be repeated.
// (Default = FUJITSU_AC_MIN_REPEAT).
// (Default = kFujitsuAcMinRepeat).
//
// Status: BETA / Appears to be working.
//
void IRsend::sendFujitsuAC(unsigned char data[], uint16_t nbytes,
uint16_t repeat) {
sendGeneric(FUJITSU_AC_HDR_MARK, FUJITSU_AC_HDR_SPACE,
FUJITSU_AC_BIT_MARK, FUJITSU_AC_ONE_SPACE,
FUJITSU_AC_BIT_MARK, FUJITSU_AC_ZERO_SPACE,
FUJITSU_AC_BIT_MARK, FUJITSU_AC_MIN_GAP,
sendGeneric(kFujitsuAcHdrMark, kFujitsuAcHdrSpace,
kFujitsuAcBitMark, kFujitsuAcOneSpace,
kFujitsuAcBitMark, kFujitsuAcZeroSpace,
kFujitsuAcBitMark, kFujitsuAcMinGap,
data, nbytes, 38, false, repeat, 50);
}
#endif // SEND_FUJITSU_AC
@@ -62,22 +62,22 @@ void IRFujitsuAC::setModel(fujitsu_ac_remote_model_t model) {
_model = model;
switch (model) {
case ARDB1:
_state_length = FUJITSU_AC_STATE_LENGTH - 1;
_state_length_short = FUJITSU_AC_STATE_LENGTH_SHORT - 1;
_state_length = kFujitsuAcStateLength - 1;
_state_length_short = kFujitsuAcStateLengthShort - 1;
break;
default:
_state_length = FUJITSU_AC_STATE_LENGTH;
_state_length_short = FUJITSU_AC_STATE_LENGTH_SHORT;
_state_length = kFujitsuAcStateLength;
_state_length_short = kFujitsuAcStateLengthShort;
}
}
// Reset the state of the remote to a known good state/sequence.
void IRFujitsuAC::stateReset() {
_temp = 24;
_fanSpeed = FUJITSU_AC_FAN_HIGH;
_mode = FUJITSU_AC_MODE_COOL;
_swingMode = FUJITSU_AC_SWING_BOTH;
_cmd = FUJITSU_AC_CMD_TURN_ON;
_fanSpeed = kFujitsuAcFanHigh;
_mode = kFujitsuAcModeCool;
_swingMode = kFujitsuAcSwingBoth;
_cmd = kFujitsuAcCmdTurnOn;
buildState();
}
@@ -102,13 +102,13 @@ void IRFujitsuAC::buildState() {
remote_state[4] = 0x10;
bool fullCmd = false;
switch (_cmd) {
case FUJITSU_AC_CMD_TURN_OFF:
case kFujitsuAcCmdTurnOff:
remote_state[5] = 0x02;
break;
case FUJITSU_AC_CMD_STEP_HORIZ:
case kFujitsuAcCmdStepHoriz:
remote_state[5] = 0x79;
break;
case FUJITSU_AC_CMD_STEP_VERT:
case kFujitsuAcCmdStepVert:
remote_state[5] = 0x6C;
break;
default:
@@ -124,12 +124,12 @@ void IRFujitsuAC::buildState() {
break;
}
if (fullCmd) { // long codes
uint8_t tempByte = _temp - FUJITSU_AC_MIN_TEMP;
uint8_t tempByte = _temp - kFujitsuAcMinTemp;
// Nr. of bytes in the message after this byte.
remote_state[6] = _state_length - 7;
remote_state[7] = 0x30;
remote_state[8] = (_cmd == FUJITSU_AC_CMD_TURN_ON) | (tempByte << 4);
remote_state[8] = (_cmd == kFujitsuAcCmdTurnOn) | (tempByte << 4);
remote_state[9] = _mode | 0 << 4; // timer off
remote_state[10] = _fanSpeed | _swingMode << 4;
remote_state[11] = 0; // timerOff values
@@ -158,7 +158,7 @@ void IRFujitsuAC::buildState() {
- 2];
// Zero the rest of the state.
for (uint8_t i = _state_length_short;
i < FUJITSU_AC_STATE_LENGTH;
i < kFujitsuAcStateLength;
i++)
remote_state[i] = 0;
}
@@ -181,8 +181,8 @@ uint8_t* IRFujitsuAC::getRaw() {
void IRFujitsuAC::buildFromState(const uint16_t length) {
switch (length) {
case FUJITSU_AC_STATE_LENGTH - 1:
case FUJITSU_AC_STATE_LENGTH_SHORT - 1:
case kFujitsuAcStateLength - 1:
case kFujitsuAcStateLengthShort - 1:
setModel(ARDB1);
break;
default:
@@ -196,26 +196,26 @@ void IRFujitsuAC::buildFromState(const uint16_t length) {
setModel(ARRAH2E);
break;
}
setTemp((remote_state[8] >> 4) + FUJITSU_AC_MIN_TEMP);
setTemp((remote_state[8] >> 4) + kFujitsuAcMinTemp);
if (remote_state[8] & 0x1)
setCmd(FUJITSU_AC_CMD_TURN_ON);
setCmd(kFujitsuAcCmdTurnOn);
else
setCmd(FUJITSU_AC_CMD_STAY_ON);
setCmd(kFujitsuAcCmdStayOn);
setMode(remote_state[9] & 0b111);
setFanSpeed(remote_state[10] & 0b111);
setSwing(remote_state[10] >> 4);
switch (remote_state[5]) {
case FUJITSU_AC_CMD_TURN_OFF:
case FUJITSU_AC_CMD_STEP_HORIZ:
case FUJITSU_AC_CMD_STEP_VERT:
case kFujitsuAcCmdTurnOff:
case kFujitsuAcCmdStepHoriz:
case kFujitsuAcCmdStepVert:
setCmd(remote_state[5]);
break;
}
}
bool IRFujitsuAC::setRaw(const uint8_t newState[], const uint16_t length) {
if (length > FUJITSU_AC_STATE_LENGTH) return false;
for (uint16_t i = 0; i < FUJITSU_AC_STATE_LENGTH; i++) {
if (length > kFujitsuAcStateLength) return false;
for (uint16_t i = 0; i < kFujitsuAcStateLength; i++) {
if (i < length)
remote_state[i] = newState[i];
else
@@ -227,36 +227,36 @@ bool IRFujitsuAC::setRaw(const uint8_t newState[], const uint16_t length) {
// Set the requested power state of the A/C to off.
void IRFujitsuAC::off() {
_cmd = FUJITSU_AC_CMD_TURN_OFF;
_cmd = kFujitsuAcCmdTurnOff;
}
void IRFujitsuAC::stepHoriz() {
switch (_model) {
case ARDB1: break; // This remote doesn't have a horizontal option.
default:
_cmd = FUJITSU_AC_CMD_STEP_HORIZ;
_cmd = kFujitsuAcCmdStepHoriz;
}
}
void IRFujitsuAC::stepVert() {
_cmd = FUJITSU_AC_CMD_STEP_VERT;
_cmd = kFujitsuAcCmdStepVert;
}
// Set the requested command of the A/C.
void IRFujitsuAC::setCmd(uint8_t cmd) {
switch (cmd) {
case FUJITSU_AC_CMD_TURN_OFF:
case FUJITSU_AC_CMD_TURN_ON:
case FUJITSU_AC_CMD_STAY_ON:
case FUJITSU_AC_CMD_STEP_VERT:
case kFujitsuAcCmdTurnOff:
case kFujitsuAcCmdTurnOn:
case kFujitsuAcCmdStayOn:
case kFujitsuAcCmdStepVert:
_cmd = cmd;
break;
case FUJITSU_AC_CMD_STEP_HORIZ:
case kFujitsuAcCmdStepHoriz:
if (_model != ARDB1) // AR-DB1 remote doesn't have step horizontal.
_cmd = cmd;
// FALLTHRU
default:
_cmd = FUJITSU_AC_CMD_STAY_ON;
_cmd = kFujitsuAcCmdStayOn;
break;
}
}
@@ -266,13 +266,13 @@ uint8_t IRFujitsuAC::getCmd() {
}
bool IRFujitsuAC::getPower() {
return _cmd != FUJITSU_AC_CMD_TURN_OFF;
return _cmd != kFujitsuAcCmdTurnOff;
}
// Set the temp. in deg C
void IRFujitsuAC::setTemp(uint8_t temp) {
temp = std::max((uint8_t) FUJITSU_AC_MIN_TEMP, temp);
temp = std::min((uint8_t) FUJITSU_AC_MAX_TEMP, temp);
temp = std::max((uint8_t) kFujitsuAcMinTemp, temp);
temp = std::min((uint8_t) kFujitsuAcMaxTemp, temp);
_temp = temp;
}
@@ -282,8 +282,8 @@ uint8_t IRFujitsuAC::getTemp() {
// Set the speed of the fan
void IRFujitsuAC::setFanSpeed(uint8_t fanSpeed) {
if (fanSpeed > FUJITSU_AC_FAN_QUIET)
fanSpeed = FUJITSU_AC_FAN_HIGH; // Set the fan to maximum if out of range.
if (fanSpeed > kFujitsuAcFanQuiet)
fanSpeed = kFujitsuAcFanHigh; // Set the fan to maximum if out of range.
_fanSpeed = fanSpeed;
}
uint8_t IRFujitsuAC::getFanSpeed() {
@@ -292,8 +292,8 @@ uint8_t IRFujitsuAC::getFanSpeed() {
// Set the requested climate operation mode of the a/c unit.
void IRFujitsuAC::setMode(uint8_t mode) {
if (mode > FUJITSU_AC_MODE_HEAT)
mode = FUJITSU_AC_MODE_HEAT; // Set the mode to maximum if out of range.
if (mode > kFujitsuAcModeHeat)
mode = kFujitsuAcModeHeat; // Set the mode to maximum if out of range.
_mode = mode;
}
@@ -305,14 +305,14 @@ void IRFujitsuAC::setSwing(uint8_t swingMode) {
switch (_model) {
case ARDB1:
// Set the mode to max if out of range
if (swingMode > FUJITSU_AC_SWING_VERT)
swingMode = FUJITSU_AC_SWING_VERT;
if (swingMode > kFujitsuAcSwingVert)
swingMode = kFujitsuAcSwingVert;
break;
case ARRAH2E:
default:
// Set the mode to max if out of range
if (swingMode > FUJITSU_AC_SWING_BOTH)
swingMode = FUJITSU_AC_SWING_BOTH;
if (swingMode > kFujitsuAcSwingBoth)
swingMode = kFujitsuAcSwingBoth;
}
_swingMode = swingMode;
}
@@ -326,15 +326,15 @@ bool IRFujitsuAC::validChecksum(uint8_t state[], uint16_t length) {
uint8_t sum_complement = 0;
uint8_t checksum = state[length - 1];
switch (length) {
case FUJITSU_AC_STATE_LENGTH_SHORT: // ARRAH2E
case kFujitsuAcStateLengthShort: // ARRAH2E
return state[length - 1] == (uint8_t) ~state[length - 2];
case FUJITSU_AC_STATE_LENGTH - 1: // ARDB1
case kFujitsuAcStateLength - 1: // ARDB1
sum = sumBytes(state, length - 1);
sum_complement = 0x9B;
break;
case FUJITSU_AC_STATE_LENGTH: // ARRAH2E
sum = sumBytes(state + FUJITSU_AC_STATE_LENGTH_SHORT,
length - 1 - FUJITSU_AC_STATE_LENGTH_SHORT);
case kFujitsuAcStateLength: // ARRAH2E
sum = sumBytes(state + kFujitsuAcStateLengthShort,
length - 1 - kFujitsuAcStateLengthShort);
break;
default: // Includes ARDB1 short.
return true; // Assume the checksum is valid for other lengths.
@@ -357,19 +357,19 @@ std::string IRFujitsuAC::toString() {
result += "Off";
result += ", Mode: " + uint64ToString(getMode());
switch (getMode()) {
case FUJITSU_AC_MODE_AUTO:
case kFujitsuAcModeAuto:
result += " (AUTO)";
break;
case FUJITSU_AC_MODE_COOL:
case kFujitsuAcModeCool:
result += " (COOL)";
break;
case FUJITSU_AC_MODE_HEAT:
case kFujitsuAcModeHeat:
result += " (HEAT)";
break;
case FUJITSU_AC_MODE_DRY:
case kFujitsuAcModeDry:
result += " (DRY)";
break;
case FUJITSU_AC_MODE_FAN:
case kFujitsuAcModeFan:
result += " (FAN)";
break;
default:
@@ -378,34 +378,34 @@ std::string IRFujitsuAC::toString() {
result += ", Temp: " + uint64ToString(getTemp()) + "C";
result += ", Fan: " + uint64ToString(getFanSpeed());
switch (getFanSpeed()) {
case FUJITSU_AC_FAN_AUTO:
case kFujitsuAcFanAuto:
result += " (AUTO)";
break;
case FUJITSU_AC_FAN_HIGH:
case kFujitsuAcFanHigh:
result += " (HIGH)";
break;
case FUJITSU_AC_FAN_MED:
case kFujitsuAcFanMed:
result += " (MED)";
break;
case FUJITSU_AC_FAN_LOW:
case kFujitsuAcFanLow:
result += " (LOW)";
break;
case FUJITSU_AC_FAN_QUIET:
case kFujitsuAcFanQuiet:
result += " (QUIET)";
break;
}
result += ", Swing: ";
switch (getSwing()) {
case FUJITSU_AC_SWING_OFF:
case kFujitsuAcSwingOff:
result += "Off";
break;
case FUJITSU_AC_SWING_VERT:
case kFujitsuAcSwingVert:
result += "Vert";
break;
case FUJITSU_AC_SWING_HORIZ:
case kFujitsuAcSwingHoriz:
result += "Horiz";
break;
case FUJITSU_AC_SWING_BOTH:
case kFujitsuAcSwingBoth:
result += "Vert + Horiz";
break;
default:
@@ -413,10 +413,10 @@ std::string IRFujitsuAC::toString() {
}
result += ", Command: ";
switch (getCmd()) {
case FUJITSU_AC_CMD_STEP_HORIZ:
case kFujitsuAcCmdStepHoriz:
result += "Step vane horizontally";
break;
case FUJITSU_AC_CMD_STEP_VERT:
case kFujitsuAcCmdStepVert:
result += "Step vane vertically";
break;
default:
@@ -430,7 +430,7 @@ std::string IRFujitsuAC::toString() {
// Places successful decode information in the results pointer.
// Args:
// results: Ptr to the data to decode and where to store the decode result.
// nbits: The number of data bits to expect. Typically FUJITSU_AC_BITS.
// nbits: The number of data bits to expect. Typically kFujitsuAcBits.
// strict: Flag to indicate if we strictly adhere to the specification.
// Returns:
// boolean: True if it can decode it, false if it can't.
@@ -441,21 +441,21 @@ std::string IRFujitsuAC::toString() {
//
bool IRrecv::decodeFujitsuAC(decode_results *results, uint16_t nbits,
bool strict) {
uint16_t offset = OFFSET_START;
uint16_t offset = kStartOffset;
uint16_t dataBitsSoFar = 0;
// Have we got enough data to successfully decode?
if (results->rawlen < (2 * FUJITSU_AC_MIN_BITS) + HEADER + FOOTER - 1)
if (results->rawlen < (2 * kFujitsuAcMinBits) + kHeader + kFooter - 1)
return false; // Can't possibly be a valid message.
// Compliance
if (strict) {
switch (nbits) {
case FUJITSU_AC_BITS:
case FUJITSU_AC_BITS - 8:
case FUJITSU_AC_MIN_BITS:
case FUJITSU_AC_MIN_BITS + 8:
case kFujitsuAcBits:
case kFujitsuAcBits - 8:
case kFujitsuAcMinBits:
case kFujitsuAcMinBits + 8:
break;
default:
return false; // Must be called with the correct nr. of bits.
@@ -463,22 +463,22 @@ bool IRrecv::decodeFujitsuAC(decode_results *results, uint16_t nbits,
}
// Header
if (!matchMark(results->rawbuf[offset++], FUJITSU_AC_HDR_MARK))
if (!matchMark(results->rawbuf[offset++], kFujitsuAcHdrMark))
return false;
if (!matchSpace(results->rawbuf[offset++], FUJITSU_AC_HDR_SPACE))
if (!matchSpace(results->rawbuf[offset++], kFujitsuAcHdrSpace))
return false;
// Data (Fixed signature)
match_result_t data_result = matchData(&(results->rawbuf[offset]),
FUJITSU_AC_MIN_BITS - 8,
FUJITSU_AC_BIT_MARK,
FUJITSU_AC_ONE_SPACE,
FUJITSU_AC_BIT_MARK,
FUJITSU_AC_ZERO_SPACE);
kFujitsuAcMinBits - 8,
kFujitsuAcBitMark,
kFujitsuAcOneSpace,
kFujitsuAcBitMark,
kFujitsuAcZeroSpace,
kTolerance, kMarkExcess, false);
if (data_result.success == false) return false; // Fail
if (reverseBits(data_result.data, FUJITSU_AC_MIN_BITS - 8) != 0x1010006314)
return false; // Signature failed.
dataBitsSoFar += FUJITSU_AC_MIN_BITS - 8;
if (data_result.data != 0x1010006314) return false; // Signature failed.
dataBitsSoFar += kFujitsuAcMinBits - 8;
offset += data_result.used;
results->state[0] = 0x14;
results->state[1] = 0x63;
@@ -488,23 +488,24 @@ bool IRrecv::decodeFujitsuAC(decode_results *results, uint16_t nbits,
// Keep reading bytes until we either run out of message or state to fill.
for (uint16_t i = 5;
offset <= results->rawlen - 16 && i < FUJITSU_AC_STATE_LENGTH;
offset <= results->rawlen - 16 && i < kFujitsuAcStateLength;
i++, dataBitsSoFar += 8, offset += data_result.used) {
data_result = matchData(&(results->rawbuf[offset]), 8,
FUJITSU_AC_BIT_MARK,
FUJITSU_AC_ONE_SPACE,
FUJITSU_AC_BIT_MARK,
FUJITSU_AC_ZERO_SPACE);
kFujitsuAcBitMark,
kFujitsuAcOneSpace,
kFujitsuAcBitMark,
kFujitsuAcZeroSpace,
kTolerance, kMarkExcess, false);
if (data_result.success == false) break; // Fail
results->state[i] = (uint8_t) reverseBits(data_result.data, 8);
results->state[i] = data_result.data;
}
// Footer
if (offset > results->rawlen ||
!matchMark(results->rawbuf[offset++], FUJITSU_AC_BIT_MARK)) return false;
!matchMark(results->rawbuf[offset++], kFujitsuAcBitMark)) return false;
// The space is optional if we are out of capture.
if (offset < results->rawlen &&
!matchAtLeast(results->rawbuf[offset], FUJITSU_AC_MIN_GAP)) return false;
!matchAtLeast(results->rawbuf[offset], kFujitsuAcMinGap)) return false;
// Compliance
if (strict) {
@@ -516,23 +517,23 @@ bool IRrecv::decodeFujitsuAC(decode_results *results, uint16_t nbits,
// Compliance
switch (dataBitsSoFar) {
case FUJITSU_AC_MIN_BITS:
case kFujitsuAcMinBits:
// Check if this values indicate that this should have been a long state
// message.
if (results->state[5] == 0xFC) return false;
return true; // Success
case FUJITSU_AC_MIN_BITS + 8:
case kFujitsuAcMinBits + 8:
// Check if this values indicate that this should have been a long state
// message.
if (results->state[5] == 0xFE) return false;
// The last byte needs to be the inverse of the penultimate byte.
if (results->state[5] != (uint8_t) ~results->state[6]) return false;
return true; // Success
case FUJITSU_AC_BITS - 8:
case kFujitsuAcBits - 8:
// Long messages of this size require this byte be correct.
if (results->state[5] != 0xFC) return false;
break;
case FUJITSU_AC_BITS:
case kFujitsuAcBits:
// Long messages of this size require this byte be correct.
if (results->state[5] != 0xFE) return false;
break;

68
src/ir_Fujitsu.h
View File

@@ -1,4 +1,5 @@
// Copyright 2017 Jonny Graham
// Copyright 2018 David Conran
#ifndef IR_FUJITSU_H_
#define IR_FUJITSU_H_
@@ -17,33 +18,54 @@
// FUJITSU A/C support added by Jonny Graham
// Constants
const uint8_t kFujitsuAcModeAuto = 0x00;
const uint8_t kFujitsuAcModeCool = 0x01;
const uint8_t kFujitsuAcModeDry = 0x02;
const uint8_t kFujitsuAcModeFan = 0x03;
const uint8_t kFujitsuAcModeHeat = 0x04;
#define FUJITSU_AC_MODE_AUTO 0x00U
#define FUJITSU_AC_MODE_COOL 0x01U
#define FUJITSU_AC_MODE_DRY 0x02U
#define FUJITSU_AC_MODE_FAN 0x03U
#define FUJITSU_AC_MODE_HEAT 0x04U
const uint8_t kFujitsuAcCmdStayOn = 0x00;
const uint8_t kFujitsuAcCmdTurnOn = 0x01;
const uint8_t kFujitsuAcCmdTurnOff = 0x02;
const uint8_t kFujitsuAcCmdStepHoriz = 0x79;
const uint8_t kFujitsuAcCmdStepVert = 0x6C;
#define FUJITSU_AC_CMD_STAY_ON 0x00U
#define FUJITSU_AC_CMD_TURN_ON 0x01U
#define FUJITSU_AC_CMD_TURN_OFF 0x02U
#define FUJITSU_AC_CMD_STEP_HORIZ 0x79U
#define FUJITSU_AC_CMD_STEP_VERT 0x6CU
const uint8_t kFujitsuAcFanAuto = 0x00;
const uint8_t kFujitsuAcFanHigh = 0x01;
const uint8_t kFujitsuAcFanMed = 0x02;
const uint8_t kFujitsuAcFanLow = 0x03;
const uint8_t kFujitsuAcFanQuiet = 0x04;
#define FUJITSU_AC_FAN_AUTO 0x00U
#define FUJITSU_AC_FAN_HIGH 0x01U
#define FUJITSU_AC_FAN_MED 0x02U
#define FUJITSU_AC_FAN_LOW 0x03U
#define FUJITSU_AC_FAN_QUIET 0x04U
const uint8_t kFujitsuAcMinTemp = 16; // 16C
const uint8_t kFujitsuAcMaxTemp = 30; // 30C
#define FUJITSU_AC_MIN_TEMP 16U // 16C
#define FUJITSU_AC_MAX_TEMP 30U // 30C
#define FUJITSU_AC_SWING_OFF 0x00U
#define FUJITSU_AC_SWING_VERT 0x01U
#define FUJITSU_AC_SWING_HORIZ 0x02U
#define FUJITSU_AC_SWING_BOTH 0x03U
const uint8_t kFujitsuAcSwingOff = 0x00;
const uint8_t kFujitsuAcSwingVert = 0x01;
const uint8_t kFujitsuAcSwingHoriz = 0x02;
const uint8_t kFujitsuAcSwingBoth = 0x03;
// Legacy defines.
#define FUJITSU_AC_MODE_AUTO kFujitsuAcModeAuto
#define FUJITSU_AC_MODE_COOL kFujitsuAcModeCool
#define FUJITSU_AC_MODE_DRY kFujitsuAcModeDry
#define FUJITSU_AC_MODE_FAN kFujitsuAcModeFan
#define FUJITSU_AC_MODE_HEAT kFujitsuAcModeHeat
#define FUJITSU_AC_CMD_STAY_ON kFujitsuAcCmdStayOn
#define FUJITSU_AC_CMD_TURN_ON kFujitsuAcCmdTurnOn
#define FUJITSU_AC_CMD_TURN_OFF kFujitsuAcCmdTurnOff
#define FUJITSU_AC_CMD_STEP_HORIZ kFujitsuAcCmdStepHoriz
#define FUJITSU_AC_CMD_STEP_VERT kFujitsuAcCmdStepVert
#define FUJITSU_AC_FAN_AUTO kFujitsuAcFanAuto
#define FUJITSU_AC_FAN_HIGH kFujitsuAcFanHigh
#define FUJITSU_AC_FAN_MED kFujitsuAcFanMed
#define FUJITSU_AC_FAN_LOW kFujitsuAcFanLow
#define FUJITSU_AC_FAN_QUIET kFujitsuAcFanQuiet
#define FUJITSU_AC_MIN_TEMP kFujitsuAcMinTemp
#define FUJITSU_AC_MAX_TEMP kFujitsuAcMaxTemp
#define FUJITSU_AC_SWING_OFF kFujitsuAcSwingOff
#define FUJITSU_AC_SWING_VERT kFujitsuAcSwingVert
#define FUJITSU_AC_SWING_HORIZ kFujitsuAcSwingHoriz
#define FUJITSU_AC_SWING_BOTH kFujitsuAcSwingBoth
enum fujitsu_ac_remote_model_t {
ARRAH2E = 1,
@@ -85,7 +107,7 @@ class IRFujitsuAC {
#endif
private:
uint8_t remote_state[FUJITSU_AC_STATE_LENGTH];
uint8_t remote_state[kFujitsuAcStateLength];
IRsend _irsend;
uint8_t _temp;
uint8_t _fanSpeed;

65
src/ir_GICable.cpp
View File

@@ -18,17 +18,16 @@
// https://github.com/markszabo/IRremoteESP8266/issues/447
// Constants
#define GICABLE_HDR_MARK 9000U
#define GICABLE_HDR_SPACE 4400U
#define GICABLE_BIT_MARK 550U
#define GICABLE_ONE_SPACE 4400U
#define GICABLE_ZERO_SPACE 2200U
#define GICABLE_RPT_SPACE 2200U
#define GICABLE_MIN_COMMAND_LENGTH 99600U
#define GICABLE_MIN_GAP (GICABLE_MIN_COMMAND_LENGTH - \
(GICABLE_HDR_MARK + GICABLE_HDR_SPACE + \
GICABLE_BITS * (GICABLE_BIT_MARK + GICABLE_ONE_SPACE) + GICABLE_BIT_MARK))
const uint16_t kGicableHdrMark = 9000;
const uint16_t kGicableHdrSpace = 4400;
const uint16_t kGicableBitMark = 550;
const uint16_t kGicableOneSpace = 4400;
const uint16_t kGicableZeroSpace = 2200;
const uint16_t kGicableRptSpace = 2200;
const uint32_t kGicableMinCommandLength = 99600;
const uint32_t kGicableMinGap = kGicableMinCommandLength -
(kGicableHdrMark + kGicableHdrSpace +
kGicableBits * (kGicableBitMark + kGicableOneSpace) + kGicableBitMark);
#if SEND_GICABLE
// Send a raw G.I. Cable formatted message.
@@ -36,24 +35,24 @@
// Args:
// data: The message to be sent.
// nbits: The number of bits of the message to be sent.
// Typically GICABLE_BITS.
// Typically kGicableBits.
// repeat: The number of times the command is to be repeated.
//
// Status: Alpha / Untested.
//
// Ref:
void IRsend::sendGICable(uint64_t data, uint16_t nbits, uint16_t repeat) {
sendGeneric(GICABLE_HDR_MARK, GICABLE_HDR_SPACE,
GICABLE_BIT_MARK, GICABLE_ONE_SPACE,
GICABLE_BIT_MARK, GICABLE_ZERO_SPACE,
GICABLE_BIT_MARK, GICABLE_MIN_GAP, GICABLE_MIN_COMMAND_LENGTH,
sendGeneric(kGicableHdrMark, kGicableHdrSpace,
kGicableBitMark, kGicableOneSpace,
kGicableBitMark, kGicableZeroSpace,
kGicableBitMark, kGicableMinGap, kGicableMinCommandLength,
data, nbits, 39, true, 0, // Repeats are handled later.
50);
// Message repeat sequence.
if (repeat)
sendGeneric(GICABLE_HDR_MARK, GICABLE_RPT_SPACE,
sendGeneric(kGicableHdrMark, kGicableRptSpace,
0, 0, 0, 0, // No actual data sent.
GICABLE_BIT_MARK, GICABLE_MIN_GAP, GICABLE_MIN_COMMAND_LENGTH,
kGicableBitMark, kGicableMinGap, kGicableMinCommandLength,
0, 0, // No data to be sent.
39, true, repeat - 1, 50);
}
@@ -64,7 +63,7 @@ void IRsend::sendGICable(uint64_t data, uint16_t nbits, uint16_t repeat) {
//
// Args:
// results: Ptr to the data to decode and where to store the decode result.
// nbits: The number of data bits to expect. Typically GICABLE_BITS.
// nbits: The number of data bits to expect. Typically kGicableBits.
// strict: Flag indicating if we should perform strict matching.
// Returns:
// boolean: True if it can decode it, false if it can't.
@@ -72,40 +71,40 @@ void IRsend::sendGICable(uint64_t data, uint16_t nbits, uint16_t repeat) {
// Status: Alpha / Not tested against a real device.
bool IRrecv::decodeGICable(decode_results *results, uint16_t nbits,
bool strict) {
if (results->rawlen < 2 * (nbits + HEADER + FOOTER) - 1)
if (results->rawlen < 2 * (nbits + kHeader + kFooter) - 1)
return false; // Can't possibly be a valid GICABLE message.
if (strict && nbits != GICABLE_BITS)
if (strict && nbits != kGicableBits)
return false; // Not strictly an GICABLE message.
uint64_t data = 0;
uint16_t offset = OFFSET_START;
uint16_t offset = kStartOffset;
// Header
if (!matchMark(results->rawbuf[offset++], GICABLE_HDR_MARK)) return false;
if (!matchSpace(results->rawbuf[offset++], GICABLE_HDR_SPACE)) return false;
if (!matchMark(results->rawbuf[offset++], kGicableHdrMark)) return false;
if (!matchSpace(results->rawbuf[offset++], kGicableHdrSpace)) return false;
// Data
match_result_t data_result = matchData(&(results->rawbuf[offset]), nbits,
GICABLE_BIT_MARK,
GICABLE_ONE_SPACE,
GICABLE_BIT_MARK,
GICABLE_ZERO_SPACE);
kGicableBitMark,
kGicableOneSpace,
kGicableBitMark,
kGicableZeroSpace);
if (data_result.success == false) return false;
data = data_result.data;
offset += data_result.used;
// Footer
if (!matchMark(results->rawbuf[offset++], GICABLE_BIT_MARK)) return false;
if (!matchMark(results->rawbuf[offset++], kGicableBitMark)) return false;
if (offset < results->rawlen &&
!matchAtLeast(results->rawbuf[offset++], GICABLE_MIN_GAP))
!matchAtLeast(results->rawbuf[offset++], kGicableMinGap))
return false;
// Compliance
if (strict) {
// We expect a repeat frame.
if (!matchMark(results->rawbuf[offset++], GICABLE_HDR_MARK)) return false;
if (!matchSpace(results->rawbuf[offset++], GICABLE_RPT_SPACE)) return false;
if (!matchMark(results->rawbuf[offset++], GICABLE_BIT_MARK)) return false;
if (!matchMark(results->rawbuf[offset++], kGicableHdrMark)) return false;
if (!matchSpace(results->rawbuf[offset++], kGicableRptSpace)) return false;
if (!matchMark(results->rawbuf[offset++], kGicableBitMark)) return false;
}
// Success

28
src/ir_GlobalCache.cpp
View File

@@ -14,12 +14,12 @@
// (http://www.hishamkhalifa.com)
// Constants
#define GLOBALCACHE_MAX_REPEAT 50U
#define GLOBALCACHE_MIN_USEC 80U
#define GLOBALCACHE_FREQ_INDEX 0U
#define GLOBALCACHE_RPT_INDEX GLOBALCACHE_FREQ_INDEX + 1U
#define GLOBALCACHE_RPT_START_INDEX GLOBALCACHE_RPT_INDEX + 1U
#define GLOBALCACHE_START_INDEX GLOBALCACHE_RPT_START_INDEX + 1U
const uint16_t kGlobalCacheMaxRepeat = 50;
const uint32_t kGlobalCacheMinUsec = 80;
const uint8_t kGlobalCacheFreqIndex = 0;
const uint8_t kGlobalCacheRptIndex = kGlobalCacheFreqIndex + 1;
const uint8_t kGlobalCacheRptStartIndex = kGlobalCacheRptIndex + 1;
const uint8_t kGlobalCacheStartIndex = kGlobalCacheRptStartIndex + 1;
#if SEND_GLOBALCACHE
// Send a shortened GlobalCache (GC) IRdb/control tower formatted message.
@@ -40,24 +40,24 @@
// Ref:
// https://irdb.globalcache.com/Home/Database
void IRsend::sendGC(uint16_t buf[], uint16_t len) {
uint16_t hz = buf[GLOBALCACHE_FREQ_INDEX]; // GC frequency is in Hz.
uint16_t hz = buf[kGlobalCacheFreqIndex]; // GC frequency is in Hz.
enableIROut(hz);
uint32_t periodic_time = calcUSecPeriod(hz, false);
uint8_t emits = std::min(buf[GLOBALCACHE_RPT_INDEX],
(uint16_t) GLOBALCACHE_MAX_REPEAT);
uint8_t emits = std::min(buf[kGlobalCacheRptIndex],
(uint16_t) kGlobalCacheMaxRepeat);
// Repeat
for (uint8_t repeat = 0; repeat < emits; repeat++) {
// First time through, start at the beginning (GLOBALCACHE_START_INDEX),
// First time through, start at the beginning (kGlobalCacheStartIndex),
// otherwise for repeats, we start a specified offset from that.
uint16_t offset = GLOBALCACHE_START_INDEX;
uint16_t offset = kGlobalCacheStartIndex;
if (repeat)
offset += buf[GLOBALCACHE_RPT_START_INDEX] - 1;
offset += buf[kGlobalCacheRptStartIndex] - 1;
// Data
for (; offset < len; offset++) {
// Convert periodic units to microseconds.
// Minimum is GLOBALCACHE_MIN_USEC for actual GC units.
// Minimum is kGlobalCacheMinUsec for actual GC units.
uint32_t microseconds = std::max(buf[offset] * periodic_time,
GLOBALCACHE_MIN_USEC);
kGlobalCacheMinUsec);
// These codes start at an odd index (not even as with sendRaw).
if (offset & 1) // Odd bit.
mark(microseconds);

220
src/ir_Gree.cpp
View File

@@ -26,21 +26,21 @@
// Constants
// Ref: https://github.com/ToniA/arduino-heatpumpir/blob/master/GreeHeatpumpIR.h
#define GREE_HDR_MARK 9000U
#define GREE_HDR_SPACE 4000U
#define GREE_BIT_MARK 620U
#define GREE_ONE_SPACE 1600U
#define GREE_ZERO_SPACE 540U
#define GREE_MSG_SPACE 19000U
#define GREE_BLOCK_FOOTER 0b010U
#define GREE_BLOCK_FOOTER_BITS 3U
const uint16_t kGreeHdrMark = 9000;
const uint16_t kGreeHdrSpace = 4000;
const uint16_t kGreeBitMark = 620;
const uint16_t kGreeOneSpace = 1600;
const uint16_t kGreeZeroSpace = 540;
const uint16_t kGreeMsgSpace = 19000;
const uint8_t kGreeBlockFooter = 0b010;
const uint8_t kGreeBlockFooterBits = 3;
#if SEND_GREE
// Send a Gree Heat Pump message.
//
// Args:
// data: An array of bytes containing the IR command.
// nbytes: Nr. of bytes of data in the array. (>=GREE_STATE_LENGTH)
// nbytes: Nr. of bytes of data in the array. (>=kGreeStateLength)
// repeat: Nr. of times the message is to be repeated. (Default = 0).
//
// Status: ALPHA / Untested.
@@ -48,28 +48,28 @@
// Ref:
// https://github.com/ToniA/arduino-heatpumpir/blob/master/GreeHeatpumpIR.cpp
void IRsend::sendGree(unsigned char data[], uint16_t nbytes, uint16_t repeat) {
if (nbytes < GREE_STATE_LENGTH)
if (nbytes < kGreeStateLength)
return; // Not enough bytes to send a proper message.
for (uint16_t r = 0; r <= repeat; r++) {
// Block #1
sendGeneric(GREE_HDR_MARK, GREE_HDR_SPACE,
GREE_BIT_MARK, GREE_ONE_SPACE,
GREE_BIT_MARK, GREE_ZERO_SPACE,
sendGeneric(kGreeHdrMark, kGreeHdrSpace,
kGreeBitMark, kGreeOneSpace,
kGreeBitMark, kGreeZeroSpace,
0, 0, // No Footer.
data, 4, 38, false, 0, 50);
// Footer #1
sendGeneric(0, 0, // No Header
GREE_BIT_MARK, GREE_ONE_SPACE,
GREE_BIT_MARK, GREE_ZERO_SPACE,
GREE_BIT_MARK, GREE_MSG_SPACE,
kGreeBitMark, kGreeOneSpace,
kGreeBitMark, kGreeZeroSpace,
kGreeBitMark, kGreeMsgSpace,
0b010, 3, 38, true, 0, false);
// Block #2
sendGeneric(0, 0, // No Header for Block #2
GREE_BIT_MARK, GREE_ONE_SPACE,
GREE_BIT_MARK, GREE_ZERO_SPACE,
GREE_BIT_MARK, GREE_MSG_SPACE,
kGreeBitMark, kGreeOneSpace,
kGreeBitMark, kGreeZeroSpace,
kGreeBitMark, kGreeMsgSpace,
data + 4, nbytes - 4, 38, false, 0, 50);
}
}
@@ -78,7 +78,7 @@ void IRsend::sendGree(unsigned char data[], uint16_t nbytes, uint16_t repeat) {
//
// Args:
// data: The raw message to be sent.
// nbits: Nr. of bits of data in the message. (Default is GREE_BITS)
// nbits: Nr. of bits of data in the message. (Default is kGreeBits)
// repeat: Nr. of times the message is to be repeated. (Default = 0).
//
// Status: ALPHA / Untested.
@@ -86,31 +86,31 @@ void IRsend::sendGree(unsigned char data[], uint16_t nbytes, uint16_t repeat) {
// Ref:
// https://github.com/ToniA/arduino-heatpumpir/blob/master/GreeHeatpumpIR.cpp
void IRsend::sendGree(uint64_t data, uint16_t nbits, uint16_t repeat) {
if (nbits != GREE_BITS)
if (nbits != kGreeBits)
return; // Wrong nr. of bits to send a proper message.
// Set IR carrier frequency
enableIROut(38);
for (uint16_t r = 0; r <= repeat; r++) {
// Header
mark(GREE_HDR_MARK);
space(GREE_HDR_SPACE);
mark(kGreeHdrMark);
space(kGreeHdrSpace);
// Data
for (int16_t i = 8; i <= nbits; i += 8) {
sendData(GREE_BIT_MARK, GREE_ONE_SPACE, GREE_BIT_MARK, GREE_ZERO_SPACE,
sendData(kGreeBitMark, kGreeOneSpace, kGreeBitMark, kGreeZeroSpace,
(data >> (nbits - i)) & 0xFF, 8, false);
if (i == nbits / 2) {
// Send the mid-message Footer.
sendData(GREE_BIT_MARK, GREE_ONE_SPACE, GREE_BIT_MARK, GREE_ZERO_SPACE,
sendData(kGreeBitMark, kGreeOneSpace, kGreeBitMark, kGreeZeroSpace,
0b010, 3);
mark(GREE_BIT_MARK);
space(GREE_MSG_SPACE);
mark(kGreeBitMark);
space(kGreeMsgSpace);
}
}
// Footer
mark(GREE_BIT_MARK);
space(GREE_MSG_SPACE);
mark(kGreeBitMark);
space(kGreeMsgSpace);
}
}
#endif // SEND_GREE
@@ -121,7 +121,7 @@ IRGreeAC::IRGreeAC(uint16_t pin) : _irsend(pin) {
void IRGreeAC::stateReset() {
// This resets to a known-good state to Power Off, Fan Auto, Mode Auto, 25C.
for (uint8_t i = 0; i < GREE_STATE_LENGTH; i++)
for (uint8_t i = 0; i < kGreeStateLength; i++)
remote_state[i] = 0x0;
remote_state[1] = 0x09;
remote_state[2] = 0x20;
@@ -151,7 +151,7 @@ uint8_t* IRGreeAC::getRaw() {
}
void IRGreeAC::setRaw(uint8_t new_code[]) {
for (uint8_t i = 0; i < GREE_STATE_LENGTH; i++) {
for (uint8_t i = 0; i < kGreeStateLength; i++) {
remote_state[i] = new_code[i];
}
}
@@ -178,13 +178,13 @@ bool IRGreeAC::validChecksum(const uint8_t state[], const uint16_t length) {
}
void IRGreeAC::on() {
remote_state[0] |= GREE_POWER1_MASK;
remote_state[2] |= GREE_POWER2_MASK;
remote_state[0] |= kGreePower1Mask;
remote_state[2] |= kGreePower2Mask;
}
void IRGreeAC::off() {
remote_state[0] &= ~GREE_POWER1_MASK;
remote_state[2] &= ~GREE_POWER2_MASK;
remote_state[0] &= ~kGreePower1Mask;
remote_state[2] &= ~kGreePower2Mask;
}
void IRGreeAC::setPower(const bool state) {
@@ -195,136 +195,136 @@ void IRGreeAC::setPower(const bool state) {
}
bool IRGreeAC::getPower() {
return (remote_state[0] & GREE_POWER1_MASK) &&
(remote_state[2] & GREE_POWER2_MASK);
return (remote_state[0] & kGreePower1Mask) &&
(remote_state[2] & kGreePower2Mask);
}
// Set the temp. in deg C
void IRGreeAC::setTemp(const uint8_t temp) {
uint8_t new_temp = std::max((uint8_t) GREE_MIN_TEMP, temp);
new_temp = std::min((uint8_t) GREE_MAX_TEMP, new_temp);
if (getMode() == GREE_AUTO) new_temp = 25;
remote_state[1] = (remote_state[1] & 0xF0U) | (new_temp - GREE_MIN_TEMP);
uint8_t new_temp = std::max((uint8_t) kGreeMinTemp, temp);
new_temp = std::min((uint8_t) kGreeMaxTemp, new_temp);
if (getMode() == kGreeAuto) new_temp = 25;
remote_state[1] = (remote_state[1] & 0xF0U) | (new_temp - kGreeMinTemp);
}
// Return the set temp. in deg C
uint8_t IRGreeAC::getTemp() {
return ((remote_state[1] & 0xFU) + GREE_MIN_TEMP);
return ((remote_state[1] & 0xFU) + kGreeMinTemp);
}
// Set the speed of the fan, 0-3, 0 is auto, 1-3 is the speed
void IRGreeAC::setFan(const uint8_t speed) {
uint8_t fan = std::min((uint8_t) GREE_FAN_MAX, speed); // Bounds check
uint8_t fan = std::min((uint8_t) kGreeFanMax, speed); // Bounds check
if (getMode() == GREE_DRY) fan = 1; // DRY mode is always locked to fan 1.
if (getMode() == kGreeDry) fan = 1; // DRY mode is always locked to fan 1.
// Set the basic fan values.
remote_state[0] &= ~GREE_FAN_MASK;
remote_state[0] &= ~kGreeFanMask;
remote_state[0] |= (fan << 4);
}
uint8_t IRGreeAC::getFan() {
return ((remote_state[0] & GREE_FAN_MASK) >> 4);
return ((remote_state[0] & kGreeFanMask) >> 4);
}
void IRGreeAC::setMode(const uint8_t new_mode) {
uint8_t mode = new_mode;
switch (mode) {
case GREE_AUTO:
case kGreeAuto:
// AUTO is locked to 25C
setTemp(25);
break;
case GREE_DRY:
case kGreeDry:
// DRY always sets the fan to 1.
setFan(1);
break;
case GREE_COOL:
case GREE_FAN:
case GREE_HEAT:
case kGreeCool:
case kGreeFan:
case kGreeHeat:
break;
default:
// If we get an unexpected mode, default to AUTO.
mode = GREE_AUTO;
mode = kGreeAuto;
}
remote_state[0] &= ~GREE_MODE_MASK;
remote_state[0] &= ~kGreeModeMask;
remote_state[0] |= mode;
}
uint8_t IRGreeAC::getMode() {
return (remote_state[0] & GREE_MODE_MASK);
return (remote_state[0] & kGreeModeMask);
}
void IRGreeAC::setLight(const bool state) {
remote_state[2] &= ~GREE_LIGHT_MASK;
remote_state[2] &= ~kGreeLightMask;
remote_state[2] |= (state << 5);
}
bool IRGreeAC::getLight() {
return remote_state[2] & GREE_LIGHT_MASK;
return remote_state[2] & kGreeLightMask;
}
void IRGreeAC::setXFan(const bool state) {
remote_state[2] &= ~GREE_XFAN_MASK;
remote_state[2] &= ~kGreeXfanMask;
remote_state[2] |= (state << 7);
}
bool IRGreeAC::getXFan() {
return remote_state[2] & GREE_XFAN_MASK;
return remote_state[2] & kGreeXfanMask;
}
void IRGreeAC::setSleep(const bool state) {
remote_state[0] &= ~GREE_SLEEP_MASK;
remote_state[0] &= ~kGreeSleepMask;
remote_state[0] |= (state << 7);
}
bool IRGreeAC::getSleep() {
return remote_state[0] & GREE_SLEEP_MASK;
return remote_state[0] & kGreeSleepMask;
}
void IRGreeAC::setTurbo(const bool state) {
remote_state[2] &= ~GREE_TURBO_MASK;
remote_state[2] &= ~kGreeTurboMask;
remote_state[2] |= (state << 4);
}
bool IRGreeAC::getTurbo() {
return remote_state[2] & GREE_TURBO_MASK;
return remote_state[2] & kGreeTurboMask;
}
void IRGreeAC::setSwingVertical(const bool automatic, const uint8_t position) {
remote_state[0] &= ~GREE_SWING_AUTO_MASK;
remote_state[0] &= ~kGreeSwingAutoMask;
remote_state[0] |= (automatic << 6);
uint8_t new_position = position;
if (!automatic) {
switch (position) {
case GREE_SWING_UP:
case GREE_SWING_MIDDLE_UP:
case GREE_SWING_MIDDLE:
case GREE_SWING_MIDDLE_DOWN:
case GREE_SWING_DOWN:
case kGreeSwingUp:
case kGreeSwingMiddleUp:
case kGreeSwingMiddle:
case kGreeSwingMiddleDown:
case kGreeSwingDown:
break;
default:
new_position = GREE_SWING_LAST_POS;
new_position = kGreeSwingLastPos;
}
} else {
switch (position) {
case GREE_SWING_AUTO:
case GREE_SWING_DOWN_AUTO:
case GREE_SWING_MIDDLE_AUTO:
case GREE_SWING_UP_AUTO:
case kGreeSwingAuto:
case kGreeSwingDownAuto:
case kGreeSwingMiddleAuto:
case kGreeSwingUpAuto:
break;
default:
new_position = GREE_SWING_AUTO;
new_position = kGreeSwingAuto;
}
}
remote_state[4] &= ~GREE_SWING_POS_MASK;
remote_state[4] &= ~kGreeSwingPosMask;
remote_state[4] |= new_position;
}
bool IRGreeAC::getSwingVerticalAuto() {
return remote_state[0] & GREE_SWING_AUTO_MASK;
return remote_state[0] & kGreeSwingAutoMask;
}
uint8_t IRGreeAC::getSwingVerticalPosition() {
return remote_state[4] & GREE_SWING_POS_MASK;
return remote_state[4] & kGreeSwingPosMask;
}
// Convert the internal state into a human readable string.
@@ -342,19 +342,19 @@ std::string IRGreeAC::toString() {
result += "Off";
result += ", Mode: " + uint64ToString(getMode());
switch (getMode()) {
case GREE_AUTO:
case kGreeAuto:
result += " (AUTO)";
break;
case GREE_COOL:
case kGreeCool:
result += " (COOL)";
break;
case GREE_HEAT:
case kGreeHeat:
result += " (HEAT)";
break;
case GREE_DRY:
case kGreeDry:
result += " (DRY)";
break;
case GREE_FAN:
case kGreeFan:
result += " (FAN)";
break;
default:
@@ -366,7 +366,7 @@ std::string IRGreeAC::toString() {
case 0:
result += " (AUTO)";
break;
case GREE_FAN_MAX:
case kGreeFanMax:
result += " (MAX)";
break;
}
@@ -398,10 +398,10 @@ std::string IRGreeAC::toString() {
result += ", Swing Vertical Pos: " +
uint64ToString(getSwingVerticalPosition());
switch (getSwingVerticalPosition()) {
case GREE_SWING_LAST_POS:
case kGreeSwingLastPos:
result += " (Last Pos)";
break;
case GREE_SWING_AUTO:
case kGreeSwingAuto:
result += " (Auto)";
break;
}
@@ -413,21 +413,21 @@ std::string IRGreeAC::toString() {
//
// Args:
// results: Ptr to the data to decode and where to store the decode result.
// nbits: The number of data bits to expect. Typically GREE_BITS.
// nbits: The number of data bits to expect. Typically kGreeBits.
// strict: Flag indicating if we should perform strict matching.
// Returns:
// boolean: True if it can decode it, false if it can't.
//
// Status: ALPHA / Untested.
bool IRrecv::decodeGree(decode_results *results, uint16_t nbits, bool strict) {
if (results->rawlen < 2 * (nbits + GREE_BLOCK_FOOTER_BITS) +
(HEADER + FOOTER + 1))
if (results->rawlen < 2 * (nbits + kGreeBlockFooterBits) +
(kHeader + kFooter + 1))
return false; // Can't possibly be a valid Gree message.
if (strict && nbits != GREE_BITS)
if (strict && nbits != kGreeBits)
return false; // Not strictly a Gree message.
uint32_t data;
uint16_t offset = OFFSET_START;
uint16_t offset = kStartOffset;
// There are two blocks back-to-back in a full Gree IR message
// sequence.
@@ -435,54 +435,56 @@ bool IRrecv::decodeGree(decode_results *results, uint16_t nbits, bool strict) {
match_result_t data_result;
// Header
if (!matchMark(results->rawbuf[offset++], GREE_HDR_MARK)) return false;
if (!matchSpace(results->rawbuf[offset++], GREE_HDR_SPACE)) return false;
if (!matchMark(results->rawbuf[offset++], kGreeHdrMark)) return false;
if (!matchSpace(results->rawbuf[offset++], kGreeHdrSpace)) return false;
// Data Block #1 (32 bits)
data_result = matchData(&(results->rawbuf[offset]), 32, GREE_BIT_MARK,
GREE_ONE_SPACE, GREE_BIT_MARK, GREE_ZERO_SPACE);
data_result = matchData(&(results->rawbuf[offset]), 32, kGreeBitMark,
kGreeOneSpace, kGreeBitMark, kGreeZeroSpace,
kTolerance, kMarkExcess, false);
if (data_result.success == false) return false;
data = data_result.data;
offset += data_result.used;
// Record Data Block #1 in the state.
for (int i = state_pos + 3; i >= state_pos; i--, data >>= 8)
results->state[i] = reverseBits(data & 0xFF, 8);
for (uint16_t i = 0; i < 4; i++, data >>= 8)
results->state[state_pos + i] = data & 0xFF;
state_pos += 4;
// Block #1 footer (3 bits, B010)
data_result = matchData(&(results->rawbuf[offset]), GREE_BLOCK_FOOTER_BITS,
GREE_BIT_MARK, GREE_ONE_SPACE, GREE_BIT_MARK,
GREE_ZERO_SPACE);
data_result = matchData(&(results->rawbuf[offset]), kGreeBlockFooterBits,
kGreeBitMark, kGreeOneSpace, kGreeBitMark,
kGreeZeroSpace, kTolerance, kMarkExcess, false);
if (data_result.success == false) return false;
if (data_result.data != GREE_BLOCK_FOOTER) return false;
if (data_result.data != kGreeBlockFooter) return false;
offset += data_result.used;
// Inter-block gap.
if (!matchMark(results->rawbuf[offset++], GREE_BIT_MARK)) return false;
if (!matchSpace(results->rawbuf[offset++], GREE_MSG_SPACE)) return false;
if (!matchMark(results->rawbuf[offset++], kGreeBitMark)) return false;
if (!matchSpace(results->rawbuf[offset++], kGreeMsgSpace)) return false;
// Data Block #2 (32 bits)
data_result = matchData(&(results->rawbuf[offset]), 32, GREE_BIT_MARK,
GREE_ONE_SPACE, GREE_BIT_MARK, GREE_ZERO_SPACE);
data_result = matchData(&(results->rawbuf[offset]), 32, kGreeBitMark,
kGreeOneSpace, kGreeBitMark, kGreeZeroSpace,
kTolerance, kMarkExcess, false);
if (data_result.success == false) return false;
data = data_result.data;
offset += data_result.used;
// Record Data Block #2 in the state.
for (int i = state_pos + 3; i >= state_pos; i--, data >>= 8)
results->state[i] = reverseBits(data & 0xFF, 8);
for (uint16_t i = 0; i < 4; i++, data >>= 8)
results->state[state_pos + i] = data & 0xFF;
state_pos += 4;
// Footer.
if (!matchMark(results->rawbuf[offset++], GREE_BIT_MARK)) return false;
if (!matchMark(results->rawbuf[offset++], kGreeBitMark)) return false;
if (offset <= results->rawlen &&
!matchAtLeast(results->rawbuf[offset], GREE_MSG_SPACE))
!matchAtLeast(results->rawbuf[offset], kGreeMsgSpace))
return false;
// Compliance
if (strict) {
// Correct size/length)
if (state_pos != GREE_STATE_LENGTH) return false;
if (state_pos != kGreeStateLength) return false;
// Verify the message's checksum is correct.
if (!IRGreeAC::validChecksum(results->state)) return false;
}

82
src/ir_Gree.h
View File

@@ -22,40 +22,60 @@
// GGGGGG RR RR EEEEEEE EEEEEEE
// Constants
#define GREE_AUTO 0U
#define GREE_COOL 1U
#define GREE_DRY 2U
#define GREE_FAN 3U
#define GREE_HEAT 4U
const uint8_t kGreeAuto = 0;
const uint8_t kGreeCool = 1;
const uint8_t kGreeDry = 2;
const uint8_t kGreeFan = 3;
const uint8_t kGreeHeat = 4;
// Byte 0
#define GREE_MODE_MASK 0b00000111U
#define GREE_POWER1_MASK 0b00001000U
#define GREE_FAN_MASK 0b00110000U
#define GREE_SWING_AUTO_MASK 0b01000000U
#define GREE_SLEEP_MASK 0b10000000U
const uint8_t kGreeModeMask = 0b00000111;
const uint8_t kGreePower1Mask = 0b00001000;
const uint8_t kGreeFanMask = 0b00110000;
const uint8_t kGreeSwingAutoMask = 0b01000000;
const uint8_t kGreeSleepMask = 0b10000000;
// Byte 2
#define GREE_TURBO_MASK 0b00010000U
#define GREE_LIGHT_MASK 0b00100000U
#define GREE_POWER2_MASK 0b01000000U
#define GREE_XFAN_MASK 0b10000000U
const uint8_t kGreeTurboMask = 0b00010000;
const uint8_t kGreeLightMask = 0b00100000;
const uint8_t kGreePower2Mask = 0b01000000;
const uint8_t kGreeXfanMask = 0b10000000;
// Byte 4
#define GREE_SWING_POS_MASK 0b00001111U
const uint8_t kGreeSwingPosMask = 0b00001111;
#define GREE_MIN_TEMP 16U // Celsius
#define GREE_MAX_TEMP 30U // Celsius
#define GREE_FAN_MAX 3U
const uint8_t kGreeMinTemp = 16; // Celsius
const uint8_t kGreeMaxTemp = 30; // Celsius
const uint8_t kGreeFanMax = 3;
#define GREE_SWING_LAST_POS 0b00000000U
#define GREE_SWING_AUTO 0b00000001U
#define GREE_SWING_UP 0b00000010U
#define GREE_SWING_MIDDLE_UP 0b00000011U
#define GREE_SWING_MIDDLE 0b00000100U
#define GREE_SWING_MIDDLE_DOWN 0b00000101U
#define GREE_SWING_DOWN 0b00000110U
#define GREE_SWING_DOWN_AUTO 0b00000111U
#define GREE_SWING_MIDDLE_AUTO 0b00001001U
#define GREE_SWING_UP_AUTO 0b00001011U
const uint8_t kGreeSwingLastPos = 0b00000000;
const uint8_t kGreeSwingAuto = 0b00000001;
const uint8_t kGreeSwingUp = 0b00000010;
const uint8_t kGreeSwingMiddleUp = 0b00000011;
const uint8_t kGreeSwingMiddle = 0b00000100;
const uint8_t kGreeSwingMiddleDown = 0b00000101;
const uint8_t kGreeSwingDown = 0b00000110;
const uint8_t kGreeSwingDownAuto = 0b00000111;
const uint8_t kGreeSwingMiddleAuto = 0b00001001;
const uint8_t kGreeSwingUpAuto = 0b00001011;
// Legacy defines.
#define GREE_AUTO kGreeAuto
#define GREE_COOL kGreeCool
#define GREE_DRY kGreeDry
#define GREE_FAN kGreeFan
#define GREE_HEAT kGreeHeat
#define GREE_MIN_TEMP kGreeMinTemp
#define GREE_MAX_TEMP kGreeMaxTemp
#define GREE_FAN_MAX kGreeFanMax
#define GREE_SWING_LAST_POS kGreeSwingLastPos
#define GREE_SWING_AUTO kGreeSwingAuto
#define GREE_SWING_UP kGreeSwingUp
#define GREE_SWING_MIDDLE_UP kGreeSwingMiddleUp
#define GREE_SWING_MIDDLE kGreeSwingMiddle
#define GREE_SWING_MIDDLE_DOWN kGreeSwingMiddleDown
#define GREE_SWING_DOWN kGreeSwingDown
#define GREE_SWING_DOWN_AUTO kGreeSwingDownAuto
#define GREE_SWING_MIDDLE_AUTO kGreeSwingMiddleAuto
#define GREE_SWING_UP_AUTO kGreeSwingUpAuto
// Classes
class IRGreeAC {
@@ -92,7 +112,7 @@ class IRGreeAC {
uint8_t* getRaw();
void setRaw(uint8_t new_code[]);
static bool validChecksum(const uint8_t state[],
const uint16_t length = GREE_STATE_LENGTH);
const uint16_t length = kGreeStateLength);
#ifdef ARDUINO
String toString();
#else
@@ -101,8 +121,8 @@ class IRGreeAC {
private:
// The state of the IR remote in IR code form.
uint8_t remote_state[GREE_STATE_LENGTH];
void checksum(const uint16_t length = GREE_STATE_LENGTH);
uint8_t remote_state[kGreeStateLength];
void checksum(const uint16_t length = kGreeStateLength);
void fixup();
IRsend _irsend;
};

401
src/ir_Haier.cpp
View File

@@ -30,37 +30,36 @@
// https://www.dropbox.com/sh/w0bt7egp0fjger5/AADRFV6Wg4wZskJVdFvzb8Z0a?dl=0&preview=haer2.ods
// Constants
#define HAIER_AC_HDR 3000U
#define HAIER_AC_HDR_GAP 4300U
#define HAIER_AC_BIT_MARK 520U
#define HAIER_AC_ONE_SPACE 1650U
#define HAIER_AC_ZERO_SPACE 650U
#define HAIER_AC_MIN_GAP 150000U // Completely made up value.
const uint16_t kHaierAcHdr = 3000;
const uint16_t kHaierAcHdrGap = 4300;
const uint16_t kHaierAcBitMark = 520;
const uint16_t kHaierAcOneSpace = 1650;
const uint16_t kHaierAcZeroSpace = 650;
const uint32_t kHaierAcMinGap = 150000; // Completely made up value.
#if (SEND_HAIER_AC || SEND_HAIER_AC_YRW02)
// Send a Haier A/C message. (HSU07-HEA03 remote)
//
// Args:
// data: An array of bytes containing the IR command.
// nbytes: Nr. of bytes of data in the array. (>=HAIER_AC_STATE_LENGTH)
// nbytes: Nr. of bytes of data in the array. (>=kHaierACStateLength)
// repeat: Nr. of times the message is to be repeated. (Default = 0).
//
// Status: Beta / Probably working.
//
void IRsend::sendHaierAC(unsigned char data[], uint16_t nbytes,
uint16_t repeat) {
if (nbytes < HAIER_AC_STATE_LENGTH)
if (nbytes < kHaierACStateLength)
return;
for (uint16_t r = 0; r <= repeat; r++) {
enableIROut(38000);
mark(HAIER_AC_HDR);
space(HAIER_AC_HDR);
sendGeneric(HAIER_AC_HDR, HAIER_AC_HDR_GAP,
HAIER_AC_BIT_MARK, HAIER_AC_ONE_SPACE,
HAIER_AC_BIT_MARK, HAIER_AC_ZERO_SPACE,
HAIER_AC_BIT_MARK, HAIER_AC_MIN_GAP,
mark(kHaierAcHdr);
space(kHaierAcHdr);
sendGeneric(kHaierAcHdr, kHaierAcHdrGap,
kHaierAcBitMark, kHaierAcOneSpace,
kHaierAcBitMark, kHaierAcZeroSpace,
kHaierAcBitMark, kHaierAcMinGap,
data, nbytes, 38, true, 0, // Repeats handled elsewhere
50);
}
@@ -72,14 +71,14 @@ void IRsend::sendHaierAC(unsigned char data[], uint16_t nbytes,
//
// Args:
// data: An array of bytes containing the IR command.
// nbytes: Nr. of bytes of data in the array. (>=HAIER_AC_YRW02_STATE_LENGTH)
// nbytes: Nr. of bytes of data in the array. (>=kHaierACYRW02StateLength)
// repeat: Nr. of times the message is to be repeated. (Default = 0).
//
// Status: Alpha / Untested on a real device.
//
void IRsend::sendHaierACYRW02(unsigned char data[], uint16_t nbytes,
uint16_t repeat) {
if (nbytes >= HAIER_AC_YRW02_STATE_LENGTH)
if (nbytes >= kHaierACYRW02StateLength)
sendHaierAC(data, nbytes, repeat);
}
#endif // SEND_HAIER_AC_YRW02
@@ -101,7 +100,7 @@ void IRHaierAC::send() {
#endif // SEND_HAIER_AC
void IRHaierAC::checksum() {
remote_state[8] = sumBytes(remote_state, HAIER_AC_STATE_LENGTH - 1);
remote_state[8] = sumBytes(remote_state, kHaierACStateLength - 1);
}
bool IRHaierAC::validChecksum(uint8_t state[], const uint16_t length) {
@@ -110,15 +109,15 @@ bool IRHaierAC::validChecksum(uint8_t state[], const uint16_t length) {
}
void IRHaierAC::stateReset() {
for (uint8_t i = 1; i < HAIER_AC_STATE_LENGTH; i++)
for (uint8_t i = 1; i < kHaierACStateLength; i++)
remote_state[i] = 0x0;
remote_state[0] = HAIER_AC_PREFIX;
remote_state[0] = kHaierAcPrefix;
remote_state[2] = 0b00100000;
setTemp(HAIER_AC_DEF_TEMP);
setFan(HAIER_AC_FAN_AUTO);
setMode(HAIER_AC_AUTO);
setCommand(HAIER_AC_CMD_ON);
setTemp(kHaierAcDefTemp);
setFan(kHaierAcFanAuto);
setMode(kHaierAcAuto);
setCommand(kHaierAcCmdOn);
}
uint8_t* IRHaierAC::getRaw() {
@@ -127,7 +126,7 @@ uint8_t* IRHaierAC::getRaw() {
}
void IRHaierAC::setRaw(uint8_t new_code[]) {
for (uint8_t i = 0; i < HAIER_AC_STATE_LENGTH; i++) {
for (uint8_t i = 0; i < kHaierACStateLength; i++) {
remote_state[i] = new_code[i];
}
}
@@ -135,17 +134,17 @@ void IRHaierAC::setRaw(uint8_t new_code[]) {
void IRHaierAC::setCommand(uint8_t state) {
remote_state[1] &= 0b11110000;
switch (state) {
case HAIER_AC_CMD_OFF:
case HAIER_AC_CMD_ON:
case HAIER_AC_CMD_MODE:
case HAIER_AC_CMD_FAN:
case HAIER_AC_CMD_TEMP_UP:
case HAIER_AC_CMD_TEMP_DOWN:
case HAIER_AC_CMD_SLEEP:
case HAIER_AC_CMD_TIMER_SET:
case HAIER_AC_CMD_TIMER_CANCEL:
case HAIER_AC_CMD_HEALTH:
case HAIER_AC_CMD_SWING:
case kHaierAcCmdOff:
case kHaierAcCmdOn:
case kHaierAcCmdMode:
case kHaierAcCmdFan:
case kHaierAcCmdTempUp:
case kHaierAcCmdTempDown:
case kHaierAcCmdSleep:
case kHaierAcCmdTimerSet:
case kHaierAcCmdTimerCancel:
case kHaierAcCmdHealth:
case kHaierAcCmdSwing:
remote_state[1] |= (state & 0b00001111);
}
}
@@ -155,22 +154,22 @@ uint8_t IRHaierAC::getCommand() {
}
void IRHaierAC::setFan(uint8_t speed) {
uint8_t new_speed = HAIER_AC_FAN_AUTO;
uint8_t new_speed = kHaierAcFanAuto;
switch (speed) {
case HAIER_AC_FAN_LOW:
case kHaierAcFanLow:
new_speed = 3;
break;
case HAIER_AC_FAN_MED:
case kHaierAcFanMed:
new_speed = 1;
break;
case HAIER_AC_FAN_HIGH:
case kHaierAcFanHigh:
new_speed = 2;
break;
default:
new_speed = HAIER_AC_FAN_AUTO; // Default to auto for anything else.
new_speed = kHaierAcFanAuto; // Default to auto for anything else.
}
if (speed != getFan()) setCommand(HAIER_AC_CMD_FAN);
if (speed != getFan()) setCommand(kHaierAcCmdFan);
remote_state[5] &= 0b11111100;
remote_state[5] |= new_speed;
}
@@ -178,21 +177,21 @@ void IRHaierAC::setFan(uint8_t speed) {
uint8_t IRHaierAC::getFan() {
switch (remote_state[5] & 0b00000011) {
case 1:
return HAIER_AC_FAN_MED;
return kHaierAcFanMed;
case 2:
return HAIER_AC_FAN_HIGH;
return kHaierAcFanHigh;
case 3:
return HAIER_AC_FAN_LOW;
return kHaierAcFanLow;
default:
return HAIER_AC_FAN_AUTO;
return kHaierAcFanAuto;
}
}
void IRHaierAC::setMode(uint8_t mode) {
uint8_t new_mode = mode;
setCommand(HAIER_AC_CMD_MODE);
if (mode > HAIER_AC_FAN) // If out of range, default to auto mode.
new_mode = HAIER_AC_AUTO;
setCommand(kHaierAcCmdMode);
if (mode > kHaierAcFan) // If out of range, default to auto mode.
new_mode = kHaierAcAuto;
remote_state[7] &= 0b00011111;
remote_state[7] |= (new_mode << 5);
}
@@ -204,28 +203,28 @@ uint8_t IRHaierAC::getMode() {
void IRHaierAC::setTemp(const uint8_t celsius) {
uint8_t temp = celsius;
if (temp < HAIER_AC_MIN_TEMP)
temp = HAIER_AC_MIN_TEMP;
else if (temp > HAIER_AC_MAX_TEMP)
temp = HAIER_AC_MAX_TEMP;
if (temp < kHaierAcMinTemp)
temp = kHaierAcMinTemp;
else if (temp > kHaierAcMaxTemp)
temp = kHaierAcMaxTemp;
uint8_t old_temp = getTemp();
if (old_temp == temp) return;
if (old_temp > temp)
setCommand(HAIER_AC_CMD_TEMP_DOWN);
setCommand(kHaierAcCmdTempDown);
else
setCommand(HAIER_AC_CMD_TEMP_UP);
setCommand(kHaierAcCmdTempUp);
remote_state[1] &= 0b00001111; // Clear the previous temp.
remote_state[1] |= ((temp - HAIER_AC_MIN_TEMP) << 4);
remote_state[1] |= ((temp - kHaierAcMinTemp) << 4);
}
uint8_t IRHaierAC::getTemp() {
return ((remote_state[1] & 0b11110000) >> 4) + HAIER_AC_MIN_TEMP;
return ((remote_state[1] & 0b11110000) >> 4) + kHaierAcMinTemp;
}
void IRHaierAC::setHealth(bool state) {
setCommand(HAIER_AC_CMD_HEALTH);
setCommand(kHaierAcCmdHealth);
remote_state[4] &= 0b11011111;
remote_state[4] |= (state << 5);
}
@@ -235,7 +234,7 @@ bool IRHaierAC::getHealth(void) {
}
void IRHaierAC::setSleep(bool state) {
setCommand(HAIER_AC_CMD_SLEEP);
setCommand(kHaierAcCmdSleep);
remote_state[7] &= 0b10111111;
remote_state[7] |= (state << 6);
}
@@ -268,8 +267,8 @@ uint16_t IRHaierAC::getCurrTime() {
void IRHaierAC::setTime(uint8_t ptr[], const uint16_t nr_mins) {
uint16_t mins = nr_mins;
if (nr_mins > HAIER_AC_MAX_TIME)
mins = HAIER_AC_MAX_TIME;
if (nr_mins > kHaierAcMaxTime)
mins = kHaierAcMaxTime;
// Hours
ptr[0] &= 0b11100000;
@@ -280,19 +279,19 @@ void IRHaierAC::setTime(uint8_t ptr[], const uint16_t nr_mins) {
}
void IRHaierAC::setOnTimer(const uint16_t nr_mins) {
setCommand(HAIER_AC_CMD_TIMER_SET);
setCommand(kHaierAcCmdTimerSet);
remote_state[3] |= 0b10000000;
setTime(remote_state + 6, nr_mins);
}
void IRHaierAC::setOffTimer(const uint16_t nr_mins) {
setCommand(HAIER_AC_CMD_TIMER_SET);
setCommand(kHaierAcCmdTimerSet);
remote_state[3] |= 0b01000000;
setTime(remote_state + 4, nr_mins);
}
void IRHaierAC::cancelTimers() {
setCommand(HAIER_AC_CMD_TIMER_CANCEL);
setCommand(kHaierAcCmdTimerCancel);
remote_state[3] &= 0b00111111;
}
@@ -306,12 +305,12 @@ uint8_t IRHaierAC::getSwing() {
void IRHaierAC::setSwing(const uint8_t state) {
if (state == getSwing()) return; // Nothing to do.
setCommand(HAIER_AC_CMD_SWING);
setCommand(kHaierAcCmdSwing);
switch (state) {
case HAIER_AC_SWING_OFF:
case HAIER_AC_SWING_UP:
case HAIER_AC_SWING_DOWN:
case HAIER_AC_SWING_CHG:
case kHaierAcSwingOff:
case kHaierAcSwingUp:
case kHaierAcSwingDown:
case kHaierAcSwingChg:
remote_state[2] &= 0b00111111;
remote_state[2] |= (state << 6);
break;
@@ -346,37 +345,37 @@ std::string IRHaierAC::toString() {
uint8_t cmd = getCommand();
result += "Command: " + uint64ToString(cmd) +" (";
switch (cmd) {
case HAIER_AC_CMD_OFF:
case kHaierAcCmdOff:
result += "Off";
break;
case HAIER_AC_CMD_ON:
case kHaierAcCmdOn:
result += "On";
break;
case HAIER_AC_CMD_MODE:
case kHaierAcCmdMode:
result += "Mode";
break;
case HAIER_AC_CMD_FAN:
case kHaierAcCmdFan:
result += "Fan";
break;
case HAIER_AC_CMD_TEMP_UP:
case kHaierAcCmdTempUp:
result += "Temp Up";
break;
case HAIER_AC_CMD_TEMP_DOWN:
case kHaierAcCmdTempDown:
result += "Temp Down";
break;
case HAIER_AC_CMD_SLEEP:
case kHaierAcCmdSleep:
result += "Sleep";
break;
case HAIER_AC_CMD_TIMER_SET:
case kHaierAcCmdTimerSet:
result += "Timer Set";
break;
case HAIER_AC_CMD_TIMER_CANCEL:
case kHaierAcCmdTimerCancel:
result += "Timer Cancel";
break;
case HAIER_AC_CMD_HEALTH:
case kHaierAcCmdHealth:
result += "Health";
break;
case HAIER_AC_CMD_SWING:
case kHaierAcCmdSwing:
result += "Swing";
break;
default:
@@ -385,19 +384,19 @@ std::string IRHaierAC::toString() {
result += ")";
result += ", Mode: " + uint64ToString(getMode());
switch (getMode()) {
case HAIER_AC_AUTO:
case kHaierAcAuto:
result += " (AUTO)";
break;
case HAIER_AC_COOL:
case kHaierAcCool:
result += " (COOL)";
break;
case HAIER_AC_HEAT:
case kHaierAcHeat:
result += " (HEAT)";
break;
case HAIER_AC_DRY:
case kHaierAcDry:
result += " (DRY)";
break;
case HAIER_AC_FAN:
case kHaierAcFan:
result += " (FAN)";
break;
default:
@@ -406,25 +405,25 @@ std::string IRHaierAC::toString() {
result += ", Temp: " + uint64ToString(getTemp()) + "C";
result += ", Fan: " + uint64ToString(getFan());
switch (getFan()) {
case HAIER_AC_FAN_AUTO:
case kHaierAcFanAuto:
result += " (AUTO)";
break;
case HAIER_AC_FAN_HIGH:
case kHaierAcFanHigh:
result += " (MAX)";
break;
}
result += ", Swing: " + uint64ToString(getSwing()) + " (";
switch (getSwing()) {
case HAIER_AC_SWING_OFF:
case kHaierAcSwingOff:
result += "Off";
break;
case HAIER_AC_SWING_UP:
case kHaierAcSwingUp:
result += "Up";
break;
case HAIER_AC_SWING_DOWN:
case kHaierAcSwingDown:
result += "Down";
break;
case HAIER_AC_SWING_CHG:
case kHaierAcSwingChg:
result += "Chg";
break;
default:
@@ -474,8 +473,8 @@ void IRHaierACYRW02::send() {
#endif // SEND_HAIER_AC_YRW02
void IRHaierACYRW02::checksum() {
remote_state[HAIER_AC_YRW02_STATE_LENGTH - 1] = sumBytes(
remote_state, HAIER_AC_YRW02_STATE_LENGTH - 1);
remote_state[kHaierACYRW02StateLength - 1] = sumBytes(
remote_state, kHaierACYRW02StateLength - 1);
}
bool IRHaierACYRW02::validChecksum(uint8_t state[], const uint16_t length) {
@@ -484,17 +483,17 @@ bool IRHaierACYRW02::validChecksum(uint8_t state[], const uint16_t length) {
}
void IRHaierACYRW02::stateReset() {
for (uint8_t i = 1; i < HAIER_AC_YRW02_STATE_LENGTH; i++)
for (uint8_t i = 1; i < kHaierACYRW02StateLength; i++)
remote_state[i] = 0x0;
remote_state[0] = HAIER_AC_YRW02_PREFIX;
remote_state[0] = kHaierAcYrw02Prefix;
setTemp(HAIER_AC_DEF_TEMP);
setTemp(kHaierAcDefTemp);
setHealth(true);
setTurbo(HAIER_AC_YRW02_TURBO_OFF);
setTurbo(kHaierAcYrw02TurboOff);
setSleep(false);
setFan(HAIER_AC_YRW02_FAN_AUTO);
setSwing(HAIER_AC_YRW02_SWING_OFF);
setMode(HAIER_AC_YRW02_AUTO);
setFan(kHaierAcYrw02FanAuto);
setSwing(kHaierAcYrw02SwingOff);
setMode(kHaierAcYrw02Auto);
setPower(true);
}
@@ -504,22 +503,22 @@ uint8_t* IRHaierACYRW02::getRaw() {
}
void IRHaierACYRW02::setRaw(uint8_t new_code[]) {
for (uint8_t i = 0; i < HAIER_AC_YRW02_STATE_LENGTH; i++) {
for (uint8_t i = 0; i < kHaierACYRW02StateLength; i++) {
remote_state[i] = new_code[i];
}
}
void IRHaierACYRW02::setButton(uint8_t button) {
switch (button) {
case HAIER_AC_YRW02_BUTTON_TEMP_UP:
case HAIER_AC_YRW02_BUTTON_TEMP_DOWN:
case HAIER_AC_YRW02_BUTTON_SWING:
case HAIER_AC_YRW02_BUTTON_FAN:
case HAIER_AC_YRW02_BUTTON_POWER:
case HAIER_AC_YRW02_BUTTON_MODE:
case HAIER_AC_YRW02_BUTTON_HEALTH:
case HAIER_AC_YRW02_BUTTON_TURBO:
case HAIER_AC_YRW02_BUTTON_SLEEP:
case kHaierAcYrw02ButtonTempUp:
case kHaierAcYrw02ButtonTempDown:
case kHaierAcYrw02ButtonSwing:
case kHaierAcYrw02ButtonFan:
case kHaierAcYrw02ButtonPower:
case kHaierAcYrw02ButtonMode:
case kHaierAcYrw02ButtonHealth:
case kHaierAcYrw02ButtonTurbo:
case kHaierAcYrw02ButtonSleep:
remote_state[12] &= 0b11110000;
remote_state[12] |= (button & 0b00001111);
}
@@ -531,16 +530,16 @@ uint8_t IRHaierACYRW02::getButton() {
void IRHaierACYRW02::setMode(uint8_t mode) {
uint8_t new_mode = mode;
setButton(HAIER_AC_YRW02_BUTTON_MODE);
setButton(kHaierAcYrw02ButtonMode);
switch (mode) {
case HAIER_AC_YRW02_AUTO:
case HAIER_AC_YRW02_COOL:
case HAIER_AC_YRW02_DRY:
case HAIER_AC_YRW02_HEAT:
case HAIER_AC_YRW02_FAN:
case kHaierAcYrw02Auto:
case kHaierAcYrw02Cool:
case kHaierAcYrw02Dry:
case kHaierAcYrw02Heat:
case kHaierAcYrw02Fan:
break;
default: // If unexpected, default to auto mode.
new_mode = HAIER_AC_YRW02_AUTO;
new_mode = kHaierAcYrw02Auto;
}
remote_state[7] &= 0b0001111;
remote_state[7] |= (new_mode << 4);
@@ -552,28 +551,28 @@ uint8_t IRHaierACYRW02::getMode() {
void IRHaierACYRW02::setTemp(const uint8_t celcius) {
uint8_t temp = celcius;
if (temp < HAIER_AC_MIN_TEMP)
temp = HAIER_AC_MIN_TEMP;
else if (temp > HAIER_AC_MAX_TEMP)
temp = HAIER_AC_MAX_TEMP;
if (temp < kHaierAcMinTemp)
temp = kHaierAcMinTemp;
else if (temp > kHaierAcMaxTemp)
temp = kHaierAcMaxTemp;
uint8_t old_temp = getTemp();
if (old_temp == temp) return;
if (old_temp > temp)
setButton(HAIER_AC_YRW02_BUTTON_TEMP_DOWN);
setButton(kHaierAcYrw02ButtonTempDown);
else
setButton(HAIER_AC_YRW02_BUTTON_TEMP_UP);
setButton(kHaierAcYrw02ButtonTempUp);
remote_state[1] &= 0b00001111; // Clear the previous temp.
remote_state[1] |= ((temp - HAIER_AC_MIN_TEMP) << 4);
remote_state[1] |= ((temp - kHaierAcMinTemp) << 4);
}
uint8_t IRHaierACYRW02::getTemp() {
return ((remote_state[1] & 0b11110000) >> 4) + HAIER_AC_MIN_TEMP;
return ((remote_state[1] & 0b11110000) >> 4) + kHaierAcMinTemp;
}
void IRHaierACYRW02::setHealth(bool state) {
setButton(HAIER_AC_YRW02_BUTTON_HEALTH);
setButton(kHaierAcYrw02ButtonHealth);
remote_state[3] &= 0b11111101;
remote_state[3] |= (state << 1);
}
@@ -583,15 +582,15 @@ bool IRHaierACYRW02::getHealth(void) {
}
bool IRHaierACYRW02::getPower() {
return remote_state[4] & HAIER_AC_YRW02_POWER;
return remote_state[4] & kHaierAcYrw02Power;
}
void IRHaierACYRW02::setPower(bool state) {
setButton(HAIER_AC_YRW02_BUTTON_POWER);
setButton(kHaierAcYrw02ButtonPower);
if (state)
remote_state[4] |= HAIER_AC_YRW02_POWER;
remote_state[4] |= kHaierAcYrw02Power;
else
remote_state[4] &= ~HAIER_AC_YRW02_POWER;
remote_state[4] &= ~kHaierAcYrw02Power;
}
void IRHaierACYRW02::on() {
@@ -603,15 +602,15 @@ void IRHaierACYRW02::off() {
}
bool IRHaierACYRW02::getSleep() {
return remote_state[8] & HAIER_AC_YRW02_SLEEP;
return remote_state[8] & kHaierAcYrw02Sleep;
}
void IRHaierACYRW02::setSleep(bool state) {
setButton(HAIER_AC_YRW02_BUTTON_SLEEP);
setButton(kHaierAcYrw02ButtonSleep);
if (state)
remote_state[8] |= HAIER_AC_YRW02_SLEEP;
remote_state[8] |= kHaierAcYrw02Sleep;
else
remote_state[8] &= ~HAIER_AC_YRW02_SLEEP;
remote_state[8] &= ~kHaierAcYrw02Sleep;
}
uint8_t IRHaierACYRW02::getTurbo() {
@@ -620,12 +619,12 @@ uint8_t IRHaierACYRW02::getTurbo() {
void IRHaierACYRW02::setTurbo(uint8_t speed) {
switch (speed) {
case HAIER_AC_YRW02_TURBO_OFF:
case HAIER_AC_YRW02_TURBO_LOW:
case HAIER_AC_YRW02_TURBO_HIGH:
case kHaierAcYrw02TurboOff:
case kHaierAcYrw02TurboLow:
case kHaierAcYrw02TurboHigh:
remote_state[6] &= 0b00111111;
remote_state[6] |= (speed << 6);
setButton(HAIER_AC_YRW02_BUTTON_TURBO);
setButton(kHaierAcYrw02ButtonTurbo);
}
}
@@ -635,13 +634,13 @@ uint8_t IRHaierACYRW02::getFan() {
void IRHaierACYRW02::setFan(uint8_t speed) {
switch (speed) {
case HAIER_AC_YRW02_FAN_LOW:
case HAIER_AC_YRW02_FAN_MED:
case HAIER_AC_YRW02_FAN_HIGH:
case HAIER_AC_YRW02_FAN_AUTO:
case kHaierAcYrw02FanLow:
case kHaierAcYrw02FanMed:
case kHaierAcYrw02FanHigh:
case kHaierAcYrw02FanAuto:
remote_state[5] &= 0b00001111;
remote_state[5] |= (speed << 4);
setButton(HAIER_AC_YRW02_BUTTON_FAN);
setButton(kHaierAcYrw02ButtonFan);
}
}
@@ -652,27 +651,27 @@ uint8_t IRHaierACYRW02::getSwing() {
void IRHaierACYRW02::setSwing(uint8_t state) {
uint8_t newstate = state;
switch (state) {
case HAIER_AC_YRW02_SWING_OFF:
case HAIER_AC_YRW02_SWING_AUTO:
case HAIER_AC_YRW02_SWING_TOP:
case HAIER_AC_YRW02_SWING_MIDDLE:
case HAIER_AC_YRW02_SWING_BOTTOM:
case HAIER_AC_YRW02_SWING_DOWN:
setButton(HAIER_AC_YRW02_BUTTON_SWING);
case kHaierAcYrw02SwingOff:
case kHaierAcYrw02SwingAuto:
case kHaierAcYrw02SwingTop:
case kHaierAcYrw02SwingMiddle:
case kHaierAcYrw02SwingBottom:
case kHaierAcYrw02SwingDown:
setButton(kHaierAcYrw02ButtonSwing);
break;
default:
return; // Unexpected value so don't do anything.
}
// Heat mode has no MIDDLE setting, use BOTTOM instead.
if (state == HAIER_AC_YRW02_SWING_MIDDLE &&
getMode() == HAIER_AC_YRW02_HEAT)
newstate = HAIER_AC_YRW02_SWING_BOTTOM;
if (state == kHaierAcYrw02SwingMiddle &&
getMode() == kHaierAcYrw02Heat)
newstate = kHaierAcYrw02SwingBottom;
// BOTTOM is only allowed if we are in Heat mode, otherwise MIDDLE.
if (state == HAIER_AC_YRW02_SWING_BOTTOM &&
getMode() != HAIER_AC_YRW02_HEAT)
newstate = HAIER_AC_YRW02_SWING_MIDDLE;
if (state == kHaierAcYrw02SwingBottom &&
getMode() != kHaierAcYrw02Heat)
newstate = kHaierAcYrw02SwingMiddle;
remote_state[1] &= 0b11110000;
remote_state[1] |= newstate;
@@ -694,31 +693,31 @@ std::string IRHaierACYRW02::toString() {
uint8_t cmd = getButton();
result += ", Button: " + uint64ToString(cmd) +" (";
switch (cmd) {
case HAIER_AC_YRW02_BUTTON_POWER:
case kHaierAcYrw02ButtonPower:
result += "Power";
break;
case HAIER_AC_YRW02_BUTTON_MODE:
case kHaierAcYrw02ButtonMode:
result += "Mode";
break;
case HAIER_AC_YRW02_BUTTON_FAN:
case kHaierAcYrw02ButtonFan:
result += "Fan";
break;
case HAIER_AC_YRW02_BUTTON_TEMP_UP:
case kHaierAcYrw02ButtonTempUp:
result += "Temp Up";
break;
case HAIER_AC_YRW02_BUTTON_TEMP_DOWN:
case kHaierAcYrw02ButtonTempDown:
result += "Temp Down";
break;
case HAIER_AC_YRW02_BUTTON_SLEEP:
case kHaierAcYrw02ButtonSleep:
result += "Sleep";
break;
case HAIER_AC_YRW02_BUTTON_HEALTH:
case kHaierAcYrw02ButtonHealth:
result += "Health";
break;
case HAIER_AC_YRW02_BUTTON_SWING:
case kHaierAcYrw02ButtonSwing:
result += "Swing";
break;
case HAIER_AC_YRW02_BUTTON_TURBO:
case kHaierAcYrw02ButtonTurbo:
result += "Turbo";
break;
default:
@@ -727,19 +726,19 @@ std::string IRHaierACYRW02::toString() {
result += ")";
result += ", Mode: " + uint64ToString(getMode());
switch (getMode()) {
case HAIER_AC_YRW02_AUTO:
case kHaierAcYrw02Auto:
result += " (Auto)";
break;
case HAIER_AC_YRW02_COOL:
case kHaierAcYrw02Cool:
result += " (Cool)";
break;
case HAIER_AC_YRW02_HEAT:
case kHaierAcYrw02Heat:
result += " (Heat)";
break;
case HAIER_AC_YRW02_DRY:
case kHaierAcYrw02Dry:
result += " (Dry)";
break;
case HAIER_AC_YRW02_FAN:
case kHaierAcYrw02Fan:
result += " (Fan)";
break;
default:
@@ -748,16 +747,16 @@ std::string IRHaierACYRW02::toString() {
result += ", Temp: " + uint64ToString(getTemp()) + "C";
result += ", Fan: " + uint64ToString(getFan());
switch (getFan()) {
case HAIER_AC_YRW02_FAN_AUTO:
case kHaierAcYrw02FanAuto:
result += " (Auto)";
break;
case HAIER_AC_YRW02_FAN_HIGH:
case kHaierAcYrw02FanHigh:
result += " (High)";
break;
case HAIER_AC_YRW02_FAN_LOW:
case kHaierAcYrw02FanLow:
result += " (Low)";
break;
case HAIER_AC_YRW02_FAN_MED:
case kHaierAcYrw02FanMed:
result += " (Med)";
break;
default:
@@ -765,13 +764,13 @@ std::string IRHaierACYRW02::toString() {
}
result += ", Turbo: " + uint64ToString(getTurbo()) + " (";
switch (getTurbo()) {
case HAIER_AC_YRW02_TURBO_OFF:
case kHaierAcYrw02TurboOff:
result += "Off";
break;
case HAIER_AC_YRW02_TURBO_LOW:
case kHaierAcYrw02TurboLow:
result += "Low";
break;
case HAIER_AC_YRW02_TURBO_HIGH:
case kHaierAcYrw02TurboHigh:
result += "High";
break;
default:
@@ -780,22 +779,22 @@ std::string IRHaierACYRW02::toString() {
result += ")";
result += ", Swing: " + uint64ToString(getSwing()) + " (";
switch (getSwing()) {
case HAIER_AC_YRW02_SWING_OFF:
case kHaierAcYrw02SwingOff:
result += "Off";
break;
case HAIER_AC_YRW02_SWING_AUTO:
case kHaierAcYrw02SwingAuto:
result += "Auto";
break;
case HAIER_AC_YRW02_SWING_BOTTOM:
case kHaierAcYrw02SwingBottom:
result += "Bottom";
break;
case HAIER_AC_YRW02_SWING_DOWN:
case kHaierAcYrw02SwingDown:
result += "Down";
break;
case HAIER_AC_YRW02_SWING_TOP:
case kHaierAcYrw02SwingTop:
result += "Top";
break;
case HAIER_AC_YRW02_SWING_MIDDLE:
case kHaierAcYrw02SwingMiddle:
result += "Middle";
break;
default:
@@ -823,7 +822,7 @@ std::string IRHaierACYRW02::toString() {
//
// Args:
// results: Ptr to the data to decode and where to store the decode result.
// nbits: The number of data bits to expect. Typically HAIER_AC_BITS.
// nbits: The number of data bits to expect. Typically kHaierACBits.
// strict: Flag indicating if we should perform strict matching.
// Returns:
// boolean: True if it can decode it, false if it can't.
@@ -836,43 +835,43 @@ bool IRrecv::decodeHaierAC(decode_results *results, uint16_t nbits,
return false;
if (strict) {
if (nbits != HAIER_AC_BITS)
if (nbits != kHaierACBits)
return false; // Not strictly a HAIER_AC message.
}
if (results->rawlen < (2 * nbits + HEADER) + FOOTER - 1)
if (results->rawlen < (2 * nbits + kHeader) + kFooter - 1)
return false; // Can't possibly be a valid HAIER_AC message.
uint16_t offset = OFFSET_START;
uint16_t offset = kStartOffset;
// Header
if (!matchMark(results->rawbuf[offset++], HAIER_AC_HDR)) return false;
if (!matchSpace(results->rawbuf[offset++], HAIER_AC_HDR)) return false;
if (!matchMark(results->rawbuf[offset++], HAIER_AC_HDR)) return false;
if (!matchSpace(results->rawbuf[offset++], HAIER_AC_HDR_GAP)) return false;
if (!matchMark(results->rawbuf[offset++], kHaierAcHdr)) return false;
if (!matchSpace(results->rawbuf[offset++], kHaierAcHdr)) return false;
if (!matchMark(results->rawbuf[offset++], kHaierAcHdr)) return false;
if (!matchSpace(results->rawbuf[offset++], kHaierAcHdrGap)) return false;
// Data
for (uint16_t i = 0; i < nbits / 8; i++) {
match_result_t data_result = matchData(&(results->rawbuf[offset]), 8,
HAIER_AC_BIT_MARK,
HAIER_AC_ONE_SPACE,
HAIER_AC_BIT_MARK,
HAIER_AC_ZERO_SPACE);
kHaierAcBitMark,
kHaierAcOneSpace,
kHaierAcBitMark,
kHaierAcZeroSpace);
if (data_result.success == false) return false;
offset += data_result.used;
results->state[i] = (uint8_t) data_result.data;
}
// Footer
if (!matchMark(results->rawbuf[offset++], HAIER_AC_BIT_MARK)) return false;
if (!matchMark(results->rawbuf[offset++], kHaierAcBitMark)) return false;
if (offset < results->rawlen &&
!matchAtLeast(results->rawbuf[offset++], HAIER_AC_MIN_GAP))
!matchAtLeast(results->rawbuf[offset++], kHaierAcMinGap))
return false;
// Compliance
if (strict) {
if (results->state[0] != HAIER_AC_PREFIX) return false;
if (results->state[0] != kHaierAcPrefix) return false;
if (!IRHaierAC::validChecksum(results->state, nbits / 8)) return false;
}
@@ -888,7 +887,7 @@ bool IRrecv::decodeHaierAC(decode_results *results, uint16_t nbits,
//
// Args:
// results: Ptr to the data to decode and where to store the decode result.
// nbits: The number of data bits to expect. Typically HAIER_AC_YRW02_BITS.
// nbits: The number of data bits to expect. Typically kHaierACYRW02Bits.
// strict: Flag indicating if we should perform strict matching.
// Returns:
// boolean: True if it can decode it, false if it can't.
@@ -898,7 +897,7 @@ bool IRrecv::decodeHaierAC(decode_results *results, uint16_t nbits,
bool IRrecv::decodeHaierACYRW02(decode_results *results, uint16_t nbits,
bool strict) {
if (strict) {
if (nbits != HAIER_AC_YRW02_BITS)
if (nbits != kHaierACYRW02Bits)
return false; // Not strictly a HAIER_AC_YRW02 message.
}
@@ -908,7 +907,7 @@ bool IRrecv::decodeHaierACYRW02(decode_results *results, uint16_t nbits,
// Compliance
if (strict) {
if (results->state[0] != HAIER_AC_YRW02_PREFIX) return false;
if (results->state[0] != kHaierAcYrw02Prefix) return false;
if (!IRHaierACYRW02::validChecksum(results->state, nbits / 8))
return false;
}

183
src/ir_Haier.h
View File

@@ -28,104 +28,161 @@
// Haier HSU07-HEA03 remote
// Byte 0
#define HAIER_AC_PREFIX 0b10100101
const uint8_t kHaierAcPrefix = 0b10100101;
// Byte 1
#define HAIER_AC_MIN_TEMP 16
#define HAIER_AC_MAX_TEMP 30
#define HAIER_AC_DEF_TEMP 25
const uint8_t kHaierAcMinTemp = 16;
const uint8_t kHaierAcDefTemp = 25;
const uint8_t kHaierAcMaxTemp = 30;
const uint8_t kHaierAcCmdOff = 0b00000000;
const uint8_t kHaierAcCmdOn = 0b00000001;
const uint8_t kHaierAcCmdMode = 0b00000010;
const uint8_t kHaierAcCmdFan = 0b00000011;
const uint8_t kHaierAcCmdTempUp = 0b00000110;
const uint8_t kHaierAcCmdTempDown = 0b00000111;
const uint8_t kHaierAcCmdSleep = 0b00001000;
const uint8_t kHaierAcCmdTimerSet = 0b00001001;
const uint8_t kHaierAcCmdTimerCancel = 0b00001010;
const uint8_t kHaierAcCmdHealth = 0b00001100;
const uint8_t kHaierAcCmdSwing = 0b00001101;
#define HAIER_AC_CMD_OFF 0b00000000
#define HAIER_AC_CMD_ON 0b00000001
#define HAIER_AC_CMD_MODE 0b00000010
#define HAIER_AC_CMD_FAN 0b00000011
#define HAIER_AC_CMD_TEMP_UP 0b00000110
#define HAIER_AC_CMD_TEMP_DOWN 0b00000111
#define HAIER_AC_CMD_SLEEP 0b00001000
#define HAIER_AC_CMD_TIMER_SET 0b00001001
#define HAIER_AC_CMD_TIMER_CANCEL 0b00001010
#define HAIER_AC_CMD_HEALTH 0b00001100
#define HAIER_AC_CMD_SWING 0b00001101
// Byte 2
#define HAIER_AC_SWING_OFF 0b00000000
#define HAIER_AC_SWING_UP 0b00000001
#define HAIER_AC_SWING_DOWN 0b00000010
#define HAIER_AC_SWING_CHG 0b00000011
const uint8_t kHaierAcSwingOff = 0b00000000;
const uint8_t kHaierAcSwingUp = 0b00000001;
const uint8_t kHaierAcSwingDown = 0b00000010;
const uint8_t kHaierAcSwingChg = 0b00000011;
// Byte 6
#define HAIER_AC_AUTO 0
#define HAIER_AC_COOL 1
#define HAIER_AC_DRY 2
#define HAIER_AC_HEAT 3
#define HAIER_AC_FAN 4
const uint8_t kHaierAcAuto = 0;
const uint8_t kHaierAcCool = 1;
const uint8_t kHaierAcDry = 2;
const uint8_t kHaierAcHeat = 3;
const uint8_t kHaierAcFan = 4;
#define HAIER_AC_FAN_AUTO 0
#define HAIER_AC_FAN_LOW 1
#define HAIER_AC_FAN_MED 2
#define HAIER_AC_FAN_HIGH 3
const uint8_t kHaierAcFanAuto = 0;
const uint8_t kHaierAcFanLow = 1;
const uint8_t kHaierAcFanMed = 2;
const uint8_t kHaierAcFanHigh = 3;
#define HAIER_AC_MAX_TIME (23 * 60 + 59)
const uint16_t kHaierAcMaxTime = (23 * 60) + 59;
// Legacy Haier AC defines.
#define HAIER_AC_MIN_TEMP kHaierAcMinTemp
#define HAIER_AC_DEF_TEMP kHaierAcDefTemp
#define HAIER_AC_MAX_TEMP kHaierAcMaxTemp
#define HAIER_AC_CMD_OFF kHaierAcCmdOff
#define HAIER_AC_CMD_ON kHaierAcCmdOn
#define HAIER_AC_CMD_MODE kHaierAcCmdMode
#define HAIER_AC_CMD_FAN kHaierAcCmdFan
#define HAIER_AC_CMD_TEMP_UP kHaierAcCmdTempUp
#define HAIER_AC_CMD_TEMP_DOWN kHaierAcCmdTempDown
#define HAIER_AC_CMD_SLEEP kHaierAcCmdSleep
#define HAIER_AC_CMD_TIMER_SET kHaierAcCmdTimerSet
#define HAIER_AC_CMD_TIMER_CANCEL kHaierAcCmdTimerCancel
#define HAIER_AC_CMD_HEALTH kHaierAcCmdHealth
#define HAIER_AC_CMD_SWING kHaierAcCmdSwing
#define HAIER_AC_SWING_OFF kHaierAcSwingOff
#define HAIER_AC_SWING_UP kHaierAcSwingUp
#define HAIER_AC_SWING_DOWN kHaierAcSwingDown
#define HAIER_AC_SWING_CHG kHaierAcSwingChg
#define HAIER_AC_AUTO kHaierAcAuto
#define HAIER_AC_COOL kHaierAcCool
#define HAIER_AC_DRY kHaierAcDry
#define HAIER_AC_HEAT kHaierAcHeat
#define HAIER_AC_FAN kHaierAcFan
#define HAIER_AC_FAN_AUTO kHaierAcFanAuto
#define HAIER_AC_FAN_LOW kHaierAcFanLow
#define HAIER_AC_FAN_MED kHaierAcFanMed
#define HAIER_AC_FAN_HIGH kHaierAcFanHigh
// Haier YRW02 remote
// Byte 0
#define HAIER_AC_YRW02_PREFIX 0xA6
const uint8_t kHaierAcYrw02Prefix = 0xA6;
// Byte 1
// Bits 0-3
// 0x0 = 16DegC, ... 0xE = 30DegC
// Bits 4-7 - Swing
#define HAIER_AC_YRW02_SWING_OFF 0x0
#define HAIER_AC_YRW02_SWING_TOP 0x1
#define HAIER_AC_YRW02_SWING_MIDDLE 0x2 // Not available in heat mode.
#define HAIER_AC_YRW02_SWING_BOTTOM 0x3 // Only available in heat mode.
#define HAIER_AC_YRW02_SWING_DOWN 0xA
#define HAIER_AC_YRW02_SWING_AUTO 0xC // Airflow
const uint8_t kHaierAcYrw02SwingOff = 0x0;
const uint8_t kHaierAcYrw02SwingTop = 0x1;
const uint8_t kHaierAcYrw02SwingMiddle = 0x2; // Not available in heat mode.
const uint8_t kHaierAcYrw02SwingBottom = 0x3; // Only available in heat mode.
const uint8_t kHaierAcYrw02SwingDown = 0xA;
const uint8_t kHaierAcYrw02SwingAuto = 0xC; // Airflow
// Byte 3
// Bit 7 - Health mode
// Byte 4
#define HAIER_AC_YRW02_POWER 0b01000000
const uint8_t kHaierAcYrw02Power = 0b01000000;
// Byte 5
// Bits 0-3
#define HAIER_AC_YRW02_FAN_HIGH 0x2
#define HAIER_AC_YRW02_FAN_MED 0x4
#define HAIER_AC_YRW02_FAN_LOW 0x6
#define HAIER_AC_YRW02_FAN_AUTO 0xA
const uint8_t kHaierAcYrw02FanHigh = 0x2;
const uint8_t kHaierAcYrw02FanMed = 0x4;
const uint8_t kHaierAcYrw02FanLow = 0x6;
const uint8_t kHaierAcYrw02FanAuto = 0xA;
// Byte 6
// Bits 0-1
#define HAIER_AC_YRW02_TURBO_OFF 0x0
#define HAIER_AC_YRW02_TURBO_HIGH 0x1
#define HAIER_AC_YRW02_TURBO_LOW 0x2
const uint8_t kHaierAcYrw02TurboOff = 0x0;
const uint8_t kHaierAcYrw02TurboHigh = 0x1;
const uint8_t kHaierAcYrw02TurboLow = 0x2;
// Byte 7
// Bits 0-3
#define HAIER_AC_YRW02_AUTO 0x0
#define HAIER_AC_YRW02_COOL 0x2
#define HAIER_AC_YRW02_DRY 0x4
#define HAIER_AC_YRW02_HEAT 0x8
#define HAIER_AC_YRW02_FAN 0xC
const uint8_t kHaierAcYrw02Auto = 0x0;
const uint8_t kHaierAcYrw02Cool = 0x2;
const uint8_t kHaierAcYrw02Dry = 0x4;
const uint8_t kHaierAcYrw02Heat = 0x8;
const uint8_t kHaierAcYrw02Fan = 0xC;
// Byte 8
#define HAIER_AC_YRW02_SLEEP 0b10000000
const uint8_t kHaierAcYrw02Sleep = 0b10000000;
// Byte 12
// Bits 4-7
#define HAIER_AC_YRW02_BUTTON_TEMP_UP 0x0
#define HAIER_AC_YRW02_BUTTON_TEMP_DOWN 0x1
#define HAIER_AC_YRW02_BUTTON_SWING 0x2
#define HAIER_AC_YRW02_BUTTON_FAN 0x4
#define HAIER_AC_YRW02_BUTTON_POWER 0x5
#define HAIER_AC_YRW02_BUTTON_MODE 0x6
#define HAIER_AC_YRW02_BUTTON_HEALTH 0x7
#define HAIER_AC_YRW02_BUTTON_TURBO 0x8
#define HAIER_AC_YRW02_BUTTON_SLEEP 0xB
const uint8_t kHaierAcYrw02ButtonTempUp = 0x0;
const uint8_t kHaierAcYrw02ButtonTempDown = 0x1;
const uint8_t kHaierAcYrw02ButtonSwing = 0x2;
const uint8_t kHaierAcYrw02ButtonFan = 0x4;
const uint8_t kHaierAcYrw02ButtonPower = 0x5;
const uint8_t kHaierAcYrw02ButtonMode = 0x6;
const uint8_t kHaierAcYrw02ButtonHealth = 0x7;
const uint8_t kHaierAcYrw02ButtonTurbo = 0x8;
const uint8_t kHaierAcYrw02ButtonSleep = 0xB;
// Legacy Haier YRW02 remote defines.
#define HAIER_AC_YRW02_SWING_OFF kHaierAcYrw02SwingOff
#define HAIER_AC_YRW02_SWING_TOP kHaierAcYrw02SwingTop
#define HAIER_AC_YRW02_SWING_MIDDLE kHaierAcYrw02SwingMiddle
#define HAIER_AC_YRW02_SWING_BOTTOM kHaierAcYrw02SwingBottom
#define HAIER_AC_YRW02_SWING_DOWN kHaierAcYrw02SwingDown
#define HAIER_AC_YRW02_SWING_AUTO kHaierAcYrw02SwingAuto
#define HAIER_AC_YRW02_FAN_HIGH kHaierAcYrw02FanHigh
#define HAIER_AC_YRW02_FAN_MED kHaierAcYrw02FanMed
#define HAIER_AC_YRW02_FAN_LOW kHaierAcYrw02FanLow
#define HAIER_AC_YRW02_FAN_AUTO kHaierAcYrw02FanAuto
#define HAIER_AC_YRW02_TURBO_OFF kHaierAcYrw02TurboOff
#define HAIER_AC_YRW02_TURBO_HIGH kHaierAcYrw02TurboHigh
#define HAIER_AC_YRW02_TURBO_LOW kHaierAcYrw02TurboLow
#define HAIER_AC_YRW02_AUTO kHaierAcYrw02Auto
#define HAIER_AC_YRW02_COOL kHaierAcYrw02Cool
#define HAIER_AC_YRW02_DRY kHaierAcYrw02Dry
#define HAIER_AC_YRW02_HEAT kHaierAcYrw02Heat
#define HAIER_AC_YRW02_FAN kHaierAcYrw02Fan
#define HAIER_AC_YRW02_BUTTON_TEMP_UP kHaierAcYrw02ButtonTempUp
#define HAIER_AC_YRW02_BUTTON_TEMP_DOWN kHaierAcYrw02ButtonTempDown
#define HAIER_AC_YRW02_BUTTON_SWING kHaierAcYrw02ButtonSwing
#define HAIER_AC_YRW02_BUTTON_FAN kHaierAcYrw02ButtonFan
#define HAIER_AC_YRW02_BUTTON_POWER kHaierAcYrw02ButtonPower
#define HAIER_AC_YRW02_BUTTON_MODE kHaierAcYrw02ButtonMode
#define HAIER_AC_YRW02_BUTTON_HEALTH kHaierAcYrw02ButtonHealth
#define HAIER_AC_YRW02_BUTTON_TURBO kHaierAcYrw02ButtonTurbo
#define HAIER_AC_YRW02_BUTTON_SLEEP kHaierAcYrw02ButtonSleep
class IRHaierAC {
public:
@@ -168,7 +225,7 @@ class IRHaierAC {
uint8_t* getRaw();
void setRaw(uint8_t new_code[]);
static bool validChecksum(uint8_t state[],
const uint16_t length = HAIER_AC_STATE_LENGTH);
const uint16_t length = kHaierACStateLength);
#ifdef ARDUINO
String toString();
static String timeToString(const uint16_t nr_mins);
@@ -178,7 +235,7 @@ class IRHaierAC {
#endif
private:
uint8_t remote_state[HAIER_AC_STATE_LENGTH];
uint8_t remote_state[kHaierACStateLength];
void stateReset();
void checksum();
static uint16_t getTime(const uint8_t ptr[]);
@@ -227,7 +284,7 @@ class IRHaierACYRW02 {
uint8_t* getRaw();
void setRaw(uint8_t new_code[]);
static bool validChecksum(uint8_t state[],
const uint16_t length = HAIER_AC_YRW02_STATE_LENGTH);
const uint16_t length = kHaierACYRW02StateLength);
#ifdef ARDUINO
String toString();
#else
@@ -235,7 +292,7 @@ class IRHaierACYRW02 {
#endif
private:
uint8_t remote_state[HAIER_AC_YRW02_STATE_LENGTH];
uint8_t remote_state[kHaierACYRW02StateLength];
void stateReset();
void checksum();
IRsend _irsend;

90
src/ir_Hitachi.cpp
View File

@@ -22,21 +22,21 @@
// Constants
// Ref: https://github.com/markszabo/IRremoteESP8266/issues/417
#define HITACHI_AC_HDR_MARK 3300U
#define HITACHI_AC_HDR_SPACE 1700U
#define HITACHI_AC1_HDR_MARK 3400U
#define HITACHI_AC1_HDR_SPACE 3400U
#define HITACHI_AC_BIT_MARK 400U
#define HITACHI_AC_ONE_SPACE 1250U
#define HITACHI_AC_ZERO_SPACE 500U
#define HITACHI_AC_MIN_GAP 100000U // Completely made up value.
const uint16_t kHitachiAcHdrMark = 3300;
const uint16_t kHitachiAcHdrSpace = 1700;
const uint16_t kHitachiAc1HdrMark = 3400;
const uint16_t kHitachiAc1HdrSpace = 3400;
const uint16_t kHitachiAcBitMark = 400;
const uint16_t kHitachiAcOneSpace = 1250;
const uint16_t kHitachiAcZeroSpace = 500;
const uint32_t kHitachiAcMinGap = 100000; // Completely made up value.
#if (SEND_HITACHI_AC || SEND_HITACHI_AC2)
// Send a Hitachi A/C message.
//
// Args:
// data: An array of bytes containing the IR command.
// nbytes: Nr. of bytes of data in the array. (>=HITACHI_AC_STATE_LENGTH)
// nbytes: Nr. of bytes of data in the array. (>=kHitachiAcStateLength)
// repeat: Nr. of times the message is to be repeated. (Default = 0).
//
// Status: ALPHA / Untested.
@@ -45,12 +45,12 @@
// https://github.com/markszabo/IRremoteESP8266/issues/417
void IRsend::sendHitachiAC(unsigned char data[], uint16_t nbytes,
uint16_t repeat) {
if (nbytes < HITACHI_AC_STATE_LENGTH)
if (nbytes < kHitachiAcStateLength)
return; // Not enough bytes to send a proper message.
sendGeneric(HITACHI_AC_HDR_MARK, HITACHI_AC_HDR_SPACE,
HITACHI_AC_BIT_MARK, HITACHI_AC_ONE_SPACE,
HITACHI_AC_BIT_MARK, HITACHI_AC_ZERO_SPACE,
HITACHI_AC_BIT_MARK, HITACHI_AC_MIN_GAP,
sendGeneric(kHitachiAcHdrMark, kHitachiAcHdrSpace,
kHitachiAcBitMark, kHitachiAcOneSpace,
kHitachiAcBitMark, kHitachiAcZeroSpace,
kHitachiAcBitMark, kHitachiAcMinGap,
data, nbytes, 38, true, repeat, 50);
}
#endif // (SEND_HITACHI_AC || SEND_HITACHI_AC2)
@@ -63,7 +63,7 @@ void IRsend::sendHitachiAC(unsigned char data[], uint16_t nbytes,
//
// Args:
// data: An array of bytes containing the IR command.
// nbytes: Nr. of bytes of data in the array. (>=HITACHI_AC1_STATE_LENGTH)
// nbytes: Nr. of bytes of data in the array. (>=kHitachiAc1StateLength)
// repeat: Nr. of times the message is to be repeated. (Default = 0).
//
// Status: BETA / Appears to work.
@@ -73,12 +73,12 @@ void IRsend::sendHitachiAC(unsigned char data[], uint16_t nbytes,
// Basically the same as sendHitatchiAC() except different size and header.
void IRsend::sendHitachiAC1(unsigned char data[], uint16_t nbytes,
uint16_t repeat) {
if (nbytes < HITACHI_AC1_STATE_LENGTH)
if (nbytes < kHitachiAc1StateLength)
return; // Not enough bytes to send a proper message.
sendGeneric(HITACHI_AC1_HDR_MARK, HITACHI_AC1_HDR_SPACE,
HITACHI_AC_BIT_MARK, HITACHI_AC_ONE_SPACE,
HITACHI_AC_BIT_MARK, HITACHI_AC_ZERO_SPACE,
HITACHI_AC_BIT_MARK, HITACHI_AC_MIN_GAP,
sendGeneric(kHitachiAc1HdrMark, kHitachiAc1HdrSpace,
kHitachiAcBitMark, kHitachiAcOneSpace,
kHitachiAcBitMark, kHitachiAcZeroSpace,
kHitachiAcBitMark, kHitachiAcMinGap,
data, nbytes, 38, true, repeat, 50);
}
#endif // SEND_HITACHI_AC1
@@ -91,7 +91,7 @@ void IRsend::sendHitachiAC1(unsigned char data[], uint16_t nbytes,
//
// Args:
// data: An array of bytes containing the IR command.
// nbytes: Nr. of bytes of data in the array. (>=HITACHI_AC2_STATE_LENGTH)
// nbytes: Nr. of bytes of data in the array. (>=kHitachiAc2StateLength)
// repeat: Nr. of times the message is to be repeated. (Default = 0).
//
// Status: BETA / Appears to work.
@@ -101,7 +101,7 @@ void IRsend::sendHitachiAC1(unsigned char data[], uint16_t nbytes,
// Basically the same as sendHitatchiAC() except different size.
void IRsend::sendHitachiAC2(unsigned char data[], uint16_t nbytes,
uint16_t repeat) {
if (nbytes < HITACHI_AC2_STATE_LENGTH)
if (nbytes < kHitachiAc2StateLength)
return; // Not enough bytes to send a proper message.
sendHitachiAC(data, nbytes, repeat);
}
@@ -113,7 +113,7 @@ void IRsend::sendHitachiAC2(unsigned char data[], uint16_t nbytes,
// Args:
// results: Ptr to the data to decode and where to store the decode result.
// nbits: The number of data bits to expect.
// Typically HITACHI_AC_BITS, HITACHI_AC1_BITS, HITACHI_AC2_BITS
// Typically kHitachiAcBits, kHitachiAc1Bits, kHitachiAc2Bits
// strict: Flag indicating if we should perform strict matching.
// Returns:
// boolean: True if it can decode it, false if it can't.
@@ -129,33 +129,33 @@ void IRsend::sendHitachiAC2(unsigned char data[], uint16_t nbytes,
bool IRrecv::decodeHitachiAC(decode_results *results, uint16_t nbits,
bool strict) {
const uint8_t kTolerance = 30;
if (results->rawlen < 2 * nbits + HEADER + FOOTER - 1)
if (results->rawlen < 2 * nbits + kHeader + kFooter - 1)
return false; // Can't possibly be a valid HitachiAC message.
if (strict) {
switch (nbits) {
case HITACHI_AC_BITS:
case HITACHI_AC1_BITS:
case HITACHI_AC2_BITS:
case kHitachiAcBits:
case kHitachiAc1Bits:
case kHitachiAc2Bits:
break; // Okay to continue.
default:
return false; // Not strictly a Hitachi message.
}
}
uint16_t offset = OFFSET_START;
uint16_t offset = kStartOffset;
uint16_t dataBitsSoFar = 0;
match_result_t data_result;
// Header
if (nbits == HITACHI_AC1_BITS) {
if (!matchMark(results->rawbuf[offset++], HITACHI_AC1_HDR_MARK, kTolerance))
if (nbits == kHitachiAc1Bits) {
if (!matchMark(results->rawbuf[offset++], kHitachiAc1HdrMark, kTolerance))
return false;
if (!matchSpace(results->rawbuf[offset++], HITACHI_AC1_HDR_SPACE,
if (!matchSpace(results->rawbuf[offset++], kHitachiAc1HdrSpace,
kTolerance))
return false;
} else { // Everything else.
if (!matchMark(results->rawbuf[offset++], HITACHI_AC_HDR_MARK, kTolerance))
if (!matchMark(results->rawbuf[offset++], kHitachiAcHdrMark, kTolerance))
return false;
if (!matchSpace(results->rawbuf[offset++], HITACHI_AC_HDR_SPACE,
if (!matchSpace(results->rawbuf[offset++], kHitachiAcHdrSpace,
kTolerance))
return false;
}
@@ -165,29 +165,29 @@ bool IRrecv::decodeHitachiAC(decode_results *results, uint16_t nbits,
offset <= results->rawlen - 16 && i < nbits / 8;
i++, dataBitsSoFar += 8, offset += data_result.used) {
data_result = matchData(&(results->rawbuf[offset]), 8,
HITACHI_AC_BIT_MARK,
HITACHI_AC_ONE_SPACE,
HITACHI_AC_BIT_MARK,
HITACHI_AC_ZERO_SPACE,
kHitachiAcBitMark,
kHitachiAcOneSpace,
kHitachiAcBitMark,
kHitachiAcZeroSpace,
kTolerance);
if (data_result.success == false) break; // Fail
results->state[i] = (uint8_t) data_result.data;
}
// Footer
if (!matchMark(results->rawbuf[offset++], HITACHI_AC_BIT_MARK, kTolerance))
if (!matchMark(results->rawbuf[offset++], kHitachiAcBitMark, kTolerance))
return false;
if (offset <= results->rawlen &&
!matchAtLeast(results->rawbuf[offset], HITACHI_AC_MIN_GAP, kTolerance))
!matchAtLeast(results->rawbuf[offset], kHitachiAcMinGap, kTolerance))
return false;
// Compliance
if (strict) {
// Re-check we got the correct size/length due to the way we read the data.
switch (dataBitsSoFar / 8) {
case HITACHI_AC_STATE_LENGTH:
case HITACHI_AC1_STATE_LENGTH:
case HITACHI_AC2_STATE_LENGTH:
case kHitachiAcStateLength:
case kHitachiAc1StateLength:
case kHitachiAc2StateLength:
break; // Continue
default:
return false;
@@ -196,13 +196,13 @@ bool IRrecv::decodeHitachiAC(decode_results *results, uint16_t nbits,
// Success
switch (dataBitsSoFar) {
case HITACHI_AC1_BITS:
case kHitachiAc1Bits:
results->decode_type = HITACHI_AC1;
break;
case HITACHI_AC2_BITS:
case kHitachiAc2Bits:
results->decode_type = HITACHI_AC2;
break;
case HITACHI_AC_BITS:
case kHitachiAcBits:
default:
results->decode_type = HITACHI_AC;
}

86
src/ir_JVC.cpp
View File

@@ -19,31 +19,31 @@
// Constants
// Ref:
// http://www.sbprojects.com/knowledge/ir/jvc.php
#define JVC_TICK 75U
#define JVC_HDR_MARK_TICKS 112U
#define JVC_HDR_MARK (JVC_HDR_MARK_TICKS * JVC_TICK)
#define JVC_HDR_SPACE_TICKS 56U
#define JVC_HDR_SPACE (JVC_HDR_SPACE_TICKS * JVC_TICK)
#define JVC_BIT_MARK_TICKS 7U
#define JVC_BIT_MARK (JVC_BIT_MARK_TICKS * JVC_TICK)
#define JVC_ONE_SPACE_TICKS 23U
#define JVC_ONE_SPACE (JVC_ONE_SPACE_TICKS * JVC_TICK)
#define JVC_ZERO_SPACE_TICKS 7U
#define JVC_ZERO_SPACE (JVC_ZERO_SPACE_TICKS * JVC_TICK)
#define JVC_RPT_LENGTH_TICKS 800U
#define JVC_RPT_LENGTH (JVC_RPT_LENGTH_TICKS * JVC_TICK)
#define JVC_MIN_GAP_TICKS (JVC_RPT_LENGTH_TICKS - \
(JVC_HDR_MARK_TICKS + JVC_HDR_SPACE_TICKS + \
JVC_BITS * (JVC_BIT_MARK_TICKS + JVC_ONE_SPACE_TICKS) + \
JVC_BIT_MARK_TICKS))
#define JVC_MIN_GAP (JVC_MIN_GAP_TICKS * JVC_TICK)
const uint16_t kJvcTick = 75;
const uint16_t kJvcHdrMarkTicks = 112;
const uint16_t kJvcHdrMark = kJvcHdrMarkTicks * kJvcTick;
const uint16_t kJvcHdrSpaceTicks = 56;
const uint16_t kJvcHdrSpace = kJvcHdrSpaceTicks * kJvcTick;
const uint16_t kJvcBitMarkTicks = 7;
const uint16_t kJvcBitMark = kJvcBitMarkTicks * kJvcTick;
const uint16_t kJvcOneSpaceTicks = 23;
const uint16_t kJvcOneSpace = kJvcOneSpaceTicks * kJvcTick;
const uint16_t kJvcZeroSpaceTicks = 7;
const uint16_t kJvcZeroSpace = kJvcZeroSpaceTicks * kJvcTick;
const uint16_t kJvcRptLengthTicks = 800;
const uint16_t kJvcRptLength = kJvcRptLengthTicks * kJvcTick;
const uint16_t kJvcMinGapTicks = kJvcRptLengthTicks -
(kJvcHdrMarkTicks + kJvcHdrSpaceTicks +
kJvcBits * (kJvcBitMarkTicks + kJvcOneSpaceTicks) +
kJvcBitMarkTicks);
const uint16_t kJvcMinGap = kJvcMinGapTicks * kJvcTick;
#if SEND_JVC
// Send a JVC message.
//
// Args:
// data: The contents of the command you want to send.
// nbits: The bit size of the command being sent. (JVC_BITS)
// nbits: The bit size of the command being sent. (kJvcBits)
// repeat: The number of times you want the command to be repeated.
//
// Status: STABLE.
@@ -57,23 +57,23 @@ void IRsend::sendJVC(uint64_t data, uint16_t nbits, uint16_t repeat) {
IRtimer usecs = IRtimer();
// Header
// Only sent for the first message.
mark(JVC_HDR_MARK);
space(JVC_HDR_SPACE);
mark(kJvcHdrMark);
space(kJvcHdrSpace);
// We always send the data & footer at least once, hence '<= repeat'.
for (uint16_t i = 0; i <= repeat; i++) {
sendGeneric(0, 0, // No Header
JVC_BIT_MARK, JVC_ONE_SPACE,
JVC_BIT_MARK, JVC_ZERO_SPACE,
JVC_BIT_MARK, JVC_MIN_GAP,
kJvcBitMark, kJvcOneSpace,
kJvcBitMark, kJvcZeroSpace,
kJvcBitMark, kJvcMinGap,
data, nbits, 38, true, 0, // Repeats are handles elsewhere.
33);
// Wait till the end of the repeat time window before we send another code.
uint32_t elapsed = usecs.elapsed();
// Avoid potential unsigned integer underflow.
// e.g. when elapsed > JVC_RPT_LENGTH.
if (elapsed < JVC_RPT_LENGTH)
space(JVC_RPT_LENGTH - elapsed);
// e.g. when elapsed > kJvcRptLength.
if (elapsed < kJvcRptLength)
space(kJvcRptLength - elapsed);
usecs.reset();
}
}
@@ -100,7 +100,7 @@ uint16_t IRsend::encodeJVC(uint8_t address, uint8_t command) {
//
// Args:
// results: Ptr to the data to decode and where to store the decode result.
// nbits: Nr. of bits of data to expect. Typically JVC_BITS.
// nbits: Nr. of bits of data to expect. Typically kJvcBits.
// strict: Flag indicating if we should perform strict matching.
// Returns:
// boolean: True if it can decode it, false if it can't.
@@ -112,49 +112,49 @@ uint16_t IRsend::encodeJVC(uint8_t address, uint8_t command) {
// Ref:
// http://www.sbprojects.com/knowledge/ir/jvc.php
bool IRrecv::decodeJVC(decode_results *results, uint16_t nbits, bool strict) {
if (strict && nbits != JVC_BITS)
if (strict && nbits != kJvcBits)
return false; // Must be called with the correct nr. of bits.
if (results->rawlen < 2 * nbits + FOOTER - 1)
if (results->rawlen < 2 * nbits + kFooter - 1)
return false; // Can't possibly be a valid JVC message.
uint64_t data = 0;
uint16_t offset = OFFSET_START;
uint16_t offset = kStartOffset;
bool isRepeat = true;
uint32_t m_tick;
uint32_t s_tick;
// Header
// (Optional as repeat codes don't have the header)
if (matchMark(results->rawbuf[offset], JVC_HDR_MARK)) {
if (matchMark(results->rawbuf[offset], kJvcHdrMark)) {
isRepeat = false;
m_tick = results->rawbuf[offset++] * RAWTICK / JVC_HDR_MARK_TICKS;
m_tick = results->rawbuf[offset++] * kRawTick / kJvcHdrMarkTicks;
if (results->rawlen < 2 * nbits + 4)
return false; // Can't possibly be a valid JVC message with a header.
if (!matchSpace(results->rawbuf[offset], JVC_HDR_SPACE))
if (!matchSpace(results->rawbuf[offset], kJvcHdrSpace))
return false;
s_tick = results->rawbuf[offset++] * RAWTICK / JVC_HDR_SPACE_TICKS;
s_tick = results->rawbuf[offset++] * kRawTick / kJvcHdrSpaceTicks;
} else {
// We can't easily auto-calibrate as there is no header, so assume
// the default tick time.
m_tick = JVC_TICK;
s_tick = JVC_TICK;
m_tick = kJvcTick;
s_tick = kJvcTick;
}
// Data
match_result_t data_result = matchData(&(results->rawbuf[offset]), nbits,
JVC_BIT_MARK_TICKS * m_tick,
JVC_ONE_SPACE_TICKS * s_tick,
JVC_BIT_MARK_TICKS * m_tick,
JVC_ZERO_SPACE_TICKS * s_tick);
kJvcBitMarkTicks * m_tick,
kJvcOneSpaceTicks * s_tick,
kJvcBitMarkTicks * m_tick,
kJvcZeroSpaceTicks * s_tick);
if (data_result.success == false) return false;
data = data_result.data;
offset += data_result.used;
// Footer
if (!matchMark(results->rawbuf[offset++], JVC_BIT_MARK_TICKS * m_tick))
if (!matchMark(results->rawbuf[offset++], kJvcBitMarkTicks * m_tick))
return false;
if (offset < results->rawlen &&
!matchAtLeast(results->rawbuf[offset], JVC_MIN_GAP_TICKS * s_tick))
!matchAtLeast(results->rawbuf[offset], kJvcMinGapTicks * s_tick))
return false;
// Success

304
src/ir_Kelvinator.cpp
View File

@@ -30,97 +30,100 @@
// KK KK EEEEEEE LLLLLLL VVV IIIII NN NN AA AA TTT OOOO0 RR RR
// Constants
#define KELVINATOR_TICK 85U
#define KELVINATOR_HDR_MARK_TICKS 106U
#define KELVINATOR_HDR_MARK (KELVINATOR_HDR_MARK_TICKS * KELVINATOR_TICK)
#define KELVINATOR_HDR_SPACE_TICKS 53U
#define KELVINATOR_HDR_SPACE (KELVINATOR_HDR_SPACE_TICKS * KELVINATOR_TICK)
#define KELVINATOR_BIT_MARK_TICKS 8U
#define KELVINATOR_BIT_MARK (KELVINATOR_BIT_MARK_TICKS * KELVINATOR_TICK)
#define KELVINATOR_ONE_SPACE_TICKS 18U
#define KELVINATOR_ONE_SPACE (KELVINATOR_ONE_SPACE_TICKS * KELVINATOR_TICK)
#define KELVINATOR_ZERO_SPACE_TICKS 6U
#define KELVINATOR_ZERO_SPACE (KELVINATOR_ZERO_SPACE_TICKS * KELVINATOR_TICK)
#define KELVINATOR_GAP_SPACE_TICKS 235U
#define KELVINATOR_GAP_SPACE (KELVINATOR_GAP_SPACE_TICKS * KELVINATOR_TICK)
#define KELVINATOR_CMD_FOOTER 2U
#define KELVINATOR_CMD_FOOTER_BITS 3U
#define KELVINATOR_POWER 8U
#define KELVINATOR_MODE_MASK 0xF8U
#define KELVINATOR_FAN_OFFSET 4U
#define KELVINATOR_BASIC_FAN_MASK uint8_t(0xFFU ^ (3U << KELVINATOR_FAN_OFFSET))
#define KELVINATOR_FAN_MASK uint8_t(0xFFU ^ (7U << KELVINATOR_FAN_OFFSET))
#define KELVINATOR_CHECKSUM_START 10U
#define KELVINATOR_VENT_SWING_OFFSET 6U
#define KELVINATOR_VENT_SWING uint8_t(1U << KELVINATOR_VENT_SWING_OFFSET)
#define KELVINATOR_VENT_SWING_V uint8_t(1U)
#define KELVINATOR_VENT_SWING_H uint8_t(1U << 4)
#define KELVINATOR_SLEEP_1_AND_3 uint8_t(1U << 7)
#define KELVINATOR_QUIET_OFFSET 7U
#define KELVINATOR_QUIET uint8_t(1U << KELVINATOR_QUIET_OFFSET)
#define KELVINATOR_ION_FILTER_OFFSET 6U
#define KELVINATOR_ION_FILTER uint8_t(1U << KELVINATOR_ION_FILTER_OFFSET)
#define KELVINATOR_LIGHT_OFFSET 5U
#define KELVINATOR_LIGHT uint8_t(1U << KELVINATOR_LIGHT_OFFSET)
#define KELVINATOR_XFAN_OFFSET 7U
#define KELVINATOR_XFAN uint8_t(1U << KELVINATOR_XFAN_OFFSET)
#define KELVINATOR_TURBO_OFFSET 4U
#define KELVINATOR_TURBO uint8_t(1U << KELVINATOR_TURBO_OFFSET)
const uint16_t kKelvinatorTick = 85;
const uint16_t kKelvinatorHdrMarkTicks = 106;
const uint16_t kKelvinatorHdrMark = kKelvinatorHdrMarkTicks * kKelvinatorTick;
const uint16_t kKelvinatorHdrSpaceTicks = 53;
const uint16_t kKelvinatorHdrSpace = kKelvinatorHdrSpaceTicks * kKelvinatorTick;
const uint16_t kKelvinatorBitMarkTicks = 8;
const uint16_t kKelvinatorBitMark = kKelvinatorBitMarkTicks * kKelvinatorTick;
const uint16_t kKelvinatorOneSpaceTicks = 18;
const uint16_t kKelvinatorOneSpace = kKelvinatorOneSpaceTicks * kKelvinatorTick;
const uint16_t kKelvinatorZeroSpaceTicks = 6;
const uint16_t kKelvinatorZeroSpace =
kKelvinatorZeroSpaceTicks * kKelvinatorTick;
const uint16_t kKelvinatorGapSpaceTicks = 235;
const uint16_t kKelvinatorGapSpace = kKelvinatorGapSpaceTicks * kKelvinatorTick;
const uint8_t kKelvinatorCmdFooter = 2;
const uint8_t kKelvinatorCmdFooterBits = 3;
const uint8_t kKelvinatorPower = 8;
const uint8_t kKelvinatorModeMask = 0xF8;
const uint8_t kKelvinatorFanOffset = 4;
const uint8_t kKelvinatorBasicFanMask = 0xFF ^ (3U << kKelvinatorFanOffset);
const uint8_t kKelvinatorFanMask = 0xFF ^ (7U << kKelvinatorFanOffset);
const uint8_t kKelvinatorChecksumStart = 10;
const uint8_t kKelvinatorVentSwingOffset = 6;
const uint8_t kKelvinatorVentSwing = 1 << kKelvinatorVentSwingOffset;
const uint8_t kKelvinatorVentSwingV = 1;
const uint8_t kKelvinatorVentSwingH = 1 << 4;
const uint8_t kKelvinatorSleep1And3 = 1 << 7;
const uint8_t kKelvinatorQuietOffset = 7;
const uint8_t kKelvinatorQuiet = 1 << kKelvinatorQuietOffset;
const uint8_t kKelvinatorIonFilterOffset = 6;
const uint8_t kKelvinatorIonFilter = 1 << kKelvinatorIonFilterOffset;
const uint8_t kKelvinatorLightOffset = 5;
const uint8_t kKelvinatorLight = 1 << kKelvinatorLightOffset;
const uint8_t kKelvinatorXfanOffset = 7;
const uint8_t kKelvinatorXfan = 1 << kKelvinatorXfanOffset;
const uint8_t kKelvinatorTurboOffset = 4;
const uint8_t kKelvinatorTurbo = 1 << kKelvinatorTurboOffset;
#if SEND_KELVINATOR
// Send a Kelvinator A/C message.
//
// Args:
// data: An array of bytes containing the IR command.
// nbytes: Nr. of bytes of data in the array. (>=KELVINATOR_STATE_LENGTH)
// nbytes: Nr. of bytes of data in the array. (>=kKelvinatorStateLength)
// repeat: Nr. of times the message is to be repeated. (Default = 0).
//
// Status: STABLE / Known working.
//
void IRsend::sendKelvinator(unsigned char data[], uint16_t nbytes,
uint16_t repeat) {
if (nbytes < KELVINATOR_STATE_LENGTH)
if (nbytes < kKelvinatorStateLength)
return; // Not enough bytes to send a proper message.
for (uint16_t r = 0; r <= repeat; r++) {
// Command Block #1 (4 bytes)
sendGeneric(KELVINATOR_HDR_MARK, KELVINATOR_HDR_SPACE,
KELVINATOR_BIT_MARK, KELVINATOR_ONE_SPACE,
KELVINATOR_BIT_MARK, KELVINATOR_ZERO_SPACE,
sendGeneric(kKelvinatorHdrMark, kKelvinatorHdrSpace,
kKelvinatorBitMark, kKelvinatorOneSpace,
kKelvinatorBitMark, kKelvinatorZeroSpace,
0, 0, // No Footer yet.
data, 4, 38, false, 0, 50);
// Send Footer for the command block (3 bits (B010))
// Send Footer for the command block (3 bits (b010))
sendGeneric(0, 0, // No Header
KELVINATOR_BIT_MARK, KELVINATOR_ONE_SPACE,
KELVINATOR_BIT_MARK, KELVINATOR_ZERO_SPACE,
KELVINATOR_BIT_MARK, KELVINATOR_GAP_SPACE,
KELVINATOR_CMD_FOOTER, KELVINATOR_CMD_FOOTER_BITS,
kKelvinatorBitMark, kKelvinatorOneSpace,
kKelvinatorBitMark, kKelvinatorZeroSpace,
kKelvinatorBitMark, kKelvinatorGapSpace,
kKelvinatorCmdFooter, kKelvinatorCmdFooterBits,
38, false, 0, 50);
// Data Block #1 (4 bytes)
sendGeneric(0, 0, // No header
KELVINATOR_BIT_MARK, KELVINATOR_ONE_SPACE,
KELVINATOR_BIT_MARK, KELVINATOR_ZERO_SPACE,
KELVINATOR_BIT_MARK, KELVINATOR_GAP_SPACE * 2,
kKelvinatorBitMark, kKelvinatorOneSpace,
kKelvinatorBitMark, kKelvinatorZeroSpace,
kKelvinatorBitMark, kKelvinatorGapSpace * 2,
data + 4, 4, 38, false, 0, 50);
// Command Block #2 (4 bytes)
sendGeneric(KELVINATOR_HDR_MARK, KELVINATOR_HDR_SPACE,
KELVINATOR_BIT_MARK, KELVINATOR_ONE_SPACE,
KELVINATOR_BIT_MARK, KELVINATOR_ZERO_SPACE,
sendGeneric(kKelvinatorHdrMark, kKelvinatorHdrSpace,
kKelvinatorBitMark, kKelvinatorOneSpace,
kKelvinatorBitMark, kKelvinatorZeroSpace,
0, 0, // No Footer yet.
data + 8, 4, 38, false, 0, 50);
// Send Footer for the command block (3 bits (B010))
sendGeneric(0, 0, // No Header
KELVINATOR_BIT_MARK, KELVINATOR_ONE_SPACE,
KELVINATOR_BIT_MARK, KELVINATOR_ZERO_SPACE,
KELVINATOR_BIT_MARK, KELVINATOR_GAP_SPACE,
KELVINATOR_CMD_FOOTER, KELVINATOR_CMD_FOOTER_BITS,
kKelvinatorBitMark, kKelvinatorOneSpace,
kKelvinatorBitMark, kKelvinatorZeroSpace,
kKelvinatorBitMark, kKelvinatorGapSpace,
kKelvinatorCmdFooter, kKelvinatorCmdFooterBits,
38, false, 0, 50);
// Data Block #2 (4 bytes)
sendGeneric(0, 0, // No header
KELVINATOR_BIT_MARK, KELVINATOR_ONE_SPACE,
KELVINATOR_BIT_MARK, KELVINATOR_ZERO_SPACE,
KELVINATOR_BIT_MARK, KELVINATOR_GAP_SPACE * 2,
kKelvinatorBitMark, kKelvinatorOneSpace,
kKelvinatorBitMark, kKelvinatorZeroSpace,
kKelvinatorBitMark, kKelvinatorGapSpace * 2,
data + 12, 4, 38, false, 0, 50);
}
}
@@ -131,7 +134,7 @@ IRKelvinatorAC::IRKelvinatorAC(uint16_t pin) : _irsend(pin) {
}
void IRKelvinatorAC::stateReset() {
for (uint8_t i = 0; i < KELVINATOR_STATE_LENGTH; i++)
for (uint8_t i = 0; i < kKelvinatorStateLength; i++)
remote_state[i] = 0x0;
remote_state[3] = 0x50;
remote_state[11] = 0x70;
@@ -143,7 +146,7 @@ void IRKelvinatorAC::begin() {
void IRKelvinatorAC::fixup() {
// X-Fan mode is only valid in COOL or DRY modes.
if (getMode() != KELVINATOR_COOL && getMode() != KELVINATOR_DRY)
if (getMode() != kKelvinatorCool && getMode() != kKelvinatorDry)
setXFan(false);
checksum(); // Calculate the checksums
}
@@ -161,14 +164,14 @@ uint8_t* IRKelvinatorAC::getRaw() {
}
void IRKelvinatorAC::setRaw(uint8_t new_code[]) {
for (uint8_t i = 0; i < KELVINATOR_STATE_LENGTH; i++) {
for (uint8_t i = 0; i < kKelvinatorStateLength; i++) {
remote_state[i] = new_code[i];
}
}
uint8_t IRKelvinatorAC::calcBlockChecksum(const uint8_t *block,
const uint16_t length) {
uint8_t sum = KELVINATOR_CHECKSUM_START;
uint8_t sum = kKelvinatorChecksumStart;
// Sum the lower half of the first 4 bytes of this block.
for (uint8_t i = 0; i < 4 && i < length - 1; i++, block++)
sum += (*block & 0x0FU);
@@ -205,12 +208,12 @@ bool IRKelvinatorAC::validChecksum(const uint8_t state[],
}
void IRKelvinatorAC::on() {
remote_state[0] |= KELVINATOR_POWER;
remote_state[0] |= kKelvinatorPower;
remote_state[8] = remote_state[0]; // Duplicate to the 2nd command chunk.
}
void IRKelvinatorAC::off() {
remote_state[0] &= ~KELVINATOR_POWER;
remote_state[0] &= ~kKelvinatorPower;
remote_state[8] = remote_state[0]; // Duplicate to the 2nd command chunk.
}
@@ -222,140 +225,140 @@ void IRKelvinatorAC::setPower(bool state) {
}
bool IRKelvinatorAC::getPower() {
return ((remote_state[0] & KELVINATOR_POWER) != 0);
return ((remote_state[0] & kKelvinatorPower) != 0);
}
// Set the temp. in deg C
void IRKelvinatorAC::setTemp(uint8_t temp) {
temp = std::max((uint8_t) KELVINATOR_MIN_TEMP, temp);
temp = std::min((uint8_t) KELVINATOR_MAX_TEMP, temp);
remote_state[1] = (remote_state[1] & 0xF0U) | (temp - KELVINATOR_MIN_TEMP);
temp = std::max(kKelvinatorMinTemp, temp);
temp = std::min(kKelvinatorMaxTemp, temp);
remote_state[1] = (remote_state[1] & 0xF0U) | (temp - kKelvinatorMinTemp);
remote_state[9] = remote_state[1]; // Duplicate to the 2nd command chunk.
}
// Return the set temp. in deg C
uint8_t IRKelvinatorAC::getTemp() {
return ((remote_state[1] & 0xFU) + KELVINATOR_MIN_TEMP);
return ((remote_state[1] & 0xFU) + kKelvinatorMinTemp);
}
// Set the speed of the fan, 0-5, 0 is auto, 1-5 is the speed
void IRKelvinatorAC::setFan(uint8_t fan) {
fan = std::min((uint8_t) KELVINATOR_FAN_MAX, fan); // Bounds check
fan = std::min(kKelvinatorFanMax, fan); // Bounds check
// Only change things if we need to.
if (fan != getFan()) {
// Set the basic fan values.
uint8_t fan_basic = std::min((uint8_t) KELVINATOR_BASIC_FAN_MAX, fan);
remote_state[0] = (remote_state[0] & KELVINATOR_BASIC_FAN_MASK) |
(fan_basic << KELVINATOR_FAN_OFFSET);
uint8_t fan_basic = std::min(kKelvinatorBasicFanMax, fan);
remote_state[0] = (remote_state[0] & kKelvinatorBasicFanMask) |
(fan_basic << kKelvinatorFanOffset);
remote_state[8] = remote_state[0]; // Duplicate to the 2nd command chunk.
// Set the advanced(?) fan value.
remote_state[14] = (remote_state[14] & KELVINATOR_FAN_MASK) |
(fan << KELVINATOR_FAN_OFFSET);
remote_state[14] = (remote_state[14] & kKelvinatorFanMask) |
(fan << kKelvinatorFanOffset);
setTurbo(false); // Turbo mode is turned off if we change the fan settings.
}
}
uint8_t IRKelvinatorAC::getFan() {
return ((remote_state[14] & ~KELVINATOR_FAN_MASK) >> KELVINATOR_FAN_OFFSET);
return ((remote_state[14] & ~kKelvinatorFanMask) >> kKelvinatorFanOffset);
}
uint8_t IRKelvinatorAC::getMode() {
return (remote_state[0] & ~KELVINATOR_MODE_MASK);
return (remote_state[0] & ~kKelvinatorModeMask);
}
void IRKelvinatorAC::setMode(uint8_t mode) {
// If we get an unexpected mode, default to AUTO.
if (mode > KELVINATOR_HEAT) mode = KELVINATOR_AUTO;
remote_state[0] = (remote_state[0] & KELVINATOR_MODE_MASK) | mode;
if (mode > kKelvinatorHeat) mode = kKelvinatorAuto;
remote_state[0] = (remote_state[0] & kKelvinatorModeMask) | mode;
remote_state[8] = remote_state[0]; // Duplicate to the 2nd command chunk.
if (mode == KELVINATOR_AUTO || KELVINATOR_DRY)
if (mode == kKelvinatorAuto || kKelvinatorDry)
// When the remote is set to Auto or Dry, it defaults to 25C and doesn't
// show it.
setTemp(KELVINATOR_AUTO_TEMP);
setTemp(kKelvinatorAutoTemp);
}
void IRKelvinatorAC::setSwingVertical(bool state) {
if (state) {
remote_state[0] |= KELVINATOR_VENT_SWING;
remote_state[4] |= KELVINATOR_VENT_SWING_V;
remote_state[0] |= kKelvinatorVentSwing;
remote_state[4] |= kKelvinatorVentSwingV;
} else {
remote_state[4] &= ~KELVINATOR_VENT_SWING_V;
remote_state[4] &= ~kKelvinatorVentSwingV;
if (!getSwingHorizontal())
remote_state[0] &= ~KELVINATOR_VENT_SWING;
remote_state[0] &= ~kKelvinatorVentSwing;
}
remote_state[8] = remote_state[0]; // Duplicate to the 2nd command chunk.
}
bool IRKelvinatorAC::getSwingVertical() {
return ((remote_state[4] & KELVINATOR_VENT_SWING_V) != 0);
return ((remote_state[4] & kKelvinatorVentSwingV) != 0);
}
void IRKelvinatorAC::setSwingHorizontal(bool state) {
if (state) {
remote_state[0] |= KELVINATOR_VENT_SWING;
remote_state[4] |= KELVINATOR_VENT_SWING_H;
remote_state[0] |= kKelvinatorVentSwing;
remote_state[4] |= kKelvinatorVentSwingH;
} else {
remote_state[4] &= ~KELVINATOR_VENT_SWING_H;
remote_state[4] &= ~kKelvinatorVentSwingH;
if (!getSwingVertical())
remote_state[0] &= ~KELVINATOR_VENT_SWING;
remote_state[0] &= ~kKelvinatorVentSwing;
}
remote_state[8] = remote_state[0]; // Duplicate to the 2nd command chunk.
}
bool IRKelvinatorAC::getSwingHorizontal() {
return ((remote_state[4] & KELVINATOR_VENT_SWING_H) != 0);
return ((remote_state[4] & kKelvinatorVentSwingH) != 0);
}
void IRKelvinatorAC::setQuiet(bool state) {
remote_state[12] &= ~KELVINATOR_QUIET;
remote_state[12] |= (state << KELVINATOR_QUIET_OFFSET);
remote_state[12] &= ~kKelvinatorQuiet;
remote_state[12] |= (state << kKelvinatorQuietOffset);
}
bool IRKelvinatorAC::getQuiet() {
return ((remote_state[12] & KELVINATOR_QUIET) != 0);
return ((remote_state[12] & kKelvinatorQuiet) != 0);
}
void IRKelvinatorAC::setIonFilter(bool state) {
remote_state[2] &= ~KELVINATOR_ION_FILTER;
remote_state[2] |= (state << KELVINATOR_ION_FILTER_OFFSET);
remote_state[2] &= ~kKelvinatorIonFilter;
remote_state[2] |= (state << kKelvinatorIonFilterOffset);
remote_state[10] = remote_state[2]; // Duplicate to the 2nd command chunk.
}
bool IRKelvinatorAC::getIonFilter() {
return ((remote_state[2] & KELVINATOR_ION_FILTER) != 0);
return ((remote_state[2] & kKelvinatorIonFilter) != 0);
}
void IRKelvinatorAC::setLight(bool state) {
remote_state[2] &= ~KELVINATOR_LIGHT;
remote_state[2] |= (state << KELVINATOR_LIGHT_OFFSET);
remote_state[2] &= ~kKelvinatorLight;
remote_state[2] |= (state << kKelvinatorLightOffset);
remote_state[10] = remote_state[2]; // Duplicate to the 2nd command chunk.
}
bool IRKelvinatorAC::getLight() {
return ((remote_state[2] & KELVINATOR_LIGHT) != 0);
return ((remote_state[2] & kKelvinatorLight) != 0);
}
// Note: XFan mode is only valid in Cool or Dry mode.
void IRKelvinatorAC::setXFan(bool state) {
remote_state[2] &= ~KELVINATOR_XFAN;
remote_state[2] |= (state << KELVINATOR_XFAN_OFFSET);
remote_state[2] &= ~kKelvinatorXfan;
remote_state[2] |= (state << kKelvinatorXfanOffset);
remote_state[10] = remote_state[2]; // Duplicate to the 2nd command chunk.
}
bool IRKelvinatorAC::getXFan() {
return ((remote_state[2] & KELVINATOR_XFAN) != 0);
return ((remote_state[2] & kKelvinatorXfan) != 0);
}
// Note: Turbo mode is turned off if the fan speed is changed.
void IRKelvinatorAC::setTurbo(bool state) {
remote_state[2] &= ~KELVINATOR_TURBO;
remote_state[2] |= (state << KELVINATOR_TURBO_OFFSET);
remote_state[2] &= ~kKelvinatorTurbo;
remote_state[2] |= (state << kKelvinatorTurboOffset);
remote_state[10] = remote_state[2]; // Duplicate to the 2nd command chunk.
}
bool IRKelvinatorAC::getTurbo() {
return ((remote_state[2] & KELVINATOR_TURBO) != 0);
return ((remote_state[2] & kKelvinatorTurbo) != 0);
}
// Convert the internal state into a human readable string.
@@ -373,19 +376,19 @@ std::string IRKelvinatorAC::toString() {
result += "Off";
result += ", Mode: " + uint64ToString(getMode());
switch (getMode()) {
case KELVINATOR_AUTO:
case kKelvinatorAuto:
result += " (AUTO)";
break;
case KELVINATOR_COOL:
case kKelvinatorCool:
result += " (COOL)";
break;
case KELVINATOR_HEAT:
case kKelvinatorHeat:
result += " (HEAT)";
break;
case KELVINATOR_DRY:
case kKelvinatorDry:
result += " (DRY)";
break;
case KELVINATOR_FAN:
case kKelvinatorFan:
result += " (FAN)";
break;
default:
@@ -394,10 +397,10 @@ std::string IRKelvinatorAC::toString() {
result += ", Temp: " + uint64ToString(getTemp()) + "C";
result += ", Fan: " + uint64ToString(getFan());
switch (getFan()) {
case KELVINATOR_FAN_AUTO:
case kKelvinatorFanAuto:
result += " (AUTO)";
break;
case KELVINATOR_FAN_MAX:
case kKelvinatorFanMax:
result += " (MAX)";
break;
}
@@ -444,7 +447,7 @@ std::string IRKelvinatorAC::toString() {
//
// Args:
// results: Ptr to the data to decode and where to store the decode result.
// nbits: The number of data bits to expect. Typically KELVINATOR_BITS.
// nbits: The number of data bits to expect. Typically kKelvinatorBits.
// strict: Flag indicating if we should perform strict matching.
// Returns:
// boolean: True if it can decode it, false if it can't.
@@ -452,14 +455,14 @@ std::string IRKelvinatorAC::toString() {
// Status: ALPHA / Untested.
bool IRrecv::decodeKelvinator(decode_results *results, uint16_t nbits,
bool strict) {
if (results->rawlen < 2 * (nbits + KELVINATOR_CMD_FOOTER_BITS) +
(HEADER + FOOTER + 1) * 2 - 1)
if (results->rawlen < 2 * (nbits + kKelvinatorCmdFooterBits) +
(kHeader + kFooter + 1) * 2 - 1)
return false; // Can't possibly be a valid Kelvinator message.
if (strict && nbits != KELVINATOR_BITS)
if (strict && nbits != kKelvinatorBits)
return false; // Not strictly a Kelvinator message.
uint32_t data;
uint16_t offset = OFFSET_START;
uint16_t offset = kStartOffset;
// There are two messages back-to-back in a full Kelvinator IR message
// sequence.
@@ -468,77 +471,80 @@ bool IRrecv::decodeKelvinator(decode_results *results, uint16_t nbits,
match_result_t data_result;
// Header
if (!matchMark(results->rawbuf[offset], KELVINATOR_HDR_MARK)) return false;
if (!matchMark(results->rawbuf[offset], kKelvinatorHdrMark)) return false;
// Calculate how long the lowest tick time is based on the header mark.
uint32_t mark_tick = results->rawbuf[offset++] * RAWTICK /
KELVINATOR_HDR_MARK_TICKS;
if (!matchSpace(results->rawbuf[offset], KELVINATOR_HDR_SPACE))
uint32_t mark_tick = results->rawbuf[offset++] * kRawTick /
kKelvinatorHdrMarkTicks;
if (!matchSpace(results->rawbuf[offset], kKelvinatorHdrSpace))
return false;
// Calculate how long the common tick time is based on the header space.
uint32_t space_tick = results->rawbuf[offset++] * RAWTICK /
KELVINATOR_HDR_SPACE_TICKS;
uint32_t space_tick = results->rawbuf[offset++] * kRawTick /
kKelvinatorHdrSpaceTicks;
// Data (Command) (32 bits)
data_result = matchData(&(results->rawbuf[offset]), 32,
KELVINATOR_BIT_MARK_TICKS * mark_tick,
KELVINATOR_ONE_SPACE_TICKS * space_tick,
KELVINATOR_BIT_MARK_TICKS * mark_tick,
KELVINATOR_ZERO_SPACE_TICKS * space_tick);
kKelvinatorBitMarkTicks * mark_tick,
kKelvinatorOneSpaceTicks * space_tick,
kKelvinatorBitMarkTicks * mark_tick,
kKelvinatorZeroSpaceTicks * space_tick,
kTolerance, kMarkExcess, false);
if (data_result.success == false) return false;
data = data_result.data;
offset += data_result.used;
// Record command data in the state.
for (int i = state_pos + 3; i >= state_pos; i--, data >>= 8)
results->state[i] = reverseBits(data & 0xFF, 8);
for (uint16_t i = 0; i < 4; i++, data >>= 8)
results->state[state_pos + i] = data & 0xFF;
state_pos += 4;
// Command data footer (3 bits, B010)
data_result = matchData(&(results->rawbuf[offset]),
KELVINATOR_CMD_FOOTER_BITS,
KELVINATOR_BIT_MARK_TICKS * mark_tick,
KELVINATOR_ONE_SPACE_TICKS * space_tick,
KELVINATOR_BIT_MARK_TICKS * mark_tick,
KELVINATOR_ZERO_SPACE_TICKS * space_tick);
kKelvinatorCmdFooterBits,
kKelvinatorBitMarkTicks * mark_tick,
kKelvinatorOneSpaceTicks * space_tick,
kKelvinatorBitMarkTicks * mark_tick,
kKelvinatorZeroSpaceTicks * space_tick,
kTolerance, kMarkExcess, false);
if (data_result.success == false) return false;
if (data_result.data != KELVINATOR_CMD_FOOTER) return false;
if (data_result.data != kKelvinatorCmdFooter) return false;
offset += data_result.used;
// Interdata gap.
if (!matchMark(results->rawbuf[offset++],
KELVINATOR_BIT_MARK_TICKS * mark_tick))
kKelvinatorBitMarkTicks * mark_tick))
return false;
if (!matchSpace(results->rawbuf[offset++],
KELVINATOR_GAP_SPACE_TICKS * space_tick))
kKelvinatorGapSpaceTicks * space_tick))
return false;
// Data (Options) (32 bits)
data_result = matchData(&(results->rawbuf[offset]), 32,
KELVINATOR_BIT_MARK_TICKS * mark_tick,
KELVINATOR_ONE_SPACE_TICKS * space_tick,
KELVINATOR_BIT_MARK_TICKS * mark_tick,
KELVINATOR_ZERO_SPACE_TICKS * space_tick);
kKelvinatorBitMarkTicks * mark_tick,
kKelvinatorOneSpaceTicks * space_tick,
kKelvinatorBitMarkTicks * mark_tick,
kKelvinatorZeroSpaceTicks * space_tick,
kTolerance, kMarkExcess, false);
if (data_result.success == false) return false;
data = data_result.data;
offset += data_result.used;
// Record option data in the state.
for (int i = state_pos + 3; i >= state_pos; i--, data >>= 8)
results->state[i] = reverseBits(data & 0xFF, 8);
for (uint16_t i = 0; i < 4; i++, data >>= 8)
results->state[state_pos + i] = data & 0xFF;
state_pos += 4;
// Inter-sequence gap. (Double length gap)
if (!matchMark(results->rawbuf[offset++],
KELVINATOR_BIT_MARK_TICKS * mark_tick))
kKelvinatorBitMarkTicks * mark_tick))
return false;
if (s == 0) {
if (!matchSpace(results->rawbuf[offset++],
KELVINATOR_GAP_SPACE_TICKS * space_tick * 2))
kKelvinatorGapSpaceTicks * space_tick * 2))
return false;
} else {
if (offset <= results->rawlen &&
!matchAtLeast(results->rawbuf[offset],
KELVINATOR_GAP_SPACE_TICKS * 2 * space_tick))
kKelvinatorGapSpaceTicks * 2 * space_tick))
return false;
}
}
@@ -546,7 +552,7 @@ bool IRrecv::decodeKelvinator(decode_results *results, uint16_t nbits,
// Compliance
if (strict) {
// Correct size/length)
if (state_pos != KELVINATOR_STATE_LENGTH) return false;
if (state_pos != kKelvinatorStateLength) return false;
// Verify the message's checksum is correct.
if (!IRKelvinatorAC::validChecksum(results->state)) return false;
}

44
src/ir_Kelvinator.h
View File

@@ -22,17 +22,31 @@
// KK KK EEEEEEE LLLLLLL VVV IIIII NN NN AA AA TTT OOOO0 RR RR
// Constants
#define KELVINATOR_AUTO 0U
#define KELVINATOR_COOL 1U
#define KELVINATOR_DRY 2U
#define KELVINATOR_FAN 3U
#define KELVINATOR_HEAT 4U
#define KELVINATOR_BASIC_FAN_MAX 3U
#define KELVINATOR_FAN_AUTO 0U
#define KELVINATOR_FAN_MAX 5U
#define KELVINATOR_MIN_TEMP 16U // 16C
#define KELVINATOR_MAX_TEMP 30U // 30C
#define KELVINATOR_AUTO_TEMP 25U // 25C
const uint8_t kKelvinatorAuto = 0;
const uint8_t kKelvinatorCool = 1;
const uint8_t kKelvinatorDry = 2;
const uint8_t kKelvinatorFan = 3;
const uint8_t kKelvinatorHeat = 4;
const uint8_t kKelvinatorBasicFanMax = 3;
const uint8_t kKelvinatorFanAuto = 0;
const uint8_t kKelvinatorFanMax = 5;
const uint8_t kKelvinatorMinTemp = 16; // 16C
const uint8_t kKelvinatorMaxTemp = 30; // 30C
const uint8_t kKelvinatorAutoTemp = 25; // 25C
// Legacy defines (Deprecated)
#define KELVINATOR_MIN_TEMP kKelvinatorMinTemp
#define KELVINATOR_MAX_TEMP kKelvinatorMaxTemp
#define KELVINATOR_HEAT kKelvinatorHeat
#define KELVINATOR_FAN_MAX kKelvinatorFanMax
#define KELVINATOR_FAN_AUTO kKelvinatorFanAuto
#define KELVINATOR_FAN kKelvinatorFan
#define KELVINATOR_DRY kKelvinatorDry
#define KELVINATOR_COOL kKelvinatorCool
#define KELVINATOR_BASIC_FAN_MAX kKelvinatorBasicFanMax
#define KELVINATOR_AUTO_TEMP kKelvinatorAutoTemp
#define KELVINATOR_AUTO kKelvinatorAuto
/*
Kelvinator AC map
@@ -148,9 +162,9 @@ class IRKelvinatorAC {
void setRaw(uint8_t new_code[]);
static uint8_t calcBlockChecksum(
const uint8_t *block,
const uint16_t length = KELVINATOR_STATE_LENGTH / 2);
const uint16_t length = kKelvinatorStateLength / 2);
static bool validChecksum(const uint8_t state[],
const uint16_t length = KELVINATOR_STATE_LENGTH);
const uint16_t length = kKelvinatorStateLength);
#ifdef ARDUINO
String toString();
#else
@@ -159,8 +173,8 @@ class IRKelvinatorAC {
private:
// The state of the IR remote in IR code form.
uint8_t remote_state[KELVINATOR_STATE_LENGTH];
void checksum(const uint16_t length = KELVINATOR_STATE_LENGTH);
uint8_t remote_state[kKelvinatorStateLength];
void checksum(const uint16_t length = kKelvinatorStateLength);
void fixup();
IRsend _irsend;
};

123
src/ir_LG.cpp
View File

@@ -18,29 +18,30 @@
// LG send originally added by https://github.com/chaeplin
// Constants
#define LG_TICK 50U
#define LG_HDR_MARK_TICKS 170U // 8500
#define LG_HDR_MARK (LG_HDR_MARK_TICKS * LG_TICK)
#define LG_HDR_SPACE_TICKS 85U // 4250
#define LG_HDR_SPACE (LG_HDR_SPACE_TICKS * LG_TICK)
#define LG_BIT_MARK_TICKS 11U
#define LG_BIT_MARK (LG_BIT_MARK_TICKS * LG_TICK)
#define LG_ONE_SPACE_TICKS 32U
#define LG_ONE_SPACE (LG_ONE_SPACE_TICKS * LG_TICK)
#define LG_ZERO_SPACE_TICKS 11U
#define LG_ZERO_SPACE (LG_ZERO_SPACE_TICKS * LG_TICK)
#define LG_RPT_SPACE_TICKS 45U
#define LG_RPT_SPACE (LG_RPT_SPACE_TICKS * LG_TICK)
#define LG_MIN_GAP_TICKS 795U
#define LG_MIN_GAP (LG_MIN_GAP_TICKS * LG_TICK)
#define LG_MIN_MESSAGE_LENGTH_TICKS 2161U
#define LG_MIN_MESSAGE_LENGTH (LG_MIN_MESSAGE_LENGTH_TICKS * LG_TICK)
#define LG32_HDR_MARK_TICKS 90U
#define LG32_HDR_MARK (LG32_HDR_MARK_TICKS * LG_TICK)
#define LG32_HDR_SPACE_TICKS 89U
#define LG32_HDR_SPACE (LG32_HDR_SPACE_TICKS * LG_TICK)
#define LG32_RPT_HDR_MARK_TICKS 179U
#define LG32_RPT_HDR_MARK (LG32_RPT_HDR_MARK_TICKS * LG_TICK)
const uint16_t kLgTick = 50;
const uint16_t kLgHdrMarkTicks = 170;
const uint16_t kLgHdrMark = kLgHdrMarkTicks * kLgTick; // 8500
const uint16_t kLgHdrSpaceTicks = 85;
const uint16_t kLgHdrSpace = kLgHdrSpaceTicks * kLgTick; // 4250
const uint16_t kLgBitMarkTicks = 11;
const uint16_t kLgBitMark = kLgBitMarkTicks * kLgTick;
const uint16_t kLgOneSpaceTicks = 32;
const uint16_t kLgOneSpace = kLgOneSpaceTicks * kLgTick;
const uint16_t kLgZeroSpaceTicks = 11;
const uint16_t kLgZeroSpace = kLgZeroSpaceTicks * kLgTick;
const uint16_t kLgRptSpaceTicks = 45;
const uint16_t kLgRptSpace = kLgRptSpaceTicks * kLgTick;
const uint16_t kLgMinGapTicks = 795;
const uint16_t kLgMinGap = kLgMinGapTicks * kLgTick;
const uint16_t kLgMinMessageLengthTicks = 2161;
const uint32_t kLgMinMessageLength = kLgMinMessageLengthTicks * kLgTick;
const uint16_t kLg32HdrMarkTicks = 90;
const uint16_t kLg32HdrMark = kLg32HdrMarkTicks * kLgTick;
const uint16_t kLg32HdrSpaceTicks = 89;
const uint16_t kLg32HdrSpace = kLg32HdrSpaceTicks * kLgTick;
const uint16_t kLg32RptHdrMarkTicks = 179;
const uint16_t kLg32RptHdrMark = kLg32RptHdrMarkTicks * kLgTick;
#if (SEND_LG || DECODE_LG)
// Calculate the rolling 4-bit wide checksum over all of the data.
@@ -60,7 +61,7 @@ uint8_t calcLGChecksum(uint16_t data) {
// Args:
// data: The contents of the message you want to send.
// nbits: The bit size of the message being sent.
// Typically LG_BITS or LG32_BITS.
// Typically kLgBits or kLg32Bits.
// repeat: The number of times you want the message to be repeated.
//
// Status: Beta / Should be working.
@@ -70,19 +71,19 @@ uint8_t calcLGChecksum(uint16_t data) {
void IRsend::sendLG(uint64_t data, uint16_t nbits, uint16_t repeat) {
uint16_t repeatHeaderMark = 0;
if (nbits >= LG32_BITS) {
if (nbits >= kLg32Bits) {
// LG 32bit protocol is near identical to Samsung except for repeats.
sendSAMSUNG(data, nbits, 0); // Send it as a single Samsung message.
repeatHeaderMark = LG32_RPT_HDR_MARK;
repeatHeaderMark = kLg32RptHdrMark;
repeat++;
} else {
// LG (28-bit) protocol.
repeatHeaderMark = LG_HDR_MARK;
sendGeneric(LG_HDR_MARK, LG_HDR_SPACE,
LG_BIT_MARK, LG_ONE_SPACE,
LG_BIT_MARK, LG_ZERO_SPACE,
LG_BIT_MARK,
LG_MIN_GAP, LG_MIN_MESSAGE_LENGTH,
repeatHeaderMark = kLgHdrMark;
sendGeneric(kLgHdrMark, kLgHdrSpace,
kLgBitMark, kLgOneSpace,
kLgBitMark, kLgZeroSpace,
kLgBitMark,
kLgMinGap, kLgMinMessageLength,
data, nbits, 38, true, 0, // Repeats are handled later.
50);
}
@@ -90,9 +91,9 @@ void IRsend::sendLG(uint64_t data, uint16_t nbits, uint16_t repeat) {
// Repeat
// Protocol has a mandatory repeat-specific code sent after every command.
if (repeat)
sendGeneric(repeatHeaderMark, LG_RPT_SPACE,
sendGeneric(repeatHeaderMark, kLgRptSpace,
0, 0, 0, 0, // No data is sent.
LG_BIT_MARK, LG_MIN_GAP, LG_MIN_MESSAGE_LENGTH,
kLgBitMark, kLgMinGap, kLgMinMessageLength,
0, 0, // No data.
38, true, repeat - 1, 50);
}
@@ -125,7 +126,7 @@ uint32_t IRsend::encodeLG(uint16_t address, uint16_t command) {
// Args:
// results: Ptr to the data to decode and where to store the decode result.
// nbits: Nr. of bits to expect in the data portion.
// Typically LG_BITS or LG32_BITS.
// Typically kLgBits or kLg32Bits.
// strict: Flag to indicate if we strictly adhere to the specification.
// Returns:
// boolean: True if it can decode it, false if it can't.
@@ -139,65 +140,65 @@ uint32_t IRsend::encodeLG(uint16_t address, uint16_t command) {
// Ref:
// https://funembedded.wordpress.com/2014/11/08/ir-remote-control-for-lg-conditioner-using-stm32f302-mcu-on-mbed-platform/
bool IRrecv::decodeLG(decode_results *results, uint16_t nbits, bool strict) {
if (nbits >= LG32_BITS) {
if (results->rawlen < 2 * nbits + 2 * (HEADER + FOOTER) - 1)
if (nbits >= kLg32Bits) {
if (results->rawlen < 2 * nbits + 2 * (kHeader + kFooter) - 1)
return false; // Can't possibly be a valid LG32 message.
} else {
if (results->rawlen < 2 * nbits + HEADER + FOOTER - 1)
if (results->rawlen < 2 * nbits + kHeader + kFooter - 1)
return false; // Can't possibly be a valid LG message.
}
if (strict && nbits != LG_BITS && nbits != LG32_BITS)
if (strict && nbits != kLgBits && nbits != kLg32Bits)
return false; // Doesn't comply with expected LG protocol.
uint64_t data = 0;
uint16_t offset = OFFSET_START;
uint16_t offset = kStartOffset;
// Header
if (!matchMark(results->rawbuf[offset], LG_HDR_MARK) &&
!matchMark(results->rawbuf[offset], LG32_HDR_MARK)) return false;
if (!matchMark(results->rawbuf[offset], kLgHdrMark) &&
!matchMark(results->rawbuf[offset], kLg32HdrMark)) return false;
uint32_t m_tick;
if (matchMark(results->rawbuf[offset], LG_HDR_MARK))
m_tick = results->rawbuf[offset++] * RAWTICK / LG_HDR_MARK_TICKS;
if (matchMark(results->rawbuf[offset], kLgHdrMark))
m_tick = results->rawbuf[offset++] * kRawTick / kLgHdrMarkTicks;
else
m_tick = results->rawbuf[offset++] * RAWTICK / LG32_HDR_MARK_TICKS;
if (!matchSpace(results->rawbuf[offset], LG_HDR_SPACE) &&
!matchSpace(results->rawbuf[offset], LG32_HDR_SPACE)) return false;
m_tick = results->rawbuf[offset++] * kRawTick / kLg32HdrMarkTicks;
if (!matchSpace(results->rawbuf[offset], kLgHdrSpace) &&
!matchSpace(results->rawbuf[offset], kLg32HdrSpace)) return false;
uint32_t s_tick;
if (matchSpace(results->rawbuf[offset], LG_HDR_SPACE))
s_tick = results->rawbuf[offset++] * RAWTICK / LG_HDR_SPACE_TICKS;
if (matchSpace(results->rawbuf[offset], kLgHdrSpace))
s_tick = results->rawbuf[offset++] * kRawTick / kLgHdrSpaceTicks;
else
s_tick = results->rawbuf[offset++] * RAWTICK / LG32_HDR_SPACE_TICKS;
s_tick = results->rawbuf[offset++] * kRawTick / kLg32HdrSpaceTicks;
// Data
match_result_t data_result = matchData(&(results->rawbuf[offset]), nbits,
LG_BIT_MARK_TICKS * m_tick,
LG_ONE_SPACE_TICKS * s_tick,
LG_BIT_MARK_TICKS * m_tick,
LG_ZERO_SPACE_TICKS * s_tick);
kLgBitMarkTicks * m_tick,
kLgOneSpaceTicks * s_tick,
kLgBitMarkTicks * m_tick,
kLgZeroSpaceTicks * s_tick);
if (data_result.success == false) return false;
data = data_result.data;
offset += data_result.used;
// Footer
if (!matchMark(results->rawbuf[offset++], LG_BIT_MARK_TICKS * m_tick))
if (!matchMark(results->rawbuf[offset++], kLgBitMarkTicks * m_tick))
return false;
if (offset < results->rawlen &&
!matchAtLeast(results->rawbuf[offset], LG_MIN_GAP_TICKS * s_tick))
!matchAtLeast(results->rawbuf[offset], kLgMinGapTicks * s_tick))
return false;
// Repeat
if (nbits >= LG32_BITS) {
if (nbits >= kLg32Bits) {
// If we are expecting the LG 32-bit protocol, there is always
// a repeat message. So, check for it.
offset++;
if (!matchMark(results->rawbuf[offset++], LG32_RPT_HDR_MARK_TICKS * m_tick))
if (!matchMark(results->rawbuf[offset++], kLg32RptHdrMarkTicks * m_tick))
return false;
if (!matchSpace(results->rawbuf[offset++], LG_RPT_SPACE_TICKS * s_tick))
if (!matchSpace(results->rawbuf[offset++], kLgRptSpaceTicks * s_tick))
return false;
if (!matchMark(results->rawbuf[offset++], LG_BIT_MARK_TICKS * m_tick))
if (!matchMark(results->rawbuf[offset++], kLgBitMarkTicks * m_tick))
return false;
if (offset < results->rawlen &&
!matchAtLeast(results->rawbuf[offset], LG_MIN_GAP_TICKS * s_tick))
!matchAtLeast(results->rawbuf[offset], kLgMinGapTicks * s_tick))
return false;
}

51
src/ir_Lasertag.cpp
View File

@@ -12,14 +12,14 @@
// LLLLLLL AA AA SSSSS EEEEEEE RR RR TTT AA AA GGGGGG
// Constants
#define MIN_LASERTAG_SAMPLES 13U
#define LASERTAG_TICK 333U
#define LASERTAG_MIN_GAP 100000UL // Completely made up amount.
#define LASERTAG_TOLERANCE 0U // Percentage error margin
#define LASERTAG_EXCESS 0U // See MARK_EXCESS
#define LASERTAG_DELTA 150U // Use instead of EXCESS and TOLERANCE.
const int16_t kSPACE = 1;
const int16_t kMARK = 0;
const uint16_t kLasertagMinSamples = 13;
const uint16_t kLasertagTick = 333;
const uint32_t kLasertagMinGap = 100000; // Completely made up amount.
const uint8_t kLasertagTolerance = 0; // Percentage error margin.
const uint16_t kLasertagExcess = 0; // See kMarkExcess.
const uint16_t kLasertagDelta = 150; // Use instead of Excess and Tolerance.
const int16_t kSpace = 1;
const int16_t kMark = 0;
#if SEND_LASERTAG
// Send a Lasertag packet.
@@ -32,7 +32,6 @@ const int16_t kMARK = 0;
//
// Status: STABLE / Working.
//
void IRsend::sendLasertag(uint64_t data, uint16_t nbits, uint16_t repeat) {
if (nbits > sizeof(data) * 8)
return; // We can't send something that big.
@@ -45,14 +44,14 @@ void IRsend::sendLasertag(uint64_t data, uint16_t nbits, uint16_t repeat) {
// Data
for (uint64_t mask = 1ULL << (nbits - 1); mask; mask >>= 1)
if (data & mask) { // 1
space(LASERTAG_TICK); // 1 is space, then mark.
mark(LASERTAG_TICK);
space(kLasertagTick); // 1 is space, then mark.
mark(kLasertagTick);
} else { // 0
mark(LASERTAG_TICK); // 0 is mark, then space.
space(LASERTAG_TICK);
mark(kLasertagTick); // 0 is mark, then space.
space(kLasertagTick);
}
// Footer
space(LASERTAG_MIN_GAP);
space(kLasertagMinGap);
}
}
#endif // SEND_LASERTAG
@@ -76,12 +75,12 @@ void IRsend::sendLasertag(uint64_t data, uint16_t nbits, uint16_t repeat) {
// https://en.wikipedia.org/wiki/Manchester_code
bool IRrecv::decodeLasertag(decode_results *results, uint16_t nbits,
bool strict) {
if (results->rawlen < MIN_LASERTAG_SAMPLES) return false;
if (results->rawlen < kLasertagMinSamples) return false;
// Compliance
if (strict && nbits != LASERTAG_BITS) return false;
if (strict && nbits != kLasertagBits) return false;
uint16_t offset = OFFSET_START;
uint16_t offset = kStartOffset;
uint16_t used = 0;
uint64_t data = 0;
uint16_t actual_bits = 0;
@@ -90,16 +89,16 @@ bool IRrecv::decodeLasertag(decode_results *results, uint16_t nbits,
// Data
for (; offset <= results->rawlen; actual_bits++) {
int16_t levelA = getRClevel(results, &offset, &used, LASERTAG_TICK,
LASERTAG_TOLERANCE, LASERTAG_EXCESS,
LASERTAG_DELTA);
int16_t levelB = getRClevel(results, &offset, &used, LASERTAG_TICK,
LASERTAG_TOLERANCE, LASERTAG_EXCESS,
LASERTAG_DELTA);
if (levelA == kSPACE && levelB == kMARK) {
int16_t levelA = getRClevel(results, &offset, &used, kLasertagTick,
kLasertagTolerance, kLasertagExcess,
kLasertagDelta);
int16_t levelB = getRClevel(results, &offset, &used, kLasertagTick,
kLasertagTolerance, kLasertagExcess,
kLasertagDelta);
if (levelA == kSpace && levelB == kMark) {
data = (data << 1) | 1; // 1
} else {
if (levelA == kMARK && levelB == kSPACE) {
if (levelA == kMark && levelB == kSpace) {
data <<= 1; // 0
} else {
break;
@@ -110,7 +109,7 @@ bool IRrecv::decodeLasertag(decode_results *results, uint16_t nbits,
// Compliance
if (actual_bits < nbits) return false; // Less data than we expected.
if (strict && actual_bits != LASERTAG_BITS) return false;
if (strict && actual_bits != kLasertagBits) return false;
// Success
results->decode_type = LASERTAG;

159
src/ir_Lutron.cpp Normal file
View File

@@ -0,0 +1,159 @@
// Copyright 2018 David Conran
#define __STDC_LIMIT_MACROS
#include <stdint.h>
#include <algorithm>
#include "IRrecv.h"
#include "IRsend.h"
#include "IRutils.h"
// LL UU UU TTTTTTT RRRRRR OOOOO NN NN
// LL UU UU TTT RR RR OO OO NNN NN
// LL UU UU TTT RRRRRR OO OO NN N NN
// LL UU UU TTT RR RR OO OO NN NNN
// LLLLLLL UUUUU TTT RR RR OOOO0 NN NN
// Notes:
// The Lutron protocol uses a sort of Run Length encoding to encode
// its data. There is no header or footer per-se.
// As a mark is the first data we will notice, we always assume the First
// bit of the technically 36-bit protocol is '1'. So it is assumed, and thus
// we only care about the 35 bits of data.
// Constants
// Ref:
// https://github.com/markszabo/IRremoteESP8266/issues/515
const uint16_t kLutronTick = 2288;
const uint32_t kLutronGap = 150000; // Completely made up value.
const uint16_t kLutronDelta = 400; // +/- 300 usecs.
#if SEND_LUTRON
// Send a Lutron formatted message.
//
// Args:
// data: The message to be sent.
// nbits: The number of bits of the message to be sent. Typically kLutronBits
// repeat: The number of times the command is to be repeated.
//
// Status: ALPHA / Untested.
// Notes:
// Protocol is really 36 bits long, but the first bit is always a 1.
// So, assume the 1 and only have a normal payload of 35 bits.
//
// Ref:
// https://github.com/markszabo/IRremoteESP8266/issues/515
void IRsend::sendLutron(uint64_t data, uint16_t nbits, uint16_t repeat) {
enableIROut(40000, 40); // 40Khz & 40% dutycycle.
for (uint16_t r = 0; r <= repeat; r++) {
mark(kLutronTick); // 1st bit is always '1'.
// Send the supplied data in MSB First order.
for (uint64_t mask = 1ULL << (nbits - 1); mask; mask >>= 1)
if (data & mask)
mark(kLutronTick); // Send a 1
else
space(kLutronTick); // Send a 0
space(kLutronGap); // Inter-message gap.
}
}
#endif // SEND_LUTRON
#if DECODE_LUTRON
// Decode the supplied Lutron message.
//
// Args:
// results: Ptr to the data to decode and where to store the decode result.
// nbits: The number of data bits to expect. Typically kLutronBits.
// strict: Flag indicating if we should perform strict matching.
// Returns:
// boolean: True if it can decode it, false if it can't.
//
// Status: ALPHA / Untested.
//
// Notes:
//
// Ref:
// https://github.com/markszabo/IRremoteESP8266/issues/515
bool IRrecv::decodeLutron(decode_results *results, uint16_t nbits,
bool strict) {
// Technically the smallest number of entries for the smallest message is '1'.
// i.e. All the bits set to 1, would produce a single huge mark signal.
// So no minimum length check is required.
if (strict && nbits != kLutronBits)
return false; // Not strictly an Lutron message.
uint64_t data = 0;
int16_t bitsSoFar = -1;
if (nbits > sizeof(data) * 8) return false; // To large to store the data.
for (uint16_t offset = kStartOffset;
bitsSoFar < nbits && offset < results->rawlen;
offset++) {
uint16_t entry = results->rawbuf[offset];
// It has to be large enough to qualify as a bit.
if (!matchAtLeast(entry, kLutronTick, 0, kLutronDelta)) {
DPRINTLN("Entry too small. Aborting.");
return false;
}
// Keep reading bits of the same value until we run out.
while (entry != 0 && matchAtLeast(entry, kLutronTick, 0, kLutronDelta)) {
bitsSoFar++;
DPRINT("Bit: ");
DPRINT(bitsSoFar);
if (offset % 2) { // Is Odd?
data = (data << 1) + 1; // Append a '1'.
DPRINTLN(" is a 1.");
} else { // Is it Even?
data <<= 1; // Append a '0'.
DPRINTLN(" is a 0.");
if (bitsSoFar == nbits && matchAtLeast(entry, kLutronGap))
break; // We've likely reached the end of a message.
}
// Remove a bit length from the current entry.
entry = std::max(entry, (uint16_t) (kLutronTick / kRawTick)) -
kLutronTick / kRawTick;
}
if (offset % 2 && !match(entry, kLutronDelta, 0, kLutronDelta)) {
DPRINT("offset = ");
DPRINTLN(offset);
DPRINT("rawlen = ");
DPRINTLN(results->rawlen);
DPRINT("entry = ");
DPRINTLN(entry);
DPRINTLN("Odd Entry has too much left over. Aborting.");
return false; // Too much left over to be a good value. Reject it.
}
if (offset % 2 == 0 && offset <= results->rawlen -1 &&
!matchAtLeast(entry, kLutronDelta, 0, kLutronDelta)) {
DPRINT("offset = ");
DPRINTLN(offset);
DPRINT("rawlen = ");
DPRINTLN(results->rawlen);
DPRINT("entry = ");
DPRINTLN(entry);
DPRINTLN("Entry has too much left over. Aborting.");
return false; // Too much left over to be a good value. Reject it.
}
}
// We got too many bits.
if (bitsSoFar > nbits || bitsSoFar < 0) {
DPRINTLN("Wrong number of bits found. Aborting.");
return false;
}
// If we got less bits than we were expecting, we need to pad with zeros
// until we get the correct number of bits.
if (bitsSoFar < nbits) data <<= (nbits - bitsSoFar);
// Success
DPRINTLN("Lutron Success!");
results->decode_type = LUTRON;
results->bits = bitsSoFar;
results->value = data ^ (1ULL << nbits); // Mask off the initial '1'.
results->address = 0;
results->command = 0;
return true;
}
#endif // DECODE_LUTRON

28
src/ir_Magiquest.cpp
View File

@@ -8,8 +8,8 @@
#include "IRsend.h"
#include "IRutils.h"
#define IS_ZERO(m, s) (((m) * 100 / ((m) + (s))) <= MAGIQUEST_ZERO_RATIO)
#define IS_ONE(m, s) (((m) * 100 / ((m) + (s))) >= MAGIQUEST_ONE_RATIO)
#define IS_ZERO(m, s) (((m) * 100 / ((m) + (s))) <= kMagiQuestZeroRatio)
#define IS_ONE(m, s) (((m) * 100 / ((m) + (s))) >= kMagiQuestOneRatio)
// Strips taken from:
// https://github.com/kitlaan/Arduino-IRremote/blob/master/ir_Magiquest.cpp
@@ -24,7 +24,7 @@
// Args:
// data: The contents of the message you want to send.
// nbits: The bit size of the message being sent.
// Typically MAGIQUEST_BITS.
// Typically kMagiquestBits.
// repeat: The number of times you want the message to be repeated.
//
// Status: Alpha / Should be working.
@@ -32,10 +32,10 @@
void IRsend::sendMagiQuest(uint64_t data, uint16_t nbits, uint16_t repeat) {
sendGeneric(0, 0, // No Headers - Technically it's included in the data.
// i.e. 8 zeros.
MAGIQUEST_MARK_ONE, MAGIQUEST_SPACE_ONE,
MAGIQUEST_MARK_ZERO, MAGIQUEST_SPACE_ZERO,
kMagiQuestMarkOne, kMagiQuestSpaceOne,
kMagiQuestMarkZero, kMagiQuestSpaceZero,
0, // No footer mark.
MAGIQUEST_GAP,
kMagiQuestGap,
data, nbits, 36, true, repeat, 50);
}
@@ -68,7 +68,7 @@ uint64_t IRsend::encodeMagiQuest(uint32_t wand_id, uint16_t magnitude) {
// Args:
// results: Ptr to the data to decode and where to store the decode result.
// nbits: Nr. of bits to expect in the data portion, inc. the 8 bit header.
// Typically MAGIQUEST_BITS.
// Typically kMagiquestBits.
// strict: Flag to indicate if we strictly adhere to the specification.
// Returns:
// boolean: True if it can decode it, false if it can't.
@@ -81,18 +81,18 @@ bool IRrecv::decodeMagiQuest(decode_results *results, uint16_t nbits,
bool strict) {
uint16_t bits = 0;
uint64_t data = 0;
uint16_t offset = OFFSET_START;
uint16_t offset = kStartOffset;
if (results->rawlen < (2 * MAGIQUEST_BITS)) {
if (results->rawlen < (2 * kMagiquestBits)) {
DPRINT("Not enough bits to be Magiquest - Rawlen: ");
DPRINT(results->rawlen);
DPRINT(" Expected: ");
DPRINTLN((2 * MAGIQUEST_BITS));
DPRINTLN((2 * kMagiquestBits));
return false;
}
// Compliance
if (strict && nbits != MAGIQUEST_BITS) return false;
if (strict && nbits != kMagiquestBits) return false;
// Of six wands as datapoints, so far they all start with 8 ZEROs.
// For example, here is the data from two wands
@@ -103,7 +103,7 @@ bool IRrecv::decodeMagiQuest(decode_results *results, uint16_t nbits,
while (offset + 1 < results->rawlen && bits < nbits - 1) {
uint16_t mark = results->rawbuf[offset];
uint16_t space = results->rawbuf[offset + 1];
if (!matchMark(mark + space, MAGIQUEST_TOTAL_USEC)) {
if (!matchMark(mark + space, kMagiQuestTotalUsec)) {
DPRINT("Not enough time to be Magiquest - Mark: ");
DPRINT(mark);
DPRINT(" Space: ");
@@ -111,7 +111,7 @@ bool IRrecv::decodeMagiQuest(decode_results *results, uint16_t nbits,
DPRINT(" Total: ");
DPRINT(mark+space);
DPRINT("Expected: ");
DPRINTLN(MAGIQUEST_TOTAL_USEC);
DPRINTLN(kMagiQuestTotalUsec);
return false;
}
@@ -132,7 +132,7 @@ bool IRrecv::decodeMagiQuest(decode_results *results, uint16_t nbits,
// Grab the last MARK bit, assuming a good SPACE after it
if (offset < results->rawlen) {
uint16_t mark = results->rawbuf[offset];
uint16_t space = (MAGIQUEST_TOTAL_USEC / RAWTICK) - mark;
uint16_t space = (kMagiQuestTotalUsec / kRawTick) - mark;
if (IS_ZERO(mark, space)) data = (data << 1) | 0;
else if (IS_ONE( mark, space)) data = (data << 1) | 1;

18
src/ir_Magiquest.h
View File

@@ -24,14 +24,12 @@ union magiquest {
} cmd;
};
#define MAGIQUEST_TOTAL_USEC 1150U
#define MAGIQUEST_ZERO_RATIO 30U // usually <= ~25%
#define MAGIQUEST_ONE_RATIO 38U // usually >= ~50%
#define MAGIQUEST_PERIOD 1150U
#define MAGIQUEST_MARK_ZERO 280U
#define MAGIQUEST_SPACE_ZERO 850U
#define MAGIQUEST_MARK_ONE 580U
#define MAGIQUEST_SPACE_ONE 600U
#define MAGIQUEST_GAP 100000UL // A guess of the gap between messages
const uint16_t kMagiQuestTotalUsec = 1150;
const uint8_t kMagiQuestZeroRatio = 30; // usually <= ~25%
const uint8_t kMagiQuestOneRatio = 38; // usually >= ~50%
const uint16_t kMagiQuestMarkZero = 280;
const uint16_t kMagiQuestSpaceZero = 850;
const uint16_t kMagiQuestMarkOne = 580;
const uint16_t kMagiQuestSpaceOne = 600;
const uint32_t kMagiQuestGap = 100000; // A guess of the gap between messages
#endif // IR_MAGIQUEST_H_

163
src/ir_Midea.cpp
View File

@@ -26,28 +26,28 @@
// https://docs.google.com/spreadsheets/d/1TZh4jWrx4h9zzpYUI9aYXMl1fYOiqu-xVuOOMqagxrs/edit?usp=sharing
// Constants
#define MIDEA_TICK 80U
#define MIDEA_BIT_MARK_TICKS 7U
#define MIDEA_BIT_MARK (MIDEA_BIT_MARK_TICKS * MIDEA_TICK)
#define MIDEA_ONE_SPACE_TICKS 21U
#define MIDEA_ONE_SPACE (MIDEA_ONE_SPACE_TICKS * MIDEA_TICK)
#define MIDEA_ZERO_SPACE_TICKS 7U
#define MIDEA_ZERO_SPACE (MIDEA_ZERO_SPACE_TICKS * MIDEA_TICK)
#define MIDEA_HDR_MARK_TICKS 56U
#define MIDEA_HDR_MARK (MIDEA_HDR_MARK_TICKS * MIDEA_TICK)
#define MIDEA_HDR_SPACE_TICKS 56U
#define MIDEA_HDR_SPACE (MIDEA_HDR_SPACE_TICKS * MIDEA_TICK)
#define MIDEA_MIN_GAP_TICKS (MIDEA_HDR_MARK_TICKS + MIDEA_ZERO_SPACE_TICKS \
+ MIDEA_BIT_MARK_TICKS)
#define MIDEA_MIN_GAP (MIDEA_MIN_GAP_TICKS * MIDEA_TICK)
#define MIDEA_TOLERANCE 30U // Percent
const uint16_t kMideaTick = 80;
const uint16_t kMideaBitMarkTicks = 7;
const uint16_t kMideaBitMark = kMideaBitMarkTicks * kMideaTick;
const uint16_t kMideaOneSpaceTicks = 21;
const uint16_t kMideaOneSpace = kMideaOneSpaceTicks * kMideaTick;
const uint16_t kMideaZeroSpaceTicks = 7;
const uint16_t kMideaZeroSpace = kMideaZeroSpaceTicks * kMideaTick;
const uint16_t kMideaHdrMarkTicks = 56;
const uint16_t kMideaHdrMark = kMideaHdrMarkTicks * kMideaTick;
const uint16_t kMideaHdrSpaceTicks = 56;
const uint16_t kMideaHdrSpace = kMideaHdrSpaceTicks * kMideaTick;
const uint16_t kMideaMinGapTicks = kMideaHdrMarkTicks + kMideaZeroSpaceTicks +
kMideaBitMarkTicks;
const uint16_t kMideaMinGap = kMideaMinGapTicks * kMideaTick;
const uint8_t kMideaTolerance = 30; // Percent
#if SEND_MIDEA
// Send a Midea message
//
// Args:
// data: Contents of the message to be sent.
// nbits: Nr. of bits of data to be sent. Typically MIDEA_BITS.
// nbits: Nr. of bits of data to be sent. Typically kMideaBits.
// repeat: Nr. of additional times the message is to be sent.
//
// Status: Alpha / Needs testing against a real device.
@@ -64,21 +64,21 @@ void IRsend::sendMidea(uint64_t data, uint16_t nbits, uint16_t repeat) {
// inverted payload.
for (size_t inner_loop = 0; inner_loop < 2; inner_loop++) {
// Header
mark(MIDEA_HDR_MARK);
space(MIDEA_HDR_SPACE);
mark(kMideaHdrMark);
space(kMideaHdrSpace);
// Data
// Break data into byte segments, starting at the Most Significant
// Byte. Each byte then being sent normal, then followed inverted.
for (uint16_t i = 8; i <= nbits; i += 8) {
// Grab a bytes worth of data.
uint8_t segment = (data >> (nbits - i)) & 0xFF;
sendData(MIDEA_BIT_MARK, MIDEA_ONE_SPACE,
MIDEA_BIT_MARK, MIDEA_ZERO_SPACE,
sendData(kMideaBitMark, kMideaOneSpace,
kMideaBitMark, kMideaZeroSpace,
segment, 8, true);
}
// Footer
mark(MIDEA_BIT_MARK);
space(MIDEA_MIN_GAP); // Pause before repeating
mark(kMideaBitMark);
space(kMideaMinGap); // Pause before repeating
// Invert the data for the 2nd phase of the message.
// As we get called twice in the inner loop, we will always revert
@@ -119,22 +119,22 @@ void IRMideaAC::send() {
// Return a pointer to the internal state date of the remote.
uint64_t IRMideaAC::getRaw() {
checksum();
return remote_state & MIDEA_AC_STATE_MASK;
return remote_state & kMideaACStateMask;
}
// Override the internal state with the new state.
void IRMideaAC::setRaw(uint64_t newState) {
remote_state = newState & MIDEA_AC_STATE_MASK;
remote_state = newState & kMideaACStateMask;
}
// Set the requested power state of the A/C to off.
void IRMideaAC::on() {
remote_state |= MIDEA_AC_POWER;
remote_state |= kMideaACPower;
}
// Set the requested power state of the A/C to off.
void IRMideaAC::off() {
remote_state &= (MIDEA_AC_STATE_MASK ^ MIDEA_AC_POWER);
remote_state &= (kMideaACStateMask ^ kMideaACPower);
}
// Set the requested power state of the A/C.
@@ -147,34 +147,34 @@ void IRMideaAC::setPower(const bool state) {
// Return the requested power state of the A/C.
bool IRMideaAC::getPower() {
return (remote_state & MIDEA_AC_POWER);
return (remote_state & kMideaACPower);
}
// Set the temperature.
// Args:
// temp: Temp. in degrees.
// useCelsius: Degree type to use. celsius (true) or fahrenheit (false)
// useCelsius: Degree type to use. Celsius (true) or Fahrenheit (false)
void IRMideaAC::setTemp(const uint8_t temp, const bool useCelsius) {
uint8_t new_temp = temp;
if (useCelsius) {
new_temp = std::max((uint8_t) MIDEA_AC_MIN_TEMP_C, new_temp);
new_temp = std::min((uint8_t) MIDEA_AC_MAX_TEMP_C, new_temp);
new_temp = std::max(kMideaACMinTempC, new_temp);
new_temp = std::min(kMideaACMaxTempC, new_temp);
new_temp = (uint8_t) ((new_temp * 1.8) + 32.5); // 0.5 so we rounding.
}
new_temp = std::max((uint8_t) MIDEA_AC_MIN_TEMP_F, new_temp);
new_temp = std::min((uint8_t) MIDEA_AC_MAX_TEMP_F, new_temp);
new_temp -= MIDEA_AC_MIN_TEMP_F;
remote_state &= MIDEA_AC_TEMP_MASK;
new_temp = std::max(kMideaACMinTempF, new_temp);
new_temp = std::min(kMideaACMaxTempF, new_temp);
new_temp -= kMideaACMinTempF;
remote_state &= kMideaACTempMask;
remote_state |= ((uint64_t) new_temp << 24);
}
// Return the set temp.
// Args:
// useCelsius: Flag indicating if the results are in celsius or fahrenheit.
// useCelsius: Flag indicating if the results are in Celsius or Fahrenheit.
// Returns:
// A uint8_t containing the temperature.
uint8_t IRMideaAC::getTemp(const bool useCelsius) {
uint8_t temp = ((remote_state >> 24) & 0x1F) + MIDEA_AC_MIN_TEMP_F;
uint8_t temp = ((remote_state >> 24) & 0x1F) + kMideaACMinTempF;
if (useCelsius) {
temp = (uint8_t) ((temp - 32) / 1.8);
}
@@ -186,15 +186,15 @@ uint8_t IRMideaAC::getTemp(const bool useCelsius) {
void IRMideaAC::setFan(const uint8_t fan) {
uint64_t new_fan;
switch (fan) {
case MIDEA_AC_FAN_LOW:
case MIDEA_AC_FAN_MED:
case MIDEA_AC_FAN_HI:
case kMideaACFanLow:
case kMideaACFanMed:
case kMideaACFanHigh:
new_fan = fan;
break;
default:
new_fan = MIDEA_AC_FAN_AUTO;
new_fan = kMideaACFanAuto;
}
remote_state &= MIDEA_AC_FAN_MASK;
remote_state &= kMideaACFanMask;
remote_state |= (new_fan << 35);
}
@@ -215,31 +215,31 @@ void IRMideaAC::setMode(const uint8_t mode) {
// If we get an unexpected mode, default to AUTO.
uint64_t new_mode;
switch (mode) {
case MIDEA_AC_AUTO:
case MIDEA_AC_COOL:
case MIDEA_AC_HEAT:
case MIDEA_AC_DRY:
case MIDEA_AC_FAN:
case kMideaACAuto:
case kMideaACCool:
case kMideaACHeat:
case kMideaACDry:
case kMideaACFan:
new_mode = mode;
break;
default:
new_mode = MIDEA_AC_AUTO;
new_mode = kMideaACAuto;
}
remote_state &= MIDEA_AC_MODE_MASK;
remote_state &= kMideaACModeMask;
remote_state |= (new_mode << 32);
}
// Set the Sleep state of the A/C.
void IRMideaAC::setSleep(const bool state) {
if (state)
remote_state |= MIDEA_AC_SLEEP;
remote_state |= kMideaACSleep;
else
remote_state &= (MIDEA_AC_STATE_MASK ^ MIDEA_AC_SLEEP);
remote_state &= (kMideaACStateMask ^ kMideaACSleep);
}
// Return the Sleep state of the A/C.
bool IRMideaAC::getSleep() {
return (remote_state & MIDEA_AC_SLEEP);
return (remote_state & kMideaACSleep);
}
// Calculate the checksum for a given array.
@@ -271,7 +271,7 @@ bool IRMideaAC::validChecksum(const uint64_t state) {
// Calculate & set the checksum for the current internal state of the remote.
void IRMideaAC::checksum() {
// Stored the checksum value in the last byte.
remote_state &= MIDEA_AC_CHECKSUM_MASK;
remote_state &= kMideaACChecksumMask;
remote_state |= calcChecksum(remote_state);
}
@@ -290,19 +290,19 @@ std::string IRMideaAC::toString() {
result += "Off";
result += ", Mode: " + uint64ToString(getMode());
switch (getMode()) {
case MIDEA_AC_AUTO:
case kMideaACAuto:
result += " (AUTO)";
break;
case MIDEA_AC_COOL:
case kMideaACCool:
result += " (COOL)";
break;
case MIDEA_AC_HEAT:
case kMideaACHeat:
result += " (HEAT)";
break;
case MIDEA_AC_DRY:
case kMideaACDry:
result += " (DRY)";
break;
case MIDEA_AC_FAN:
case kMideaACFan:
result += " (FAN)";
break;
default:
@@ -312,16 +312,16 @@ std::string IRMideaAC::toString() {
uint64ToString(getTemp(false)) + "F";
result += ", Fan: " + uint64ToString(getFan());
switch (getFan()) {
case MIDEA_AC_FAN_AUTO:
case kMideaACFanAuto:
result += " (AUTO)";
break;
case MIDEA_AC_FAN_LOW:
case kMideaACFanLow:
result += " (LOW)";
break;
case MIDEA_AC_FAN_MED:
case kMideaACFanMed:
result += " (MED)";
break;
case MIDEA_AC_FAN_HI:
case kMideaACFanHigh:
result += " (HI)";
break;
}
@@ -338,7 +338,7 @@ std::string IRMideaAC::toString() {
//
// Args:
// results: Ptr to the data to decode and where to store the decode result.
// nbits: The number of data bits to expect. Typically MIDEA_BITS.
// nbits: The number of data bits to expect. Typically kMideaBits.
// strict: Flag indicating if we should perform strict matching.
// Returns:
// boolean: True if it can decode it, false if it can't.
@@ -352,41 +352,42 @@ bool IRrecv::decodeMidea(decode_results *results, uint16_t nbits,
uint8_t min_nr_of_messages = 1;
if (strict) {
if (nbits != MIDEA_BITS)
if (nbits != kMideaBits)
return false; // Not strictly a MIDEA message.
min_nr_of_messages = 2;
}
// The protocol sends the data normal + inverted, alternating on
// each byte. Hence twice the number of expected data bits.
if (results->rawlen < min_nr_of_messages * (2 * nbits + HEADER + FOOTER) - 1)
if (results->rawlen < min_nr_of_messages * (2 * nbits +
kHeader + kFooter) - 1)
return false; // Can't possibly be a valid MIDEA message.
uint64_t data = 0;
uint64_t inverted = 0;
uint16_t offset = OFFSET_START;
uint16_t offset = kStartOffset;
if (nbits > sizeof(data) * 8)
return false; // We can't possibly capture a Midea packet that big.
for (uint8_t i = 0; i < min_nr_of_messages; i++) {
// Header
if (!matchMark(results->rawbuf[offset], MIDEA_HDR_MARK)) return false;
if (!matchMark(results->rawbuf[offset], kMideaHdrMark)) return false;
// Calculate how long the common tick time is based on the header mark.
uint32_t m_tick = results->rawbuf[offset++] * RAWTICK /
MIDEA_HDR_MARK_TICKS;
if (!matchSpace(results->rawbuf[offset], MIDEA_HDR_SPACE)) return false;
uint32_t m_tick = results->rawbuf[offset++] * kRawTick /
kMideaHdrMarkTicks;
if (!matchSpace(results->rawbuf[offset], kMideaHdrSpace)) return false;
// Calculate how long the common tick time is based on the header space.
uint32_t s_tick = results->rawbuf[offset++] * RAWTICK /
MIDEA_HDR_SPACE_TICKS;
uint32_t s_tick = results->rawbuf[offset++] * kRawTick /
kMideaHdrSpaceTicks;
// Data (Normal)
match_result_t data_result = matchData(&(results->rawbuf[offset]), nbits,
MIDEA_BIT_MARK_TICKS * m_tick,
MIDEA_ONE_SPACE_TICKS * s_tick,
MIDEA_BIT_MARK_TICKS * m_tick,
MIDEA_ZERO_SPACE_TICKS * s_tick,
MIDEA_TOLERANCE);
kMideaBitMarkTicks * m_tick,
kMideaOneSpaceTicks * s_tick,
kMideaBitMarkTicks * m_tick,
kMideaZeroSpaceTicks * s_tick,
kMideaTolerance);
if (data_result.success == false) return false;
offset += data_result.used;
if (i % 2 == 0)
@@ -395,12 +396,12 @@ bool IRrecv::decodeMidea(decode_results *results, uint16_t nbits,
inverted = data_result.data;
// Footer
if (!matchMark(results->rawbuf[offset++], MIDEA_BIT_MARK_TICKS * m_tick,
MIDEA_TOLERANCE))
if (!matchMark(results->rawbuf[offset++], kMideaBitMarkTicks * m_tick,
kMideaTolerance))
return false;
if (offset < results->rawlen &&
!matchAtLeast(results->rawbuf[offset++], MIDEA_MIN_GAP_TICKS * s_tick,
MIDEA_TOLERANCE))
!matchAtLeast(results->rawbuf[offset++], kMideaMinGapTicks * s_tick,
kMideaTolerance))
return false;
}
@@ -410,7 +411,7 @@ bool IRrecv::decodeMidea(decode_results *results, uint16_t nbits,
// Protocol requires a second message with all the data bits inverted.
// We should have checked we got a second message in the previous loop.
// Just need to check it's value is an inverted copy of the first message.
uint64_t mask = (1ULL << MIDEA_BITS) - 1;
uint64_t mask = (1ULL << kMideaBits) - 1;
if ((data & mask) != ((inverted ^ mask) & mask)) return false;
if (!IRMideaAC::validChecksum(data)) return false;
}

57
src/ir_Midea.h
View File

@@ -23,26 +23,43 @@
// https://docs.google.com/spreadsheets/d/1TZh4jWrx4h9zzpYUI9aYXMl1fYOiqu-xVuOOMqagxrs/edit?usp=sharing
// Constants
#define MIDEA_AC_COOL 0U // 0b000
#define MIDEA_AC_DRY 1U // 0b001
#define MIDEA_AC_AUTO 2U // 0b010
#define MIDEA_AC_HEAT 3U // 0b011
#define MIDEA_AC_FAN 4U // 0b100
#define MIDEA_AC_POWER 1ULL << 39
#define MIDEA_AC_SLEEP 1ULL << 38
#define MIDEA_AC_FAN_AUTO 0U // 0b000
#define MIDEA_AC_FAN_LOW 1U // 0b001
#define MIDEA_AC_FAN_MED 2U // 0b010
#define MIDEA_AC_FAN_HI 3U // 0b011
#define MIDEA_AC_MIN_TEMP_F 62U // 62F
#define MIDEA_AC_MAX_TEMP_F 86U // 86F
#define MIDEA_AC_MIN_TEMP_C 16U // 16C
#define MIDEA_AC_MAX_TEMP_C 30U // 30C
#define MIDEA_AC_STATE_MASK 0x0000FFFFFFFFFFFFULL
#define MIDEA_AC_TEMP_MASK 0x0000FFFFE0FFFFFFULL
#define MIDEA_AC_FAN_MASK 0x0000FFC7FFFFFFFFULL
#define MIDEA_AC_MODE_MASK 0x0000FFF8FFFFFFFFULL
#define MIDEA_AC_CHECKSUM_MASK 0x0000FFFFFFFFFF00ULL
const uint8_t kMideaACCool = 0; // 0b000
const uint8_t kMideaACDry = 1; // 0b001
const uint8_t kMideaACAuto = 2; // 0b010
const uint8_t kMideaACHeat = 3; // 0b011
const uint8_t kMideaACFan = 4; // 0b100
const uint8_t kMideaACFanAuto = 0; // 0b000
const uint8_t kMideaACFanLow = 1; // 0b001
const uint8_t kMideaACFanMed = 2; // 0b010
const uint8_t kMideaACFanHigh = 3; // 0b011
const uint64_t kMideaACPower = 1ULL << 39;
const uint64_t kMideaACSleep = 1ULL << 38;
const uint8_t kMideaACMinTempF = 62; // Fahrenheit
const uint8_t kMideaACMaxTempF = 86; // Fahrenheit
const uint8_t kMideaACMinTempC = 16; // Celsius
const uint8_t kMideaACMaxTempC = 30; // Celsius
const uint64_t kMideaACStateMask = 0x0000FFFFFFFFFFFF;
const uint64_t kMideaACTempMask = 0x0000FFFFE0FFFFFF;
const uint64_t kMideaACFanMask = 0x0000FFC7FFFFFFFF;
const uint64_t kMideaACModeMask = 0x0000FFF8FFFFFFFF;
const uint64_t kMideaACChecksumMask = 0x0000FFFFFFFFFF00;
// Legacy defines. (Deprecated)
#define MIDEA_AC_COOL kMideaACCool
#define MIDEA_AC_DRY kMideaACDry
#define MIDEA_AC_AUTO kMideaACAuto
#define MIDEA_AC_HEAT kMideaACHeat
#define MIDEA_AC_FAN kMideaACFan
#define MIDEA_AC_FAN_AUTO kMideaACFanAuto
#define MIDEA_AC_FAN_LOW kMideaACFanLow
#define MIDEA_AC_FAN_MED kMideaACFanMed
#define MIDEA_AC_FAN_HI kMideaACFanHigh
#define MIDEA_AC_POWER kMideaACPower
#define MIDEA_AC_SLEEP kMideaACSleep
#define MIDEA_AC_MIN_TEMP_F kMideaACMinTempF
#define MIDEA_AC_MAX_TEMP_F kMideaACMaxTempF
#define MIDEA_AC_MIN_TEMP_C kMideaACMinTempC
#define MIDEA_AC_MAX_TEMP_C kMideaACMaxTempC
class IRMideaAC {
public:

490
src/ir_Mitsubishi.cpp
View File

@@ -1,8 +1,12 @@
// Copyright 2009 Ken Shirriff
// Copyright 2017 David Conran
// Copyright 2017-2018 David Conran
// Copyright 2018 Denes Varga
#include "ir_Mitsubishi.h"
#include <algorithm>
#ifndef ARDUINO
#include <string>
#endif
#include "IRrecv.h"
#include "IRsend.h"
#include "IRutils.h"
@@ -22,50 +26,49 @@
// Ref:
// GlobalCache's Control Tower's Mitsubishi TV data.
// https://github.com/marcosamarinho/IRremoteESP8266/blob/master/ir_Mitsubishi.cpp
#define MITSUBISHI_TICK 30U
#define MITSUBISHI_BIT_MARK_TICKS 10U
#define MITSUBISHI_BIT_MARK (MITSUBISHI_BIT_MARK_TICKS * \
MITSUBISHI_TICK)
#define MITSUBISHI_ONE_SPACE_TICKS 70U
#define MITSUBISHI_ONE_SPACE (MITSUBISHI_ONE_SPACE_TICKS * \
MITSUBISHI_TICK)
#define MITSUBISHI_ZERO_SPACE_TICKS 30U
#define MITSUBISHI_ZERO_SPACE (MITSUBISHI_ZERO_SPACE_TICKS * \
MITSUBISHI_TICK)
#define MITSUBISHI_MIN_COMMAND_LENGTH_TICKS 1786U
#define MITSUBISHI_MIN_COMMAND_LENGTH (MITSUBISHI_MIN_COMMAND_LENGTH_TICKS * \
MITSUBISHI_TICK)
#define MITSUBISHI_MIN_GAP_TICKS 936U
#define MITSUBISHI_MIN_GAP (MITSUBISHI_MIN_GAP_TICKS * \
MITSUBISHI_TICK)
const uint16_t kMitsubishiTick = 30;
const uint16_t kMitsubishiBitMarkTicks = 10;
const uint16_t kMitsubishiBitMark = kMitsubishiBitMarkTicks * kMitsubishiTick;
const uint16_t kMitsubishiOneSpaceTicks = 70;
const uint16_t kMitsubishiOneSpace = kMitsubishiOneSpaceTicks * kMitsubishiTick;
const uint16_t kMitsubishiZeroSpaceTicks = 30;
const uint16_t kMitsubishiZeroSpace =
kMitsubishiZeroSpaceTicks * kMitsubishiTick;
const uint16_t kMitsubishiMinCommandLengthTicks = 1786;
const uint16_t kMitsubishiMinCommandLength =
kMitsubishiMinCommandLengthTicks * kMitsubishiTick;
const uint16_t kMitsubishiMinGapTicks = 936;
const uint16_t kMitsubishiMinGap = kMitsubishiMinGapTicks * kMitsubishiTick;
// Mitsubishi Projector (HC3000)
// Ref:
// https://github.com/markszabo/IRremoteESP8266/issues/441
#define MITSUBISHI2_HDR_MARK 8400U
#define MITSUBISHI2_HDR_SPACE (MITSUBISHI2_HDR_MARK / 2)
#define MITSUBISHI2_BIT_MARK 560U
#define MITSUBISHI2_ZERO_SPACE 520U
#define MITSUBISHI2_ONE_SPACE (MITSUBISHI2_ZERO_SPACE * 3)
#define MITSUBISHI2_MIN_GAP 28500U
const uint16_t kMitsubishi2HdrMark = 8400;
const uint16_t kMitsubishi2HdrSpace = kMitsubishi2HdrMark / 2;
const uint16_t kMitsubishi2BitMark = 560;
const uint16_t kMitsubishi2ZeroSpace = 520;
const uint16_t kMitsubishi2OneSpace = kMitsubishi2ZeroSpace * 3;
const uint16_t kMitsubishi2MinGap = 28500;
// Mitsubishi A/C
// Ref:
// https://github.com/r45635/HVAC-IR-Control/blob/master/HVAC_ESP8266/HVAC_ESP8266.ino#L84
#define MITSUBISHI_AC_HDR_MARK 3400U
#define MITSUBISHI_AC_HDR_SPACE 1750U
#define MITSUBISHI_AC_BIT_MARK 450U
#define MITSUBISHI_AC_ONE_SPACE 1300U
#define MITSUBISHI_AC_ZERO_SPACE 420U
#define MITSUBISHI_AC_RPT_MARK 440U
#define MITSUBISHI_AC_RPT_SPACE 17100UL
const uint16_t kMitsubishiAcHdrMark = 3400;
const uint16_t kMitsubishiAcHdrSpace = 1750;
const uint16_t kMitsubishiAcBitMark = 450;
const uint16_t kMitsubishiAcOneSpace = 1300;
const uint16_t kMitsubishiAcZeroSpace = 420;
const uint16_t kMitsubishiAcRptMark = 440;
const uint16_t kMitsubishiAcRptSpace = 17100;
#if SEND_MITSUBISHI
// Send a Mitsubishi message
//
// Args:
// data: Contents of the message to be sent.
// nbits: Nr. of bits of data to be sent. Typically MITSUBISHI_BITS.
// nbits: Nr. of bits of data to be sent. Typically kMitsubishiBits.
// repeat: Nr. of additional times the message is to be sent.
//
// Status: ALPHA / untested.
@@ -77,10 +80,10 @@
// GlobalCache's Control Tower's Mitsubishi TV data.
void IRsend::sendMitsubishi(uint64_t data, uint16_t nbits, uint16_t repeat) {
sendGeneric(0, 0, // No Header
MITSUBISHI_BIT_MARK, MITSUBISHI_ONE_SPACE,
MITSUBISHI_BIT_MARK, MITSUBISHI_ZERO_SPACE,
MITSUBISHI_BIT_MARK, MITSUBISHI_MIN_GAP,
MITSUBISHI_MIN_COMMAND_LENGTH,
kMitsubishiBitMark, kMitsubishiOneSpace,
kMitsubishiBitMark, kMitsubishiZeroSpace,
kMitsubishiBitMark, kMitsubishiMinGap,
kMitsubishiMinCommandLength,
data, nbits, 33, true, repeat, 50);
}
#endif // SEND_MITSUBISHI
@@ -104,37 +107,38 @@ void IRsend::sendMitsubishi(uint64_t data, uint16_t nbits, uint16_t repeat) {
// GlobalCache's Control Tower's Mitsubishi TV data.
bool IRrecv::decodeMitsubishi(decode_results *results, uint16_t nbits,
bool strict) {
if (results->rawlen < 2 * nbits + FOOTER - 1)
if (results->rawlen < 2 * nbits + kFooter - 1)
return false; // Shorter than shortest possibly expected.
if (strict && nbits != MITSUBISHI_BITS)
if (strict && nbits != kMitsubishiBits)
return false; // Request is out of spec.
uint16_t offset = OFFSET_START;
uint16_t offset = kStartOffset;
uint64_t data = 0;
// No Header
// But try to auto-calibrate off the initial mark signal.
if (!matchMark(results->rawbuf[offset], MITSUBISHI_BIT_MARK, 30))
if (!matchMark(results->rawbuf[offset], kMitsubishiBitMark, 30))
return false;
// Calculate how long the common tick time is based on the initial mark.
uint32_t tick = results->rawbuf[offset] * RAWTICK / MITSUBISHI_BIT_MARK_TICKS;
uint32_t tick = results->rawbuf[offset] *
kRawTick / kMitsubishiBitMarkTicks;
// Data
match_result_t data_result = matchData(&(results->rawbuf[offset]), nbits,
MITSUBISHI_BIT_MARK_TICKS * tick,
MITSUBISHI_ONE_SPACE_TICKS * tick,
MITSUBISHI_BIT_MARK_TICKS * tick,
MITSUBISHI_ZERO_SPACE_TICKS * tick);
kMitsubishiBitMarkTicks * tick,
kMitsubishiOneSpaceTicks * tick,
kMitsubishiBitMarkTicks * tick,
kMitsubishiZeroSpaceTicks * tick);
if (data_result.success == false) return false;
data = data_result.data;
offset += data_result.used;
uint16_t actualBits = data_result.used / 2;
// Footer
if (!matchMark(results->rawbuf[offset++], MITSUBISHI_BIT_MARK_TICKS * tick,
if (!matchMark(results->rawbuf[offset++], kMitsubishiBitMarkTicks * tick,
30)) return false;
if (offset < results->rawlen &&
!matchAtLeast(results->rawbuf[offset], MITSUBISHI_MIN_GAP_TICKS * tick))
!matchAtLeast(results->rawbuf[offset], kMitsubishiMinGapTicks * tick))
return false;
// Compliance
@@ -158,7 +162,7 @@ bool IRrecv::decodeMitsubishi(decode_results *results, uint16_t nbits,
//
// Args:
// data: Contents of the message to be sent.
// nbits: Nr. of bits of data to be sent. Typically MITSUBISHI_BITS.
// nbits: Nr. of bits of data to be sent. Typically kMitsubishiBits.
// repeat: Nr. of additional times the message is to be sent.
//
// Status: ALPHA / untested.
@@ -175,16 +179,16 @@ bool IRrecv::decodeMitsubishi(decode_results *results, uint16_t nbits,
void IRsend::sendMitsubishi2(uint64_t data, uint16_t nbits, uint16_t repeat) {
for (uint16_t i = 0; i <= repeat; i++) {
// First half of the data.
sendGeneric(MITSUBISHI2_HDR_MARK, MITSUBISHI2_HDR_SPACE,
MITSUBISHI2_BIT_MARK, MITSUBISHI2_ONE_SPACE,
MITSUBISHI2_BIT_MARK, MITSUBISHI2_ZERO_SPACE,
MITSUBISHI2_BIT_MARK, MITSUBISHI2_HDR_SPACE,
sendGeneric(kMitsubishi2HdrMark, kMitsubishi2HdrSpace,
kMitsubishi2BitMark, kMitsubishi2OneSpace,
kMitsubishi2BitMark, kMitsubishi2ZeroSpace,
kMitsubishi2BitMark, kMitsubishi2HdrSpace,
data >> (nbits / 2), nbits / 2, 33, true, 0, 50);
// Second half of the data.
sendGeneric(0, 0, // No header for the second data block
MITSUBISHI2_BIT_MARK, MITSUBISHI2_ONE_SPACE,
MITSUBISHI2_BIT_MARK, MITSUBISHI2_ZERO_SPACE,
MITSUBISHI2_BIT_MARK, MITSUBISHI2_MIN_GAP,
kMitsubishi2BitMark, kMitsubishi2OneSpace,
kMitsubishi2BitMark, kMitsubishi2ZeroSpace,
kMitsubishi2BitMark, kMitsubishi2MinGap,
data & ((1 << (nbits / 2)) - 1), nbits / 2, 33, true, 0, 50);
}
}
@@ -210,28 +214,28 @@ void IRsend::sendMitsubishi2(uint64_t data, uint16_t nbits, uint16_t repeat) {
// https://github.com/markszabo/IRremoteESP8266/issues/441
bool IRrecv::decodeMitsubishi2(decode_results *results, uint16_t nbits,
bool strict) {
if (results->rawlen < 2 * nbits + HEADER + (FOOTER * 2) - 1)
if (results->rawlen < 2 * nbits + kHeader + (kFooter * 2) - 1)
return false; // Shorter than shortest possibly expected.
if (strict && nbits != MITSUBISHI_BITS)
if (strict && nbits != kMitsubishiBits)
return false; // Request is out of spec.
uint16_t offset = OFFSET_START;
uint16_t offset = kStartOffset;
uint64_t data = 0;
uint16_t actualBits = 0;
// Header
if (!matchMark(results->rawbuf[offset++], MITSUBISHI2_HDR_MARK))
if (!matchMark(results->rawbuf[offset++], kMitsubishi2HdrMark))
return false;
if (!matchSpace(results->rawbuf[offset++], MITSUBISHI2_HDR_SPACE))
if (!matchSpace(results->rawbuf[offset++], kMitsubishi2HdrSpace))
return false;
for (uint8_t i = 1; i <= 2; i++) {
// Data
match_result_t data_result = matchData(&(results->rawbuf[offset]),
nbits / 2,
MITSUBISHI2_BIT_MARK,
MITSUBISHI2_ONE_SPACE,
MITSUBISHI2_BIT_MARK,
MITSUBISHI2_ZERO_SPACE);
kMitsubishi2BitMark,
kMitsubishi2OneSpace,
kMitsubishi2BitMark,
kMitsubishi2ZeroSpace);
if (data_result.success == false) return false;
data <<= nbits / 2;
data += data_result.data;
@@ -239,14 +243,14 @@ bool IRrecv::decodeMitsubishi2(decode_results *results, uint16_t nbits,
actualBits += data_result.used / 2;
// Footer
if (!matchMark(results->rawbuf[offset++], MITSUBISHI2_BIT_MARK))
if (!matchMark(results->rawbuf[offset++], kMitsubishi2BitMark))
return false;
if (i % 2) { // Every odd data block, we expect a HDR space.
if (!matchSpace(results->rawbuf[offset++], MITSUBISHI2_HDR_SPACE))
if (!matchSpace(results->rawbuf[offset++], kMitsubishi2HdrSpace))
return false;
} else { // Every even data block, we expect Min Gap or end of the message.
if (offset < results->rawlen &&
!matchAtLeast(results->rawbuf[offset++], MITSUBISHI2_MIN_GAP))
!matchAtLeast(results->rawbuf[offset++], kMitsubishi2MinGap))
return false;
}
}
@@ -273,25 +277,154 @@ bool IRrecv::decodeMitsubishi2(decode_results *results, uint16_t nbits,
//
// Args:
// data: An array of bytes containing the IR command.
// nbytes: Nr. of bytes of data in the array. (>=MITSUBISHI_AC_STATE_LENGTH)
// nbytes: Nr. of bytes of data in the array. (>=kMitsubishiACStateLength)
// repeat: Nr. of times the message is to be repeated.
// (Default = MITSUBISHI_AC_MIN_REPEAT).
// (Default = kMitsubishiACMinRepeat).
//
// Status: BETA / Appears to be working.
//
void IRsend::sendMitsubishiAC(unsigned char data[], uint16_t nbytes,
uint16_t repeat) {
if (nbytes < MITSUBISHI_AC_STATE_LENGTH)
if (nbytes < kMitsubishiACStateLength)
return; // Not enough bytes to send a proper message.
sendGeneric(MITSUBISHI_AC_HDR_MARK, MITSUBISHI_AC_HDR_SPACE,
MITSUBISHI_AC_BIT_MARK, MITSUBISHI_AC_ONE_SPACE,
MITSUBISHI_AC_BIT_MARK, MITSUBISHI_AC_ZERO_SPACE,
MITSUBISHI_AC_RPT_MARK, MITSUBISHI_AC_RPT_SPACE,
sendGeneric(kMitsubishiAcHdrMark, kMitsubishiAcHdrSpace,
kMitsubishiAcBitMark, kMitsubishiAcOneSpace,
kMitsubishiAcBitMark, kMitsubishiAcZeroSpace,
kMitsubishiAcRptMark, kMitsubishiAcRptSpace,
data, nbytes, 38, false, repeat, 50);
}
#endif // SEND_MITSUBISHI_AC
#if DECODE_MITSUBISHI_AC
// Decode the supplied Mitsubishi message.
//
// Args:
// results: Ptr to the data to decode and where to store the decode result.
// nbits: Nr. of data bits to expect.
// strict: Flag indicating if we should perform strict matching.
// Returns:
// boolean: True if it can decode it, false if it can't.
//
// Status: ALPHA / Under development
//
// Ref: https://www.analysir.com/blog/2015/01/06/reverse-engineering-mitsubishi-ac-infrared-protocol/
bool IRrecv::decodeMitsubishiAC(decode_results *results, uint16_t nbits,
bool strict) {
if (results->rawlen < ((kMitsubishiACBits * 2) + 2)) {
DPRINTLN("Shorter than shortest possibly expected.");
return false; // Shorter than shortest possibly expected.
}
if (strict && nbits != kMitsubishiACBits) {
DPRINTLN("Request is out of spec.");
return false; // Request is out of spec.
}
uint16_t offset = kStartOffset;
for (uint8_t i = 0; i < kMitsubishiACStateLength; i++) {
results->state[i] = 0;
}
bool failure = false;
uint8_t rep = 0;
do {
failure = false;
// Header:
// Somtime happens that junk signals arrives before the real message
bool headerFound = false;
while (!headerFound && offset <
(results->rawlen - (kMitsubishiACBits * 2 + 2))) {
headerFound = matchMark(results->rawbuf[offset++], kMitsubishiAcHdrMark)
&& matchSpace(results->rawbuf[offset++], kMitsubishiAcHdrSpace);
}
if (!headerFound) {
DPRINTLN("Header mark not found.");
failure = true;
}
// Decode byte-by-byte:
match_result_t data_result;
for (uint8_t i = 0; i < kMitsubishiACStateLength && !failure; i++) {
results->state[i] = 0;
data_result = matchData(&(results->rawbuf[offset]), 8,
kMitsubishiAcBitMark, kMitsubishiAcOneSpace,
kMitsubishiAcBitMark, kMitsubishiAcZeroSpace,
kTolerance, kMarkExcess, false);
if (data_result.success == false) {
failure = true;
DPRINT("Byte decode failed at #");
DPRINTLN((uint16_t)i);
} else {
results->state[i] = data_result.data;
offset += data_result.used;
DPRINT((uint16_t)results->state[i]);
DPRINT(",");
}
DPRINTLN("");
}
// HEADER validation:
if (failure || results->state[0] != 0x23 || results->state[1] != 0xCB ||
results->state[2] != 0x26 || results->state[3] != 0x01 ||
results->state[4] != 0x00) {
DPRINTLN("Header mismatch.");
failure = true;
} else {
// DATA part:
// FOOTER checksum:
if (IRMitsubishiAC::calculateChecksum(results->state) !=
results->state[kMitsubishiACStateLength - 1]) {
DPRINTLN("Checksum error.");
failure = true;
}
}
if (rep != kMitsubishiACMinRepeat && failure) {
bool repeatMarkFound = false;
while (!repeatMarkFound && offset <
(results->rawlen - (kMitsubishiACBits * 2 + 4))) {
repeatMarkFound = matchMark(results->rawbuf[offset++],
kMitsubishiAcRptMark) &&
matchSpace(results->rawbuf[offset++], kMitsubishiAcRptSpace);
}
if (!repeatMarkFound) {
DPRINTLN("First attempt failure and repeat mark not found.");
return false;
}
}
rep++;
// Check if the repeat is correct if we need strict decode:
if (strict && !failure) {
DPRINTLN("Strict repeat check enabled.");
// Repeat mark and space:
if (!matchMark(results->rawbuf[offset++], kMitsubishiAcRptMark) ||
!matchSpace(results->rawbuf[offset++], kMitsubishiAcRptSpace)) {
DPRINTLN("Repeat mark error.");
return false;
}
// Header mark and space:
if (!matchMark(results->rawbuf[offset++], kMitsubishiAcHdrMark) ||
!matchSpace(results->rawbuf[offset++], kMitsubishiAcHdrSpace)) {
DPRINTLN("Repeat header error.");
return false;
}
// Payload:
for (uint8_t i = 0; i < kMitsubishiACStateLength; i++) {
data_result = matchData(&(results->rawbuf[offset]), 8,
kMitsubishiAcBitMark, kMitsubishiAcOneSpace,
kMitsubishiAcBitMark, kMitsubishiAcZeroSpace,
kTolerance, kMarkExcess, false);
if (data_result.success == false ||
data_result.data != results->state[i]) {
DPRINTLN("Repeat payload error.");
return false;
}
offset += data_result.used;
}
} // strict repeat check
} while (failure && rep <= kMitsubishiACMinRepeat);
results->decode_type = MITSUBISHI_AC;
results->bits = kMitsubishiACStateLength * 8;
return true;
}
#endif // DECODE_MITSUBISHI_AC
// Code to emulate Mitsubishi A/C IR remote control unit.
// Inspired and derived from the work done at:
// https://github.com/r45635/HVAC-IR-Control
@@ -311,7 +444,7 @@ void IRMitsubishiAC::stateReset() {
// Known good state obtained from:
// https://github.com/r45635/HVAC-IR-Control/blob/master/HVAC_ESP8266/HVAC_ESP8266.ino#L108
// Note: Can't use the following because it requires -std=c++11
// uint8_t known_good_state[MITSUBISHI_AC_STATE_LENGTH] = {
// uint8_t known_good_state[kMitsubishiACStateLength] = {
// 0x23, 0xCB, 0x26, 0x01, 0x00, 0x20, 0x08, 0x06, 0x30, 0x45, 0x67, 0x00,
// 0x00, 0x00, 0x00, 0x00, 0x00, 0x1F};
remote_state[0] = 0x23;
@@ -325,9 +458,9 @@ void IRMitsubishiAC::stateReset() {
remote_state[8] = 0x30;
remote_state[9] = 0x45;
remote_state[10] = 0x67;
for (uint8_t i = 11; i < MITSUBISHI_AC_STATE_LENGTH - 1; i++)
for (uint8_t i = 11; i < kMitsubishiACStateLength - 1; i++)
remote_state[i] = 0;
remote_state[MITSUBISHI_AC_STATE_LENGTH - 1] = 0x1F;
remote_state[kMitsubishiACStateLength - 1] = 0x1F;
checksum(); // Calculate the checksum
}
@@ -350,26 +483,37 @@ uint8_t* IRMitsubishiAC::getRaw() {
return remote_state;
}
void IRMitsubishiAC::setRaw(uint8_t* data) {
for (uint8_t i = 0; i < (kMitsubishiACStateLength-1); i++) {
remote_state[i] = data[i];
}
checksum();
}
// Calculate the checksum for the current internal state of the remote.
void IRMitsubishiAC::checksum() {
remote_state[17] = calculateChecksum(remote_state);
}
uint8_t IRMitsubishiAC::calculateChecksum(uint8_t *data) {
uint8_t sum = 0;
// Checksum is simple addition of all previous bytes stored
// as an 8 bit value.
for (uint8_t i = 0; i < 17; i++)
sum += remote_state[i];
remote_state[17] = sum & 0xFFU;
sum += data[i];
return sum & 0xFFU;
}
// Set the requested power state of the A/C to off.
void IRMitsubishiAC::on() {
// state = ON;
remote_state[5] |= MITSUBISHI_AC_POWER;
remote_state[5] |= kMitsubishiAcPower;
}
// Set the requested power state of the A/C to off.
void IRMitsubishiAC::off() {
// state = OFF;
remote_state[5] &= ~MITSUBISHI_AC_POWER;
remote_state[5] &= ~kMitsubishiAcPower;
}
// Set the requested power state of the A/C.
@@ -382,31 +526,31 @@ void IRMitsubishiAC::setPower(bool state) {
// Return the requested power state of the A/C.
bool IRMitsubishiAC::getPower() {
return((remote_state[5] & MITSUBISHI_AC_POWER) != 0);
return((remote_state[5] & kMitsubishiAcPower) != 0);
}
// Set the temp. in deg C
void IRMitsubishiAC::setTemp(uint8_t temp) {
temp = std::max((uint8_t) MITSUBISHI_AC_MIN_TEMP, temp);
temp = std::min((uint8_t) MITSUBISHI_AC_MAX_TEMP, temp);
remote_state[7] = temp - MITSUBISHI_AC_MIN_TEMP;
temp = std::max((uint8_t) kMitsubishiAcMinTemp, temp);
temp = std::min((uint8_t) kMitsubishiAcMaxTemp, temp);
remote_state[7] = temp - kMitsubishiAcMinTemp;
}
// Return the set temp. in deg C
uint8_t IRMitsubishiAC::getTemp() {
return(remote_state[7] + MITSUBISHI_AC_MIN_TEMP);
return(remote_state[7] + kMitsubishiAcMinTemp);
}
// Set the speed of the fan, 0-6.
// 0 is auto, 1-5 is the speed, 6 is silent.
void IRMitsubishiAC::setFan(uint8_t fan) {
// Bounds check
if (fan > MITSUBISHI_AC_FAN_SILENT)
fan = MITSUBISHI_AC_FAN_MAX; // Set the fan to maximum if out of range.
if (fan == MITSUBISHI_AC_FAN_AUTO) { // Automatic is a special case.
if (fan > kMitsubishiAcFanSilent)
fan = kMitsubishiAcFanMax; // Set the fan to maximum if out of range.
if (fan == kMitsubishiAcFanAuto) { // Automatic is a special case.
remote_state[9] = 0b10000000 | (remote_state[9] & 0b01111000);
return;
} else if (fan >= MITSUBISHI_AC_FAN_MAX) {
} else if (fan >= kMitsubishiAcFanMax) {
fan--; // There is no spoon^H^H^Heed 5 (max), pretend it doesn't exist.
}
remote_state[9] &= 0b01111000; // Clear the previous state
@@ -416,8 +560,8 @@ void IRMitsubishiAC::setFan(uint8_t fan) {
// Return the requested state of the unit's fan.
uint8_t IRMitsubishiAC::getFan() {
uint8_t fan = remote_state[9] & 0b111;
if (fan == MITSUBISHI_AC_FAN_MAX)
return MITSUBISHI_AC_FAN_SILENT;
if (fan == kMitsubishiAcFanMax)
return kMitsubishiAcFanSilent;
return fan;
}
@@ -430,11 +574,21 @@ uint8_t IRMitsubishiAC::getMode() {
void IRMitsubishiAC::setMode(uint8_t mode) {
// If we get an unexpected mode, default to AUTO.
switch (mode) {
case MITSUBISHI_AC_AUTO: break;
case MITSUBISHI_AC_COOL: break;
case MITSUBISHI_AC_DRY: break;
case MITSUBISHI_AC_HEAT: break;
default: mode = MITSUBISHI_AC_AUTO;
case kMitsubishiAcAuto:
remote_state[8] = 0b00110000;
break;
case kMitsubishiAcCool:
remote_state[8] = 0b00110110;
break;
case kMitsubishiAcDry:
remote_state[8] = 0b00110010;
break;
case kMitsubishiAcHeat:
remote_state[8] = 0b00110000;
break;
default:
mode = kMitsubishiAcAuto;
remote_state[8] = 0b00110000;
}
remote_state[6] = mode;
}
@@ -452,3 +606,147 @@ void IRMitsubishiAC::setVane(uint8_t mode) {
uint8_t IRMitsubishiAC::getVane() {
return ((remote_state[9] & 0b00111000) >> 3);
}
// Return the clock setting of the message. 1=1/6 hour. e.g. 4pm = 48
uint8_t IRMitsubishiAC::getClock() {
return remote_state[10];
}
// Set the current time. 1 = 1/6 hour. e.g. 6am = 36.
void IRMitsubishiAC::setClock(uint8_t clock) {
remote_state[10] = clock;
}
// Return the desired start time. 1 = 1/6 hour. e.g. 1am = 6
uint8_t IRMitsubishiAC::getStartClock() {
return remote_state[12];
}
// Set the desired start tiem of the AC. 1 = 1/6 hour. e.g. 8pm = 120
void IRMitsubishiAC::setStartClock(uint8_t clock) {
remote_state[12] = clock;
}
// Return the desired stop time of the AC. 1 = 1/6 hour. e.g 10pm = 132
uint8_t IRMitsubishiAC::getStopClock() {
return remote_state[11];
}
// Set the desired stop time of the AC. 1 = 1/6 hour. e.g 10pm = 132
void IRMitsubishiAC::setStopClock(uint8_t clock) {
remote_state[11] = clock;
}
// Return the timer setting. Possible values: kMitsubishiAcNoTimer,
// kMitsubishiAcStartTimer, kMitsubishiAcStopTimer,
// kMitsubishiAcStartStopTimer
uint8_t IRMitsubishiAC::getTimer() {
return remote_state[13] & 0b111;
}
// Set the timer setting. Possible values: kMitsubishiAcNoTimer,
// kMitsubishiAcStartTimer, kMitsubishiAcStopTimer,
// kMitsubishiAcStartStopTimer
void IRMitsubishiAC::setTimer(uint8_t timer) {
remote_state[13] = timer & 0b111;
}
#ifdef ARDUINO
String IRMitsubishiAC::timeToString(uint64_t time) {
String result = "";
#else
std::string IRMitsubishiAC::timeToString(uint64_t time) {
std::string result = "";
#endif // ARDUINO
if (time/6 < 10)
result += "0";
result += uint64ToString(time/6);
result += ":";
if (time*10%60 < 10)
result += "0";
result += uint64ToString(time*10%60);
return result;
}
// Convert the internal state into a human readable string.
#ifdef ARDUINO
String IRMitsubishiAC::toString() {
String result = "";
#else
std::string IRMitsubishiAC::toString() {
std::string result = "";
#endif // ARDUINO
result += "Power: ";
if (getPower())
result += "On";
else
result += "Off";
switch (getMode()) {
case MITSUBISHI_AC_AUTO:
result += " (AUTO)";
break;
case MITSUBISHI_AC_COOL:
result += " (COOL)";
break;
case MITSUBISHI_AC_DRY:
result += " (DRY)";
break;
case MITSUBISHI_AC_HEAT:
result += " (HEAT)";
break;
default:
result += " (UNKNOWN)";
}
result += ", Temp: " + uint64ToString(getTemp()) + "C";
result += ", FAN: ";
switch (getFan()) {
case MITSUBISHI_AC_FAN_AUTO:
result += "AUTO";
break;
case MITSUBISHI_AC_FAN_MAX:
result += "MAX";
break;
case MITSUBISHI_AC_FAN_SILENT:
result += "SILENT";
break;
default:
result += uint64ToString(getFan());
}
result += ", VANE: ";
switch (getVane()) {
case MITSUBISHI_AC_VANE_AUTO:
result += "AUTO";
break;
case MITSUBISHI_AC_VANE_AUTO_MOVE:
result += "AUTO MOVE";
break;
default:
result += uint64ToString(getVane());
}
result += ", Time: ";
result += timeToString(getClock());
result += ", On timer: ";
result += timeToString(getStartClock());
result += ", Off timer: ";
result += timeToString(getStopClock());
result += ", Timer: ";
switch (getTimer()) {
case kMitsubishiAcNoTimer:
result += "-";
break;
case kMitsubishiAcStartTimer:
result += "Start";
break;
case kMitsubishiAcStopTimer:
result += "Stop";
break;
case kMitsubishiAcStartStopTimer:
result += "Start+Stop";
break;
default:
result += "? (";
result += getTimer();
result += ")\n";
}
return result;
}

74
src/ir_Mitsubishi.h
View File

@@ -5,6 +5,11 @@
#define __STDC_LIMIT_MACROS
#include <stdint.h>
#ifndef UNIT_TEST
#include <Arduino.h>
#else
#include <string>
#endif
#include "IRremoteESP8266.h"
#include "IRsend.h"
@@ -18,24 +23,46 @@
// Mitsubishi (TV) sending & Mitsubishi A/C support added by David Conran
// Constants
#define MITSUBISHI_AC_AUTO 0x20U
#define MITSUBISHI_AC_COOL 0x18U
#define MITSUBISHI_AC_DRY 0x10U
#define MITSUBISHI_AC_HEAT 0x08U
#define MITSUBISHI_AC_POWER 0x20U
#define MITSUBISHI_AC_FAN_AUTO 0U
#define MITSUBISHI_AC_FAN_MAX 5U
#define MITSUBISHI_AC_FAN_REAL_MAX 4U
#define MITSUBISHI_AC_FAN_SILENT 6U
#define MITSUBISHI_AC_MIN_TEMP 16U // 16C
#define MITSUBISHI_AC_MAX_TEMP 31U // 31C
#define MITSUBISHI_AC_VANE_AUTO 0U
#define MITSUBISHI_AC_VANE_AUTO_MOVE 7U
const uint8_t kMitsubishiAcAuto = 0x20;
const uint8_t kMitsubishiAcCool = 0x18;
const uint8_t kMitsubishiAcDry = 0x10;
const uint8_t kMitsubishiAcHeat = 0x08;
const uint8_t kMitsubishiAcPower = 0x20;
const uint8_t kMitsubishiAcFanAuto = 0;
const uint8_t kMitsubishiAcFanMax = 5;
const uint8_t kMitsubishiAcFanRealMax = 4;
const uint8_t kMitsubishiAcFanSilent = 6;
const uint8_t kMitsubishiAcMinTemp = 16; // 16C
const uint8_t kMitsubishiAcMaxTemp = 31; // 31C
const uint8_t kMitsubishiAcVaneAuto = 0;
const uint8_t kMitsubishiAcVaneAutoMove = 7;
const uint8_t kMitsubishiAcNoTimer = 0;
const uint8_t kMitsubishiAcStartTimer = 5;
const uint8_t kMitsubishiAcStopTimer = 3;
const uint8_t kMitsubishiAcStartStopTimer = 7;
// Legacy defines (Deprecated)
#define MITSUBISHI_AC_VANE_AUTO_MOVE kMitsubishiAcVaneAutoMove
#define MITSUBISHI_AC_VANE_AUTO kMitsubishiAcVaneAuto
#define MITSUBISHI_AC_POWER kMitsubishiAcPower
#define MITSUBISHI_AC_MIN_TEMP kMitsubishiAcMinTemp
#define MITSUBISHI_AC_MAX_TEMP kMitsubishiAcMaxTemp
#define MITSUBISHI_AC_HEAT kMitsubishiAcHeat
#define MITSUBISHI_AC_FAN_SILENT kMitsubishiAcFanSilent
#define MITSUBISHI_AC_FAN_REAL_MAX kMitsubishiAcFanRealMax
#define MITSUBISHI_AC_FAN_MAX kMitsubishiAcFanMax
#define MITSUBISHI_AC_FAN_AUTO kMitsubishiAcFanAuto
#define MITSUBISHI_AC_DRY kMitsubishiAcDry
#define MITSUBISHI_AC_COOL kMitsubishiAcCool
#define MITSUBISHI_AC_AUTO kMitsubishiAcAuto
class IRMitsubishiAC {
public:
explicit IRMitsubishiAC(uint16_t pin);
static uint8_t calculateChecksum(uint8_t *data);
void stateReset();
#if SEND_MITSUBISHI_AC
void send();
@@ -54,9 +81,28 @@ class IRMitsubishiAC {
void setVane(uint8_t mode);
uint8_t getVane();
uint8_t* getRaw();
void setRaw(uint8_t* data);
uint8_t getClock();
void setClock(uint8_t clock);
uint8_t getStartClock();
void setStartClock(uint8_t clock);
uint8_t getStopClock();
void setStopClock(uint8_t clock);
uint8_t getTimer();
void setTimer(uint8_t timer);
#ifdef ARDUINO
String toString();
#else
std::string toString();
#endif
private:
uint8_t remote_state[MITSUBISHI_AC_STATE_LENGTH];
#ifdef ARDUINO
String timeToString(uint64_t time);
#else
std::string timeToString(uint64_t time);
#endif
uint8_t remote_state[kMitsubishiACStateLength];
void checksum();
IRsend _irsend;
};

102
src/ir_NEC.cpp
View File

@@ -19,36 +19,36 @@
// Constants
// Ref:
// http://www.sbprojects.com/knowledge/ir/nec.php
#define NEC_TICK 560U
#define NEC_HDR_MARK_TICKS 16U
#define NEC_HDR_MARK (NEC_HDR_MARK_TICKS * NEC_TICK)
#define NEC_HDR_SPACE_TICKS 8U
#define NEC_HDR_SPACE (NEC_HDR_SPACE_TICKS * NEC_TICK)
#define NEC_BIT_MARK_TICKS 1U
#define NEC_BIT_MARK (NEC_BIT_MARK_TICKS * NEC_TICK)
#define NEC_ONE_SPACE_TICKS 3U
#define NEC_ONE_SPACE (NEC_TICK * NEC_ONE_SPACE_TICKS)
#define NEC_ZERO_SPACE_TICKS 1U
#define NEC_ZERO_SPACE (NEC_TICK * NEC_ZERO_SPACE_TICKS)
#define NEC_RPT_SPACE_TICKS 4U
#define NEC_RPT_SPACE (NEC_RPT_SPACE_TICKS * NEC_TICK)
#define NEC_RPT_LENGTH 4U
#define NEC_MIN_COMMAND_LENGTH_TICKS 193U
#define NEC_MIN_COMMAND_LENGTH (NEC_MIN_COMMAND_LENGTH_TICKS * NEC_TICK)
#define NEC_MIN_GAP (NEC_MIN_COMMAND_LENGTH - \
(NEC_HDR_MARK + NEC_HDR_SPACE + NEC_BITS * (NEC_BIT_MARK + NEC_ONE_SPACE) \
+ NEC_BIT_MARK))
#define NEC_MIN_GAP_TICKS (NEC_MIN_COMMAND_LENGTH_TICKS - \
(NEC_HDR_MARK_TICKS + NEC_HDR_SPACE_TICKS + \
NEC_BITS * (NEC_BIT_MARK_TICKS + NEC_ONE_SPACE_TICKS) + \
NEC_BIT_MARK_TICKS))
const uint16_t kNecTick = 560;
const uint16_t kNecHdrMarkTicks = 16;
const uint16_t kNecHdrMark = kNecHdrMarkTicks * kNecTick;
const uint16_t kNecHdrSpaceTicks = 8;
const uint16_t kNecHdrSpace = kNecHdrSpaceTicks * kNecTick;
const uint16_t kNecBitMarkTicks = 1;
const uint16_t kNecBitMark = kNecBitMarkTicks * kNecTick;
const uint16_t kNecOneSpaceTicks = 3;
const uint16_t kNecOneSpace = kNecOneSpaceTicks * kNecTick;
const uint16_t kNecZeroSpaceTicks = 1;
const uint16_t kNecZeroSpace = kNecZeroSpaceTicks * kNecTick;
const uint16_t kNecRptSpaceTicks = 4;
const uint16_t kNecRptSpace = kNecRptSpaceTicks * kNecTick;
const uint16_t kNecRptLength = 4;
const uint16_t kNecMinCommandLengthTicks = 193;
const uint32_t kNecMinCommandLength = kNecMinCommandLengthTicks * kNecTick;
const uint32_t kNecMinGap = kNecMinCommandLength -
(kNecHdrMark + kNecHdrSpace + kNECBits * (kNecBitMark + kNecOneSpace) +
kNecBitMark);
const uint16_t kNecMinGapTicks = kNecMinCommandLengthTicks -
(kNecHdrMarkTicks + kNecHdrSpaceTicks +
kNECBits * (kNecBitMarkTicks + kNecOneSpaceTicks) +
kNecBitMarkTicks);
#if (SEND_NEC || SEND_SHERWOOD || SEND_AIWA_RC_T501 || SEND_SANYO)
// Send a raw NEC(Renesas) formatted message.
//
// Args:
// data: The message to be sent.
// nbits: The number of bits of the message to be sent. Typically NEC_BITS.
// nbits: The number of bits of the message to be sent. Typically kNECBits.
// repeat: The number of times the command is to be repeated.
//
// Status: STABLE / Known working.
@@ -56,17 +56,17 @@
// Ref:
// http://www.sbprojects.com/knowledge/ir/nec.php
void IRsend::sendNEC(uint64_t data, uint16_t nbits, uint16_t repeat) {
sendGeneric(NEC_HDR_MARK, NEC_HDR_SPACE,
NEC_BIT_MARK, NEC_ONE_SPACE,
NEC_BIT_MARK, NEC_ZERO_SPACE,
NEC_BIT_MARK, NEC_MIN_GAP, NEC_MIN_COMMAND_LENGTH,
sendGeneric(kNecHdrMark, kNecHdrSpace,
kNecBitMark, kNecOneSpace,
kNecBitMark, kNecZeroSpace,
kNecBitMark, kNecMinGap, kNecMinCommandLength,
data, nbits, 38, true, 0, // Repeats are handled later.
33);
// Optional command repeat sequence.
if (repeat)
sendGeneric(NEC_HDR_MARK, NEC_RPT_SPACE,
sendGeneric(kNecHdrMark, kNecRptSpace,
0, 0, 0, 0, // No actual data sent.
NEC_BIT_MARK, NEC_MIN_GAP, NEC_MIN_COMMAND_LENGTH,
kNecBitMark, kNecMinGap, kNecMinCommandLength,
0, 0, // No data to be sent.
38, true, repeat - 1, // We've already sent a one message.
33);
@@ -103,7 +103,7 @@ uint32_t IRsend::encodeNEC(uint16_t address, uint16_t command) {
//
// Args:
// results: Ptr to the data to decode and where to store the decode result.
// nbits: The number of data bits to expect. Typically NEC_BITS.
// nbits: The number of data bits to expect. Typically kNECBits.
// strict: Flag indicating if we should perform strict matching.
// Returns:
// boolean: True if it can decode it, false if it can't.
@@ -121,25 +121,25 @@ uint32_t IRsend::encodeNEC(uint16_t address, uint16_t command) {
// Ref:
// http://www.sbprojects.com/knowledge/ir/nec.php
bool IRrecv::decodeNEC(decode_results *results, uint16_t nbits, bool strict) {
if (results->rawlen < 2 * nbits + HEADER + FOOTER - 1 &&
results->rawlen != NEC_RPT_LENGTH)
if (results->rawlen < 2 * nbits + kHeader + kFooter - 1 &&
results->rawlen != kNecRptLength)
return false; // Can't possibly be a valid NEC message.
if (strict && nbits != NEC_BITS)
if (strict && nbits != kNECBits)
return false; // Not strictly an NEC message.
uint64_t data = 0;
uint16_t offset = OFFSET_START;
uint16_t offset = kStartOffset;
// Header
if (!matchMark(results->rawbuf[offset], NEC_HDR_MARK)) return false;
if (!matchMark(results->rawbuf[offset], kNecHdrMark)) return false;
// Calculate how long the lowest tick time is based on the header mark.
uint32_t mark_tick = results->rawbuf[offset++] * RAWTICK /
NEC_HDR_MARK_TICKS;
uint32_t mark_tick = results->rawbuf[offset++] * kRawTick /
kNecHdrMarkTicks;
// Check if it is a repeat code.
if (results->rawlen == NEC_RPT_LENGTH &&
matchSpace(results->rawbuf[offset], NEC_RPT_SPACE) &&
matchMark(results->rawbuf[offset + 1], NEC_BIT_MARK_TICKS * mark_tick)) {
results->value = REPEAT;
if (results->rawlen == kNecRptLength &&
matchSpace(results->rawbuf[offset], kNecRptSpace) &&
matchMark(results->rawbuf[offset + 1], kNecBitMarkTicks * mark_tick)) {
results->value = kRepeat;
results->decode_type = NEC;
results->bits = 0;
results->address = 0;
@@ -149,25 +149,25 @@ bool IRrecv::decodeNEC(decode_results *results, uint16_t nbits, bool strict) {
}
// Header (cont.)
if (!matchSpace(results->rawbuf[offset], NEC_HDR_SPACE)) return false;
if (!matchSpace(results->rawbuf[offset], kNecHdrSpace)) return false;
// Calculate how long the common tick time is based on the header space.
uint32_t space_tick = results->rawbuf[offset++] * RAWTICK /
NEC_HDR_SPACE_TICKS;
uint32_t space_tick = results->rawbuf[offset++] * kRawTick /
kNecHdrSpaceTicks;
// Data
match_result_t data_result = matchData(&(results->rawbuf[offset]), nbits,
NEC_BIT_MARK_TICKS * mark_tick,
NEC_ONE_SPACE_TICKS * space_tick,
NEC_BIT_MARK_TICKS * mark_tick,
NEC_ZERO_SPACE_TICKS * space_tick);
kNecBitMarkTicks * mark_tick,
kNecOneSpaceTicks * space_tick,
kNecBitMarkTicks * mark_tick,
kNecZeroSpaceTicks * space_tick);
if (data_result.success == false) return false;
data = data_result.data;
offset += data_result.used;
// Footer
if (!matchMark(results->rawbuf[offset++], NEC_BIT_MARK_TICKS * mark_tick))
if (!matchMark(results->rawbuf[offset++], kNecBitMarkTicks * mark_tick))
return false;
if (offset < results->rawlen &&
!matchAtLeast(results->rawbuf[offset], NEC_MIN_GAP_TICKS * space_tick))
!matchAtLeast(results->rawbuf[offset], kNecMinGapTicks * space_tick))
return false;
// Compliance

69
src/ir_Nikai.cpp
View File

@@ -15,37 +15,36 @@
// Constants
// Ref:
// https://github.com/markszabo/IRremoteESP8266/issues/309
#define NIKAI_TICK 500U
#define NIKAI_HDR_MARK_TICKS 8U
#define NIKAI_HDR_MARK (NIKAI_HDR_MARK_TICKS * NIKAI_TICK)
#define NIKAI_HDR_SPACE_TICKS 8U
#define NIKAI_HDR_SPACE (NIKAI_HDR_SPACE_TICKS * NIKAI_TICK)
#define NIKAI_BIT_MARK_TICKS 1U
#define NIKAI_BIT_MARK (NIKAI_BIT_MARK_TICKS * NIKAI_TICK)
#define NIKAI_ONE_SPACE_TICKS 2U
#define NIKAI_ONE_SPACE (NIKAI_ONE_SPACE_TICKS * NIKAI_TICK)
#define NIKAI_ZERO_SPACE_TICKS 4U
#define NIKAI_ZERO_SPACE (NIKAI_ZERO_SPACE_TICKS * NIKAI_TICK)
#define NIKAI_MIN_GAP_TICKS 17U
#define NIKAI_MIN_GAP (NIKAI_MIN_GAP_TICKS * NIKAI_TICK)
const uint16_t kNikaiTick = 500;
const uint16_t kNikaiHdrMarkTicks = 8;
const uint16_t kNikaiHdrMark = kNikaiHdrMarkTicks * kNikaiTick;
const uint16_t kNikaiHdrSpaceTicks = 8;
const uint16_t kNikaiHdrSpace = kNikaiHdrSpaceTicks * kNikaiTick;
const uint16_t kNikaiBitMarkTicks = 1;
const uint16_t kNikaiBitMark = kNikaiBitMarkTicks * kNikaiTick;
const uint16_t kNikaiOneSpaceTicks = 2;
const uint16_t kNikaiOneSpace = kNikaiOneSpaceTicks * kNikaiTick;
const uint16_t kNikaiZeroSpaceTicks = 4;
const uint16_t kNikaiZeroSpace = kNikaiZeroSpaceTicks * kNikaiTick;
const uint16_t kNikaiMinGapTicks = 17;
const uint16_t kNikaiMinGap = kNikaiMinGapTicks * kNikaiTick;
#if SEND_NIKAI
// Send a Nikai TV formatted message.
//
// Args:
// data: The message to be sent.
// nbits: The bit size of the message being sent. typically NIKAI_BITS.
// nbits: The bit size of the message being sent. typically kNikaiBits.
// repeat: The number of times the message is to be repeated.
//
// Status: STABLE / Working.
//
// Ref: https://github.com/markszabo/IRremoteESP8266/issues/309
void IRsend::sendNikai(uint64_t data, uint16_t nbits, uint16_t repeat) {
sendGeneric(NIKAI_HDR_MARK, NIKAI_HDR_SPACE,
NIKAI_BIT_MARK, NIKAI_ONE_SPACE,
NIKAI_BIT_MARK, NIKAI_ZERO_SPACE,
NIKAI_BIT_MARK, NIKAI_MIN_GAP,
sendGeneric(kNikaiHdrMark, kNikaiHdrSpace,
kNikaiBitMark, kNikaiOneSpace,
kNikaiBitMark, kNikaiZeroSpace,
kNikaiBitMark, kNikaiMinGap,
data, nbits, 38, true, repeat, 33);
}
#endif
@@ -56,7 +55,7 @@ void IRsend::sendNikai(uint64_t data, uint16_t nbits, uint16_t repeat) {
// Args:
// results: Ptr to the data to decode and where to store the decode result.
// nbits: Nr. of bits to expect in the data portion.
// Typically NIKAI_BITS.
// Typically kNikaiBits.
// strict: Flag to indicate if we strictly adhere to the specification.
// Returns:
// boolean: True if it can decode it, false if it can't.
@@ -64,37 +63,37 @@ void IRsend::sendNikai(uint64_t data, uint16_t nbits, uint16_t repeat) {
// Status: STABLE / Working.
//
bool IRrecv::decodeNikai(decode_results *results, uint16_t nbits, bool strict) {
if (results->rawlen < 2 * nbits + HEADER + FOOTER - 1)
if (results->rawlen < 2 * nbits + kHeader + kFooter - 1)
return false; // Can't possibly be a valid Nikai message.
if (strict && nbits != NIKAI_BITS)
if (strict && nbits != kNikaiBits)
return false; // We expect Nikai to be a certain sized message.
uint64_t data = 0;
uint16_t offset = OFFSET_START;
uint16_t offset = kStartOffset;
// Header
if (!matchMark(results->rawbuf[offset], NIKAI_HDR_MARK)) return false;
if (!matchMark(results->rawbuf[offset], kNikaiHdrMark)) return false;
// Calculate how long the common tick time is based on the header mark.
uint32_t m_tick = results->rawbuf[offset++] * RAWTICK /
NIKAI_HDR_MARK_TICKS;
if (!matchSpace(results->rawbuf[offset], NIKAI_HDR_SPACE)) return false;
uint32_t m_tick = results->rawbuf[offset++] * kRawTick /
kNikaiHdrMarkTicks;
if (!matchSpace(results->rawbuf[offset], kNikaiHdrSpace)) return false;
// Calculate how long the common tick time is based on the header space.
uint32_t s_tick = results->rawbuf[offset++] * RAWTICK /
NIKAI_HDR_SPACE_TICKS;
uint32_t s_tick = results->rawbuf[offset++] * kRawTick /
kNikaiHdrSpaceTicks;
// Data
match_result_t data_result = matchData(&(results->rawbuf[offset]), nbits,
NIKAI_BIT_MARK_TICKS * m_tick,
NIKAI_ONE_SPACE_TICKS * s_tick,
NIKAI_BIT_MARK_TICKS * m_tick,
NIKAI_ZERO_SPACE_TICKS * s_tick);
kNikaiBitMarkTicks * m_tick,
kNikaiOneSpaceTicks * s_tick,
kNikaiBitMarkTicks * m_tick,
kNikaiZeroSpaceTicks * s_tick);
if (data_result.success == false) return false;
data = data_result.data;
offset += data_result.used;
// Footer
if (!matchMark(results->rawbuf[offset++], NIKAI_BIT_MARK_TICKS * m_tick))
if (!matchMark(results->rawbuf[offset++], kNikaiBitMarkTicks * m_tick))
return false;
if (offset < results->rawlen &&
!matchAtLeast(results->rawbuf[offset], NIKAI_MIN_GAP_TICKS * s_tick))
!matchAtLeast(results->rawbuf[offset], kNikaiMinGapTicks * s_tick))
return false;
// Compliance

86
src/ir_Panasonic.cpp
View File

@@ -19,32 +19,34 @@
// Constants
// Ref:
// http://www.remotecentral.com/cgi-bin/mboard/rc-pronto/thread.cgi?26152
#define PANASONIC_TICK 432U
#define PANASONIC_HDR_MARK_TICKS 8U
#define PANASONIC_HDR_MARK (PANASONIC_HDR_MARK_TICKS * PANASONIC_TICK)
#define PANASONIC_HDR_SPACE_TICKS 4U
#define PANASONIC_HDR_SPACE (PANASONIC_HDR_SPACE_TICKS * PANASONIC_TICK)
#define PANASONIC_BIT_MARK_TICKS 1U
#define PANASONIC_BIT_MARK (PANASONIC_BIT_MARK_TICKS * PANASONIC_TICK)
#define PANASONIC_ONE_SPACE_TICKS 3U
#define PANASONIC_ONE_SPACE (PANASONIC_ONE_SPACE_TICKS * PANASONIC_TICK)
#define PANASONIC_ZERO_SPACE_TICKS 1U
#define PANASONIC_ZERO_SPACE (PANASONIC_ZERO_SPACE_TICKS * PANASONIC_TICK)
#define PANASONIC_MIN_COMMAND_LENGTH_TICKS 378UL
#define PANASONIC_MIN_COMMAND_LENGTH (PANASONIC_MIN_COMMAND_LENGTH_TICKS * \
PANASONIC_TICK)
#define PANASONIC_END_GAP 5000U // See issue #245
#define PANASONIC_MIN_GAP_TICKS (PANASONIC_MIN_COMMAND_LENGTH_TICKS - \
(PANASONIC_HDR_MARK_TICKS + PANASONIC_HDR_SPACE_TICKS + \
PANASONIC_BITS * (PANASONIC_BIT_MARK_TICKS + PANASONIC_ONE_SPACE_TICKS) + \
PANASONIC_BIT_MARK_TICKS))
#define PANASONIC_MIN_GAP ((uint32_t)(PANASONIC_MIN_GAP_TICKS * PANASONIC_TICK))
const uint16_t kPanasonicTick = 432;
const uint16_t kPanasonicHdrMarkTicks = 8;
const uint16_t kPanasonicHdrMark = kPanasonicHdrMarkTicks * kPanasonicTick;
const uint16_t kPanasonicHdrSpaceTicks = 4;
const uint16_t kPanasonicHdrSpace = kPanasonicHdrSpaceTicks * kPanasonicTick;
const uint16_t kPanasonicBitMarkTicks = 1;
const uint16_t kPanasonicBitMark = kPanasonicBitMarkTicks * kPanasonicTick;
const uint16_t kPanasonicOneSpaceTicks = 3;
const uint16_t kPanasonicOneSpace = kPanasonicOneSpaceTicks * kPanasonicTick;
const uint16_t kPanasonicZeroSpaceTicks = 1;
const uint16_t kPanasonicZeroSpace = kPanasonicZeroSpaceTicks * kPanasonicTick;
const uint16_t kPanasonicMinCommandLengthTicks = 378;
const uint32_t kPanasonicMinCommandLength =
kPanasonicMinCommandLengthTicks * kPanasonicTick;
const uint16_t kPanasonicEndGap = 5000; // See issue #245
const uint16_t kPanasonicMinGapTicks = kPanasonicMinCommandLengthTicks -
(kPanasonicHdrMarkTicks + kPanasonicHdrSpaceTicks +
kPanasonicBits * (kPanasonicBitMarkTicks + kPanasonicOneSpaceTicks) +
kPanasonicBitMarkTicks);
const uint32_t kPanasonicMinGap = kPanasonicMinGapTicks * kPanasonicTick;
#if (SEND_PANASONIC || SEND_DENON)
// Send a Panasonic formatted message.
//
// Args:
// data: The message to be sent.
// nbits: The number of bits of the message to be sent. (PANASONIC_BITS).
// nbits: The number of bits of the message to be sent. (kPanasonicBits).
// repeat: The number of times the command is to be repeated.
//
// Status: BETA / Should be working.
@@ -52,11 +54,11 @@
// Note:
// This protocol is a modified version of Kaseikyo.
void IRsend::sendPanasonic64(uint64_t data, uint16_t nbits, uint16_t repeat) {
sendGeneric(PANASONIC_HDR_MARK, PANASONIC_HDR_SPACE,
PANASONIC_BIT_MARK, PANASONIC_ONE_SPACE,
PANASONIC_BIT_MARK, PANASONIC_ZERO_SPACE,
PANASONIC_BIT_MARK,
PANASONIC_MIN_GAP, PANASONIC_MIN_COMMAND_LENGTH,
sendGeneric(kPanasonicHdrMark, kPanasonicHdrSpace,
kPanasonicBitMark, kPanasonicOneSpace,
kPanasonicBitMark, kPanasonicZeroSpace,
kPanasonicBitMark,
kPanasonicMinGap, kPanasonicMinCommandLength,
data, nbits, 36700U, true, repeat, 50);
}
@@ -65,7 +67,7 @@ void IRsend::sendPanasonic64(uint64_t data, uint16_t nbits, uint16_t repeat) {
// Args:
// address: The manufacturer code.
// data: The data portion to be sent.
// nbits: The number of bits of the message to be sent. (PANASONIC_BITS).
// nbits: The number of bits of the message to be sent. (kPanasonicBits).
// repeat: The number of times the command is to be repeated.
//
// Status: STABLE.
@@ -124,39 +126,39 @@ uint64_t IRsend::encodePanasonic(uint16_t manufacturer,
// http://www.hifi-remote.com/wiki/index.php?title=Panasonic
bool IRrecv::decodePanasonic(decode_results *results, uint16_t nbits,
bool strict, uint32_t manufacturer) {
if (results->rawlen < 2 * nbits + HEADER + FOOTER - 1)
if (results->rawlen < 2 * nbits + kHeader + kFooter - 1)
return false; // Not enough entries to be a Panasonic message.
if (strict && nbits != PANASONIC_BITS)
if (strict && nbits != kPanasonicBits)
return false; // Request is out of spec.
uint64_t data = 0;
uint16_t offset = OFFSET_START;
uint16_t offset = kStartOffset;
// Header
if (!matchMark(results->rawbuf[offset], PANASONIC_HDR_MARK)) return false;
if (!matchMark(results->rawbuf[offset], kPanasonicHdrMark)) return false;
// Calculate how long the common tick time is based on the header mark.
uint32_t m_tick = results->rawbuf[offset++] * RAWTICK /
PANASONIC_HDR_MARK_TICKS;
if (!matchSpace(results->rawbuf[offset], PANASONIC_HDR_SPACE)) return false;
uint32_t m_tick = results->rawbuf[offset++] * kRawTick /
kPanasonicHdrMarkTicks;
if (!matchSpace(results->rawbuf[offset], kPanasonicHdrSpace)) return false;
// Calculate how long the common tick time is based on the header space.
uint32_t s_tick = results->rawbuf[offset++] * RAWTICK /
PANASONIC_HDR_SPACE_TICKS;
uint32_t s_tick = results->rawbuf[offset++] * kRawTick /
kPanasonicHdrSpaceTicks;
// Data
match_result_t data_result = matchData(&(results->rawbuf[offset]), nbits,
PANASONIC_BIT_MARK_TICKS * m_tick,
PANASONIC_ONE_SPACE_TICKS * s_tick,
PANASONIC_BIT_MARK_TICKS * m_tick,
PANASONIC_ZERO_SPACE_TICKS * s_tick);
kPanasonicBitMarkTicks * m_tick,
kPanasonicOneSpaceTicks * s_tick,
kPanasonicBitMarkTicks * m_tick,
kPanasonicZeroSpaceTicks * s_tick);
if (data_result.success == false) return false;
data = data_result.data;
offset += data_result.used;
// Footer
if (!match(results->rawbuf[offset++], PANASONIC_BIT_MARK_TICKS * m_tick))
if (!match(results->rawbuf[offset++], kPanasonicBitMarkTicks * m_tick))
return false;
if (offset < results->rawlen &&
!matchAtLeast(results->rawbuf[offset], PANASONIC_END_GAP))
!matchAtLeast(results->rawbuf[offset], kPanasonicEndGap))
return false;
// Compliance

4
src/ir_Pronto.cpp
View File

@@ -49,14 +49,14 @@
// 0x0030, 0x0018, 0x0018, 0x0018, 0x0018, 0x0018, 0x0030, 0x0018,
// 0x0018, 0x03f6};
// // Send the Pronto(Sony) code. Repeat twice as Sony's require that.
// sendPronto(prontoCode, 46, SONY_MIN_REPEAT);
// sendPronto(prontoCode, 46, kSonyMinRepeat);
//
// Ref:
// http://www.etcwiki.org/wiki/Pronto_Infrared_Format
// http://www.remotecentral.com/features/irdisp2.htm
void IRsend::sendPronto(uint16_t data[], uint16_t len, uint16_t repeat) {
// Check we have enough data to work out what to send.
if (len < PRONTO_MIN_LENGTH) return;
if (len < kProntoMinLength) return;
// We only know how to deal with 'raw' pronto codes types. Reject all others.
if (data[PRONTO_TYPE_OFFSET] != 0) return;

152
src/ir_RC5_RC6.cpp
View File

@@ -23,27 +23,29 @@
// http://www.sbprojects.com/knowledge/ir/rc5.php
#define MIN_RC5_SAMPLES 11U
#define MIN_RC6_SAMPLES 1U
#define RC5_T1 889U
#define RC5_MIN_COMMAND_LENGTH 113778UL
#define RC5_MIN_GAP (RC5_MIN_COMMAND_LENGTH - RC5_RAW_BITS * (2 * RC5_T1))
#define RC5_TOGGLE_MASK 0x800U // (The 12th bit)
const uint16_t kRc5T1 = 889;
const uint32_t kRc5MinCommandLength = 113778;
const uint32_t kRc5MinGap = kRc5MinCommandLength - kRC5RawBits * (2 * kRc5T1);
const uint16_t kRc5ToggleMask = 0x800; // The 12th bit.
// RC-6
// Ref:
// https://en.wikipedia.org/wiki/RC-6
// http://www.pcbheaven.com/userpages/The_Philips_RC6_Protocol/
#define RC6_TICK 444U
#define RC6_HDR_MARK_TICKS 6U
#define RC6_HDR_MARK (RC6_HDR_MARK_TICKS * RC6_TICK)
#define RC6_HDR_SPACE_TICKS 2U
#define RC6_HDR_SPACE (RC6_HDR_SPACE_TICKS * RC6_TICK)
#define RC6_RPT_LENGTH_TICKS 187U
#define RC6_RPT_LENGTH (RC6_RPT_LENGTH_TICKS * RC6_TICK)
#define RC6_TOGGLE_MASK 0x10000UL // (The 17th bit)
#define RC6_36_TOGGLE_MASK 0x8000U // (The 16th bit)
const uint16_t kRc6Tick = 444;
const uint16_t kRc6HdrMarkTicks = 6;
const uint16_t kRc6HdrMark = kRc6HdrMarkTicks * kRc6Tick;
const uint16_t kRc6HdrSpaceTicks = 2;
const uint16_t kRc6HdrSpace = kRc6HdrSpaceTicks * kRc6Tick;
const uint16_t kRc6RptLengthTicks = 187;
const uint32_t kRc6RptLength = kRc6RptLengthTicks * kRc6Tick;
const uint32_t kRc6ToggleMask = 0x10000UL; // The 17th bit.
const uint16_t kRc6_36ToggleMask = 0x8000; // The 16th bit.
// Common (getRClevel())
const int16_t kMARK = 0;
const int16_t kSPACE = 1;
const int16_t kMark = 0;
const int16_t kSpace = 1;
#if SEND_RC5
// Send a Philips RC-5/RC-5X packet.
@@ -74,7 +76,7 @@ void IRsend::sendRC5(uint64_t data, uint16_t nbits, uint16_t repeat) {
// Set 36kHz IR carrier frequency & a 1/4 (25%) duty cycle.
enableIROut(36, 25);
if (nbits >= RC5X_BITS) { // Is this a RC-5X message?
if (nbits >= kRC5XBits) { // Is this a RC-5X message?
// field bit is the inverted MSB of RC-5X data.
field_bit = ((data >> (nbits - 1)) ^ 1) & 1;
nbits--;
@@ -89,28 +91,28 @@ void IRsend::sendRC5(uint64_t data, uint16_t nbits, uint16_t repeat) {
if (skipSpace)
skipSpace = false; // First time through, we assume the leading space().
else
space(RC5_T1);
mark(RC5_T1);
space(kRc5T1);
mark(kRc5T1);
// Field/Second start bit.
if (field_bit) { // Send a 1. Normal for RC-5.
space(RC5_T1);
mark(RC5_T1);
space(kRc5T1);
mark(kRc5T1);
} else { // Send a 0. Special case for RC-5X. Means 7th command bit is 1.
mark(RC5_T1);
space(RC5_T1);
mark(kRc5T1);
space(kRc5T1);
}
// Data
for (uint64_t mask = 1ULL << (nbits - 1); mask; mask >>= 1)
if (data & mask) { // 1
space(RC5_T1); // 1 is space, then mark.
mark(RC5_T1);
space(kRc5T1); // 1 is space, then mark.
mark(kRc5T1);
} else { // 0
mark(RC5_T1); // 0 is mark, then space.
space(RC5_T1);
mark(kRc5T1); // 0 is mark, then space.
space(kRc5T1);
}
// Footer
space(std::max(RC5_MIN_GAP, RC5_MIN_COMMAND_LENGTH - usecTimer.elapsed()));
space(std::max(kRc5MinGap, kRc5MinCommandLength - usecTimer.elapsed()));
}
}
@@ -131,7 +133,7 @@ void IRsend::sendRC5(uint64_t data, uint16_t nbits, uint16_t repeat) {
// https://en.wikipedia.org/wiki/RC-5
uint16_t IRsend::encodeRC5(uint8_t address, uint8_t command,
bool key_released) {
return (key_released << (RC5_BITS - 1)) |
return (key_released << (kRC5Bits - 1)) |
((address & 0x1f) << 6) |
(command & 0x3F);
}
@@ -156,7 +158,7 @@ uint16_t IRsend::encodeRC5X(uint8_t address, uint8_t command,
// The 2nd start/field bit (MSB of the return value) is the value of the 7th
// command bit.
bool s2 = (command >> 6) & 1;
return ((uint16_t) s2 << (RC5X_BITS - 1)) |
return ((uint16_t) s2 << (kRC5XBits - 1)) |
encodeRC5(address, command, key_released);
}
@@ -175,7 +177,7 @@ uint16_t IRsend::encodeRC5X(uint8_t address, uint8_t command,
// http://www.sbprojects.com/knowledge/ir/rc5.php
// https://en.wikipedia.org/wiki/RC-5
uint64_t IRsend::toggleRC5(uint64_t data) {
return data ^ RC5_TOGGLE_MASK;
return data ^ kRc5ToggleMask;
}
#endif // SEND_RC5
@@ -198,9 +200,9 @@ uint64_t IRsend::toggleRC5(uint64_t data) {
// http://www.sbprojects.com/knowledge/ir/rc6.php
// http://www.righto.com/2010/12/64-bit-rc6-codes-arduino-and-xbox.html
uint64_t IRsend::toggleRC6(uint64_t data, uint16_t nbits) {
if (nbits == RC6_36_BITS)
return data ^ RC6_36_TOGGLE_MASK;
return data ^ RC6_TOGGLE_MASK;
if (nbits == kRC6_36Bits)
return data ^ kRc6_36ToggleMask;
return data ^ kRc6ToggleMask;
}
// Encode a Philips RC-6 data message.
@@ -223,9 +225,9 @@ uint64_t IRsend::toggleRC6(uint64_t data, uint16_t nbits) {
uint64_t IRsend::encodeRC6(uint32_t address, uint8_t command,
uint16_t mode) {
switch (mode) {
case RC6_MODE0_BITS:
case kRC6Mode0Bits:
return ((address & 0xFFF) << 8) | (command & 0xFF);
case RC6_36_BITS:
case kRC6_36Bits:
return ((uint64_t) (address & 0xFFFFFFF) << 8) | (command & 0xFF);
default:
return 0;
@@ -255,18 +257,18 @@ void IRsend::sendRC6(uint64_t data, uint16_t nbits, uint16_t repeat) {
enableIROut(36, 33);
for (uint16_t r = 0; r <= repeat; r++) {
// Header
mark(RC6_HDR_MARK);
space(RC6_HDR_SPACE);
mark(kRc6HdrMark);
space(kRc6HdrSpace);
// Start bit.
mark(RC6_TICK); // mark, then space == 0x1.
space(RC6_TICK);
mark(kRc6Tick); // mark, then space == 0x1.
space(kRc6Tick);
// Data
uint16_t bitTime;
for (uint64_t i = 1, mask = 1ULL << (nbits - 1); mask; i++, mask >>= 1) {
if (i == 4) // The fourth bit we send is a "double width trailer bit".
bitTime = 2 * RC6_TICK; // double-wide trailer bit
bitTime = 2 * kRc6Tick; // double-wide trailer bit
else
bitTime = RC6_TICK; // Normal bit
bitTime = kRc6Tick; // Normal bit
if (data & mask) { // 1
mark(bitTime);
space(bitTime);
@@ -276,7 +278,7 @@ void IRsend::sendRC6(uint64_t data, uint16_t nbits, uint16_t repeat) {
}
}
// Footer
space(RC6_RPT_LENGTH);
space(kRc6RptLength);
}
}
#endif // SEND_RC6
@@ -305,17 +307,17 @@ int16_t IRrecv::getRClevel(decode_results *results, uint16_t *offset,
DPRINTLN(uint64ToString(*offset));
if (*offset >= results->rawlen) {
DPRINTLN("DEBUG: getRClevel: SPACE, past end of rawbuf");
return kSPACE; // After end of recorded buffer, assume SPACE.
return kSpace; // After end of recorded buffer, assume SPACE.
}
uint16_t width = results->rawbuf[*offset];
// If the value of offset is odd, it's a MARK. Even, it's a SPACE.
uint16_t val = ((*offset) % 2) ? kMARK : kSPACE;
uint16_t val = ((*offset) % 2) ? kMark : kSpace;
// Check to see if we have hit an inter-message gap (> 20ms).
if (val == kSPACE && width > 20000 - delta) {
if (val == kSpace && width > 20000 - delta) {
DPRINTLN("DEBUG: getRClevel: SPACE, hit end of mesg gap.");
return kSPACE;
return kSpace;
}
int16_t correction = (val == kMARK) ? excess : -excess;
int16_t correction = (val == kMark) ? excess : -excess;
// Calculate the look-ahead for our current position in the buffer.
uint16_t avail;
@@ -339,7 +341,7 @@ int16_t IRrecv::getRClevel(decode_results *results, uint16_t *offset,
*used = 0;
(*offset)++;
}
if (val == kMARK) {
if (val == kMark) {
DPRINTLN("DEBUG: getRClevel: MARK");
} else {
DPRINTLN("DEBUG: getRClevel: SPACE");
@@ -371,28 +373,28 @@ int16_t IRrecv::getRClevel(decode_results *results, uint16_t *offset,
// TODO(anyone):
// Serious testing of the RC-5X and strict aspects needs to be done.
bool IRrecv::decodeRC5(decode_results *results, uint16_t nbits, bool strict) {
if (results->rawlen < MIN_RC5_SAMPLES + HEADER - 1) return false;
if (results->rawlen < MIN_RC5_SAMPLES + kHeader - 1) return false;
// Compliance
if (strict && nbits != RC5_BITS && nbits != RC5X_BITS)
if (strict && nbits != kRC5Bits && nbits != kRC5XBits)
return false; // It's neither RC-5 or RC-5X.
uint16_t offset = OFFSET_START;
uint16_t offset = kStartOffset;
uint16_t used = 0;
bool is_rc5x = false;
uint64_t data = 0;
// Header
// Get start bit #1.
if (getRClevel(results, &offset, &used, RC5_T1) != kMARK) return false;
if (getRClevel(results, &offset, &used, kRc5T1) != kMark) return false;
// Get field/start bit #2 (inverted bit-7 of the command if RC-5X protocol)
uint16_t actual_bits = 1;
int16_t levelA = getRClevel(results, &offset, &used, RC5_T1);
int16_t levelB = getRClevel(results, &offset, &used, RC5_T1);
if (levelA == kSPACE && levelB == kMARK) { // Matched a 1.
int16_t levelA = getRClevel(results, &offset, &used, kRc5T1);
int16_t levelB = getRClevel(results, &offset, &used, kRc5T1);
if (levelA == kSpace && levelB == kMark) { // Matched a 1.
is_rc5x = false;
} else if (levelA == kMARK && levelB == kSPACE) { // Matched a 0.
if (nbits <= RC5_BITS) return false; // Field bit must be '1' for RC5.
} else if (levelA == kMark && levelB == kSpace) { // Matched a 0.
if (nbits <= kRC5Bits) return false; // Field bit must be '1' for RC5.
is_rc5x = true;
data = 1;
} else {
@@ -401,11 +403,11 @@ bool IRrecv::decodeRC5(decode_results *results, uint16_t nbits, bool strict) {
// Data
for (; offset < results->rawlen; actual_bits++) {
int16_t levelA = getRClevel(results, &offset, &used, RC5_T1);
int16_t levelB = getRClevel(results, &offset, &used, RC5_T1);
if (levelA == kSPACE && levelB == kMARK)
int16_t levelA = getRClevel(results, &offset, &used, kRc5T1);
int16_t levelB = getRClevel(results, &offset, &used, kRc5T1);
if (levelA == kSpace && levelB == kMark)
data = (data << 1) | 1; // 1
else if (levelA == kMARK && levelB == kSPACE)
else if (levelA == kMark && levelB == kSpace)
data <<= 1; // 0
else
break;
@@ -414,8 +416,8 @@ bool IRrecv::decodeRC5(decode_results *results, uint16_t nbits, bool strict) {
// Compliance
if (actual_bits < nbits) return false; // Less data than we expected.
if (strict && actual_bits != RC5_BITS &&
actual_bits != RC5X_BITS) return false;
if (strict && actual_bits != kRC5Bits &&
actual_bits != kRC5XBits) return false;
// Success
results->value = data;
@@ -452,7 +454,7 @@ bool IRrecv::decodeRC5(decode_results *results, uint16_t nbits, bool strict) {
// TODO(anyone):
// Testing of the strict compliance aspects.
bool IRrecv::decodeRC6(decode_results *results, uint16_t nbits, bool strict) {
if (results->rawlen < HEADER + 2 + 4) // Up to the double-wide T bit.
if (results->rawlen < kHeader + 2 + 4) // Up to the double-wide T bit.
return false; // Smaller than absolute smallest possible RC6 message.
if (strict) { // Compliance
@@ -462,31 +464,31 @@ bool IRrecv::decodeRC6(decode_results *results, uint16_t nbits, bool strict) {
// Also due to potential melding with the start bit, we can only count
// the start bit as 1, instead of a more typical 2 value. The header still
// remains as normal.
if (results->rawlen < nbits + HEADER + 1)
if (results->rawlen < nbits + kHeader + 1)
return false; // Don't have enough entries/samples to be valid.
switch (nbits) {
case RC6_MODE0_BITS:
case RC6_36_BITS:
case kRC6Mode0Bits:
case kRC6_36Bits:
break;
default:
return false; // Asking for the wrong number of bits.
}
}
uint16_t offset = OFFSET_START;
uint16_t offset = kStartOffset;
// Header
if (!matchMark(results->rawbuf[offset], RC6_HDR_MARK)) return false;
if (!matchMark(results->rawbuf[offset], kRc6HdrMark)) return false;
// Calculate how long the common tick time is based on the header mark.
uint32_t tick = results->rawbuf[offset++] * RAWTICK / RC6_HDR_MARK_TICKS;
if (!matchSpace(results->rawbuf[offset++], RC6_HDR_SPACE_TICKS * tick))
uint32_t tick = results->rawbuf[offset++] * kRawTick / kRc6HdrMarkTicks;
if (!matchSpace(results->rawbuf[offset++], kRc6HdrSpaceTicks * tick))
return false;
uint16_t used = 0;
// Get the start bit. e.g. 1.
if (getRClevel(results, &offset, &used, tick) != kMARK) return false;
if (getRClevel(results, &offset, &used, tick) != kSPACE) return false;
if (getRClevel(results, &offset, &used, tick) != kMark) return false;
if (getRClevel(results, &offset, &used, tick) != kSpace) return false;
uint16_t actual_bits;
uint64_t data = 0;
@@ -504,9 +506,9 @@ bool IRrecv::decodeRC6(decode_results *results, uint16_t nbits, bool strict) {
if (actual_bits == 3 &&
levelB != getRClevel(results, &offset, &used, tick))
return false;
if (levelA == kMARK && levelB == kSPACE) // reversed compared to RC5
if (levelA == kMark && levelB == kSpace) // reversed compared to RC5
data = (data << 1) | 1; // 1
else if (levelA == kSPACE && levelB == kMARK)
else if (levelA == kSpace && levelB == kMark)
data <<= 1; // 0
else
break;

98
src/ir_RCMM.cpp
View File

@@ -17,28 +17,28 @@
// Constants
// Ref:
// http://www.sbprojects.com/knowledge/ir/rcmm.php
#define RCMM_TICK 28U // Technically it would be 27.777*
#define RCMM_HDR_MARK_TICKS 15U
#define RCMM_HDR_MARK 416U
#define RCMM_HDR_SPACE_TICKS 10U
#define RCMM_HDR_SPACE 277U
#define RCMM_BIT_MARK_TICKS 6U
#define RCMM_BIT_MARK 166U
#define RCMM_BIT_SPACE_0_TICKS 10U
#define RCMM_BIT_SPACE_0 277U
#define RCMM_BIT_SPACE_1_TICKS 16U
#define RCMM_BIT_SPACE_1 444U
#define RCMM_BIT_SPACE_2_TICKS 22U
#define RCMM_BIT_SPACE_2 611U
#define RCMM_BIT_SPACE_3_TICKS 28U
#define RCMM_BIT_SPACE_3 777U
#define RCMM_RPT_LENGTH_TICKS 992U
#define RCMM_RPT_LENGTH 27778U
#define RCMM_MIN_GAP_TICKS 120U
#define RCMM_MIN_GAP 3360U
const uint16_t kRcmmTick = 28; // Technically it would be 27.777*
const uint16_t kRcmmHdrMarkTicks = 15;
const uint16_t kRcmmHdrMark = 416;
const uint16_t kRcmmHdrSpaceTicks = 10;
const uint16_t kRcmmHdrSpace = 277;
const uint16_t kRcmmBitMarkTicks = 6;
const uint16_t kRcmmBitMark = 166;
const uint16_t kRcmmBitSpace0Ticks = 10;
const uint16_t kRcmmBitSpace0 = 277;
const uint16_t kRcmmBitSpace1Ticks = 16;
const uint16_t kRcmmBitSpace1 = 444;
const uint16_t kRcmmBitSpace2Ticks = 22;
const uint16_t kRcmmBitSpace2 = 611;
const uint16_t kRcmmBitSpace3Ticks = 28;
const uint16_t kRcmmBitSpace3 = 777;
const uint16_t kRcmmRptLengthTicks = 992;
const uint32_t kRcmmRptLength = 27778;
const uint16_t kRcmmMinGapTicks = 120;
const uint32_t kRcmmMinGap = 3360;
// Use a tolerance of +/-10% when matching some data spaces.
#define RCMM_TOLERANCE 10U
#define RCMM_EXCESS 50U
const uint8_t kRcmmTolerance = 10;
const uint16_t kRcmmExcess = 50;
#if SEND_RCMM
// Send a Philips RC-MM packet.
@@ -60,27 +60,27 @@ void IRsend::sendRCMM(uint64_t data, uint16_t nbits, uint16_t repeat) {
for (uint16_t r = 0; r <= repeat; r++) {
usecs.reset();
// Header
mark(RCMM_HDR_MARK);
space(RCMM_HDR_SPACE);
mark(kRcmmHdrMark);
space(kRcmmHdrSpace);
// Data
uint64_t mask = 0b11ULL << (nbits - 2);
// RC-MM sends data 2 bits at a time.
for (int32_t i = nbits; i > 0; i -= 2) {
mark(RCMM_BIT_MARK);
mark(kRcmmBitMark);
// Grab the next Most Significant Bits to send.
switch ((data & mask) >> (i - 2)) {
case 0b00: space(RCMM_BIT_SPACE_0); break;
case 0b01: space(RCMM_BIT_SPACE_1); break;
case 0b10: space(RCMM_BIT_SPACE_2); break;
case 0b11: space(RCMM_BIT_SPACE_3); break;
case 0b00: space(kRcmmBitSpace0); break;
case 0b01: space(kRcmmBitSpace1); break;
case 0b10: space(kRcmmBitSpace2); break;
case 0b11: space(kRcmmBitSpace3); break;
}
mask >>= 2;
}
// Footer
mark(RCMM_BIT_MARK);
// Protocol requires us to wait at least RCMM_RPT_LENGTH usecs from the
// start or RCMM_MIN_GAP usecs.
space(std::max(RCMM_RPT_LENGTH - usecs.elapsed(), RCMM_MIN_GAP));
mark(kRcmmBitMark);
// Protocol requires us to wait at least kRcmmRptLength usecs from the
// start or kRcmmMinGap usecs.
space(std::max(kRcmmRptLength - usecs.elapsed(), kRcmmMinGap));
}
}
#endif
@@ -90,7 +90,7 @@ void IRsend::sendRCMM(uint64_t data, uint16_t nbits, uint16_t repeat) {
// Places successful decode information in the results pointer.
// Args:
// results: Ptr to the data to decode and where to store the decode result.
// nbits: Nr. of bits to expect in the data portion. Typically RCMM_BITS.
// nbits: Nr. of bits to expect in the data portion. Typically kRCMMBits.
// strict: Flag to indicate if we strictly adhere to the specification.
// Returns:
// boolean: True if it can decode it, false if it can't.
@@ -101,7 +101,7 @@ void IRsend::sendRCMM(uint64_t data, uint16_t nbits, uint16_t repeat) {
// http://www.sbprojects.com/knowledge/ir/rcmm.php
bool IRrecv::decodeRCMM(decode_results *results, uint16_t nbits, bool strict) {
uint64_t data = 0;
uint16_t offset = OFFSET_START;
uint16_t offset = kStartOffset;
if (results->rawlen <= 4)
return false; // Not enough entries to ever be RCMM.
@@ -120,43 +120,43 @@ bool IRrecv::decodeRCMM(decode_results *results, uint16_t nbits, bool strict) {
return false; // Short cut, we can never reach the expected nr. of bits.
}
// Header decode
if (!matchMark(results->rawbuf[offset], RCMM_HDR_MARK)) return false;
if (!matchMark(results->rawbuf[offset], kRcmmHdrMark)) return false;
// Calculate how long the common tick time is based on the header mark.
uint32_t m_tick = results->rawbuf[offset++] * RAWTICK / RCMM_HDR_MARK_TICKS;
if (!matchSpace(results->rawbuf[offset], RCMM_HDR_SPACE)) return false;
uint32_t m_tick = results->rawbuf[offset++] * kRawTick / kRcmmHdrMarkTicks;
if (!matchSpace(results->rawbuf[offset], kRcmmHdrSpace)) return false;
// Calculate how long the common tick time is based on the header space.
uint32_t s_tick = results->rawbuf[offset++] * RAWTICK / RCMM_HDR_SPACE_TICKS;
uint32_t s_tick = results->rawbuf[offset++] * kRawTick / kRcmmHdrSpaceTicks;
// Data decode
// RC-MM has two bits of data per mark/space pair.
uint16_t actualBits;
for (actualBits = 0; actualBits < maxBitSize; actualBits += 2, offset++) {
if (!match(results->rawbuf[offset++], RCMM_BIT_MARK_TICKS * m_tick))
if (!match(results->rawbuf[offset++], kRcmmBitMarkTicks * m_tick))
return false;
data <<= 2;
// Use non-default tolerance & excess for matching some of the spaces as the
// defaults are too generous and causes mis-matches in some cases.
if (match(results->rawbuf[offset], RCMM_BIT_SPACE_0_TICKS * s_tick,
TOLERANCE))
if (match(results->rawbuf[offset], kRcmmBitSpace0Ticks * s_tick,
kTolerance))
data += 0;
else if (match(results->rawbuf[offset], RCMM_BIT_SPACE_1_TICKS * s_tick,
TOLERANCE))
else if (match(results->rawbuf[offset], kRcmmBitSpace1Ticks * s_tick,
kTolerance))
data += 1;
else if (match(results->rawbuf[offset], RCMM_BIT_SPACE_2_TICKS * s_tick,
RCMM_TOLERANCE))
else if (match(results->rawbuf[offset], kRcmmBitSpace2Ticks * s_tick,
kRcmmTolerance))
data += 2;
else if (match(results->rawbuf[offset], RCMM_BIT_SPACE_3_TICKS * s_tick,
RCMM_TOLERANCE))
else if (match(results->rawbuf[offset], kRcmmBitSpace3Ticks * s_tick,
kRcmmTolerance))
data += 3;
else
return false;
}
// Footer decode
if (!match(results->rawbuf[offset++], RCMM_BIT_MARK_TICKS * m_tick))
if (!match(results->rawbuf[offset++], kRcmmBitMarkTicks * m_tick))
return false;
if (offset < results->rawlen &&
!matchAtLeast(results->rawbuf[offset], RCMM_MIN_GAP_TICKS * s_tick))
!matchAtLeast(results->rawbuf[offset], kRcmmMinGapTicks * s_tick))
return false;
// Compliance

515
src/ir_Samsung.cpp
View File

@@ -1,7 +1,11 @@
// Copyright 2009 Ken Shirriff
// Copyright 2017 David Conran
#include "ir_Samsung.h"
#include <algorithm>
#ifndef ARDUINO
#include <string>
#endif
#include "IRrecv.h"
#include "IRsend.h"
#include "IRutils.h"
@@ -17,29 +21,37 @@
// Constants
// Ref:
// http://elektrolab.wz.cz/katalog/samsung_protocol.pdf
#define SAMSUNG_TICK 560U
#define SAMSUNG_HDR_MARK_TICKS 8U
#define SAMSUNG_HDR_MARK (SAMSUNG_HDR_MARK_TICKS * SAMSUNG_TICK)
#define SAMSUNG_HDR_SPACE_TICKS 8U
#define SAMSUNG_HDR_SPACE (SAMSUNG_HDR_SPACE_TICKS * SAMSUNG_TICK)
#define SAMSUNG_BIT_MARK_TICKS 1U
#define SAMSUNG_BIT_MARK (SAMSUNG_BIT_MARK_TICKS * SAMSUNG_TICK)
#define SAMSUNG_ONE_SPACE_TICKS 3U
#define SAMSUNG_ONE_SPACE (SAMSUNG_ONE_SPACE_TICKS * SAMSUNG_TICK)
#define SAMSUNG_ZERO_SPACE_TICKS 1U
#define SAMSUNG_ZERO_SPACE (SAMSUNG_ZERO_SPACE_TICKS * SAMSUNG_TICK)
#define SAMSUNG_RPT_SPACE_TICKS 4U
#define SAMSUNG_RPT_SPACE (SAMSUNG_RPT_SPACE_TICKS * SAMSUNG_TICK)
#define SAMSUNG_MIN_MESSAGE_LENGTH_TICKS 193U
#define SAMSUNG_MIN_MESSAGE_LENGTH (SAMSUNG_MIN_MESSAGE_LENGTH_TICKS * \
SAMSUNG_TICK)
#define SAMSUNG_MIN_GAP_TICKS (SAMSUNG_MIN_MESSAGE_LENGTH_TICKS - \
(SAMSUNG_HDR_MARK_TICKS + SAMSUNG_HDR_SPACE_TICKS + \
SAMSUNG_BITS * (SAMSUNG_BIT_MARK_TICKS + SAMSUNG_ONE_SPACE_TICKS) + \
SAMSUNG_BIT_MARK_TICKS))
#define SAMSUNG_MIN_GAP (SAMSUNG_MIN_GAP_TICKS * SAMSUNG_TICK)
const uint16_t kSamsungTick = 560;
const uint16_t kSamsungHdrMarkTicks = 8;
const uint16_t kSamsungHdrMark = kSamsungHdrMarkTicks * kSamsungTick;
const uint16_t kSamsungHdrSpaceTicks = 8;
const uint16_t kSamsungHdrSpace = kSamsungHdrSpaceTicks * kSamsungTick;
const uint16_t kSamsungBitMarkTicks = 1;
const uint16_t kSamsungBitMark = kSamsungBitMarkTicks * kSamsungTick;
const uint16_t kSamsungOneSpaceTicks = 3;
const uint16_t kSamsungOneSpace = kSamsungOneSpaceTicks * kSamsungTick;
const uint16_t kSamsungZeroSpaceTicks = 1;
const uint16_t kSamsungZeroSpace = kSamsungZeroSpaceTicks * kSamsungTick;
const uint16_t kSamsungRptSpaceTicks = 4;
const uint16_t kSamsungRptSpace = kSamsungRptSpaceTicks * kSamsungTick;
const uint16_t kSamsungMinMessageLengthTicks = 193;
const uint32_t kSamsungMinMessageLength =
kSamsungMinMessageLengthTicks * kSamsungTick;
const uint16_t kSamsungMinGapTicks = kSamsungMinMessageLengthTicks -
(kSamsungHdrMarkTicks + kSamsungHdrSpaceTicks +
kSamsungBits * (kSamsungBitMarkTicks + kSamsungOneSpaceTicks) +
kSamsungBitMarkTicks);
const uint32_t kSamsungMinGap = kSamsungMinGapTicks * kSamsungTick;
const uint16_t kSamsungAcHdrMark = 690;
const uint16_t kSamsungAcHdrSpace = 17844;
const uint8_t kSamsungAcSections = 2;
const uint16_t kSamsungAcSectionMark = 3086;
const uint16_t kSamsungAcSectionSpace = 8864;
const uint16_t kSamsungAcSectionGap = 2886;
const uint16_t kSamsungAcBitMark = 586;
const uint16_t kSamsungAcOneSpace = 1432;
const uint16_t kSamsungAcZeroSpace = 436;
#if SEND_SAMSUNG
// Send a Samsung formatted message.
@@ -49,18 +61,18 @@
//
// Args:
// data: The message to be sent.
// nbits: The bit size of the message being sent. typically SAMSUNG_BITS.
// nbits: The bit size of the message being sent. typically kSamsungBits.
// repeat: The number of times the message is to be repeated.
//
// Status: BETA / Should be working.
//
// Ref: http://elektrolab.wz.cz/katalog/samsung_protocol.pdf
void IRsend::sendSAMSUNG(uint64_t data, uint16_t nbits, uint16_t repeat) {
sendGeneric(SAMSUNG_HDR_MARK, SAMSUNG_HDR_SPACE,
SAMSUNG_BIT_MARK, SAMSUNG_ONE_SPACE,
SAMSUNG_BIT_MARK, SAMSUNG_ZERO_SPACE,
SAMSUNG_BIT_MARK,
SAMSUNG_MIN_GAP, SAMSUNG_MIN_MESSAGE_LENGTH,
sendGeneric(kSamsungHdrMark, kSamsungHdrSpace,
kSamsungBitMark, kSamsungOneSpace,
kSamsungBitMark, kSamsungZeroSpace,
kSamsungBitMark,
kSamsungMinGap, kSamsungMinMessageLength,
data, nbits, 38, true, repeat, 33);
}
@@ -90,7 +102,7 @@ uint32_t IRsend::encodeSAMSUNG(uint8_t customer, uint8_t command) {
//
// Args:
// results: Ptr to the data to decode and where to store the decode result.
// nbits: Nr. of bits to expect in the data portion. Typically SAMSUNG_BITS.
// nbits: Nr. of bits to expect in the data portion. Typically kSamsungBits.
// strict: Flag to indicate if we strictly adhere to the specification.
// Returns:
// boolean: True if it can decode it, false if it can't.
@@ -104,37 +116,37 @@ uint32_t IRsend::encodeSAMSUNG(uint8_t customer, uint8_t command) {
// http://elektrolab.wz.cz/katalog/samsung_protocol.pdf
bool IRrecv::decodeSAMSUNG(decode_results *results, uint16_t nbits,
bool strict) {
if (results->rawlen < 2 * nbits + HEADER + FOOTER - 1)
if (results->rawlen < 2 * nbits + kHeader + kFooter - 1)
return false; // Can't possibly be a valid Samsung message.
if (strict && nbits != SAMSUNG_BITS)
if (strict && nbits != kSamsungBits)
return false; // We expect Samsung to be 32 bits of message.
uint64_t data = 0;
uint16_t offset = OFFSET_START;
uint16_t offset = kStartOffset;
// Header
if (!matchMark(results->rawbuf[offset], SAMSUNG_HDR_MARK)) return false;
if (!matchMark(results->rawbuf[offset], kSamsungHdrMark)) return false;
// Calculate how long the common tick time is based on the header mark.
uint32_t m_tick = results->rawbuf[offset++] * RAWTICK /
SAMSUNG_HDR_MARK_TICKS;
if (!matchSpace(results->rawbuf[offset], SAMSUNG_HDR_SPACE)) return false;
uint32_t m_tick = results->rawbuf[offset++] * kRawTick /
kSamsungHdrMarkTicks;
if (!matchSpace(results->rawbuf[offset], kSamsungHdrSpace)) return false;
// Calculate how long the common tick time is based on the header space.
uint32_t s_tick = results->rawbuf[offset++] * RAWTICK /
SAMSUNG_HDR_SPACE_TICKS;
uint32_t s_tick = results->rawbuf[offset++] * kRawTick /
kSamsungHdrSpaceTicks;
// Data
match_result_t data_result = matchData(&(results->rawbuf[offset]), nbits,
SAMSUNG_BIT_MARK_TICKS * m_tick,
SAMSUNG_ONE_SPACE_TICKS * s_tick,
SAMSUNG_BIT_MARK_TICKS * m_tick,
SAMSUNG_ZERO_SPACE_TICKS * s_tick);
kSamsungBitMarkTicks * m_tick,
kSamsungOneSpaceTicks * s_tick,
kSamsungBitMarkTicks * m_tick,
kSamsungZeroSpaceTicks * s_tick);
if (data_result.success == false) return false;
data = data_result.data;
offset += data_result.used;
// Footer
if (!matchMark(results->rawbuf[offset++], SAMSUNG_BIT_MARK_TICKS * m_tick))
if (!matchMark(results->rawbuf[offset++], kSamsungBitMarkTicks * m_tick))
return false;
if (offset < results->rawlen &&
!matchAtLeast(results->rawbuf[offset], SAMSUNG_MIN_GAP_TICKS * s_tick))
!matchAtLeast(results->rawbuf[offset], kSamsungMinGapTicks * s_tick))
return false;
// Compliance
@@ -160,3 +172,418 @@ bool IRrecv::decodeSAMSUNG(decode_results *results, uint16_t nbits,
return true;
}
#endif
#if SEND_SAMSUNG_AC
// Send a Samsung A/C message.
//
// Args:
// data: An array of bytes containing the IR command.
// nbytes: Nr. of bytes of data in the array. (>=kSamsungAcStateLength)
// repeat: Nr. of times the message is to be repeated. (Default = 0).
//
// Status: ALPHA / Untested.
//
// Ref:
// https://github.com/markszabo/IRremoteESP8266/issues/505
void IRsend::sendSamsungAC(uint8_t data[], uint16_t nbytes, uint16_t repeat) {
if (nbytes < kSamsungAcStateLength)
return; // Not enough bytes to send a proper message.
enableIROut(38);
for (uint16_t r = 0; r <= repeat; r++) {
// Header
mark(kSamsungAcHdrMark);
space(kSamsungAcHdrSpace);
// Section 1
sendGeneric(kSamsungAcSectionMark, kSamsungAcSectionSpace,
kSamsungAcBitMark, kSamsungAcOneSpace,
kSamsungAcBitMark, kSamsungAcZeroSpace,
kSamsungAcBitMark, kSamsungAcSectionGap,
data, 7, // 7 bytes == 56 bits
38000,
false, 0, 50); // Send in LSBF order
// Section 2
sendGeneric(kSamsungAcSectionMark, kSamsungAcSectionSpace,
kSamsungAcBitMark, kSamsungAcOneSpace,
kSamsungAcBitMark, kSamsungAcZeroSpace,
kSamsungAcBitMark,
100000, // Complete made up guess at inter-message gap.
data + 7, 7, // 7 bytes == 56 bits
38000,
false, 0, 50); // Send in LSBF order
}
}
#endif // SEND_SAMSUNG_AC
IRSamsungAc::IRSamsungAc(uint16_t pin) : _irsend(pin) {
stateReset();
}
void IRSamsungAc::stateReset() {
for (uint8_t i = 0; i < kSamsungAcStateLength; i++)
remote_state[i] = 0x0;
remote_state[0] = 0x02;
remote_state[1] = 0x92;
remote_state[2] = 0x0F;
remote_state[6] = 0xF0;
remote_state[7] = 0x01;
remote_state[8] = 0x02;
remote_state[9] = 0xAF;
remote_state[10] = 0x71;
remote_state[12] = 0x15;
remote_state[13] = 0xF0;
}
void IRSamsungAc::begin() {
_irsend.begin();
}
uint8_t IRSamsungAc::calcChecksum(
const uint8_t state[], const uint16_t length) {
uint8_t sum = 0;
uint8_t currentbyte;
// Shamelessly inspired by:
// https://github.com/adafruit/Raw-IR-decoder-for-Arduino/pull/3/files
// Count most of the '1' bits after the checksum location.
for (uint8_t i = 9; i < length - 1; i++) {
currentbyte = state[i];
if (i == 9) currentbyte = state[9] & 0b11111110;
for (; currentbyte; currentbyte >>= 1)
if (currentbyte & 1) sum++;
}
return (28 - sum) & 0xF;
}
bool IRSamsungAc::validChecksum(const uint8_t state[],
const uint16_t length) {
if (length < 9) return true; // No checksum to compare with. Assume okay.
return (state[8] >> 4) == calcChecksum(state, length);
}
// Update the checksum for the internal state.
void IRSamsungAc::checksum(uint16_t length) {
if (length < 9) return;
remote_state[8] &= 0x0F;
remote_state[8] |= (calcChecksum(remote_state, length) << 4);
}
#if SEND_SAMSUNG_AC
void IRSamsungAc::send() {
checksum();
_irsend.sendSamsungAC(remote_state);
}
#endif // SEND_SAMSUNG_AC
uint8_t* IRSamsungAc::getRaw() {
checksum();
return remote_state;
}
void IRSamsungAc::setRaw(const uint8_t new_code[]) {
for (uint8_t i = 0; i < kSamsungAcStateLength; i++) {
remote_state[i] = new_code[i];
}
}
void IRSamsungAc::on() {
remote_state[1] &= ~kSamsungAcPowerMask1;
remote_state[6] |= kSamsungAcPowerMask2;
}
void IRSamsungAc::off() {
remote_state[1] |= kSamsungAcPowerMask1;
remote_state[6] &= ~kSamsungAcPowerMask2;
}
void IRSamsungAc::setPower(const bool state) {
if (state)
on();
else
off();
}
bool IRSamsungAc::getPower() {
return ((remote_state[6] & kSamsungAcPowerMask2) != 0) &&
((remote_state[1] & kSamsungAcPowerMask1) == 0);
}
// Set the temp. in deg C
void IRSamsungAc::setTemp(const uint8_t temp) {
uint8_t newtemp = std::max(kSamsungAcMinTemp, temp);
newtemp = std::min(kSamsungAcMaxTemp, newtemp);
remote_state[11] = (remote_state[11] & ~kSamsungAcTempMask) |
((newtemp - kSamsungAcMinTemp) << 4);
}
// Return the set temp. in deg C
uint8_t IRSamsungAc::getTemp() {
return ((remote_state[11] & kSamsungAcTempMask) >> 4) + kSamsungAcMinTemp;
}
void IRSamsungAc::setMode(const uint8_t mode) {
// If we get an unexpected mode, default to AUTO.
uint8_t newmode = mode;
if (newmode > kSamsungAcHeat) newmode = kSamsungAcAuto;
remote_state[12] = (remote_state[12] & ~kSamsungAcModeMask) | (newmode << 4);
// Auto mode has a special fan setting valid only in auto mode.
if (newmode == kSamsungAcAuto) {
setFan(kSamsungAcFanAuto2);
} else {
if (getFan() == kSamsungAcFanAuto2) // Non-Auto can't have this fan setting
setFan(kSamsungAcFanAuto); // Default to something safe.
}
}
uint8_t IRSamsungAc::getMode() {
return ((remote_state[12] & kSamsungAcModeMask) >> 4);
}
void IRSamsungAc::setFan(const uint8_t speed) {
switch (speed) {
case kSamsungAcFanAuto:
case kSamsungAcFanLow:
case kSamsungAcFanMed:
case kSamsungAcFanHigh:
case kSamsungAcFanTurbo:
if (getMode() == kSamsungAcAuto) return; // Not valid in Auto mode.
break;
case kSamsungAcFanAuto2: // Special fan setting for when in Auto mode.
if (getMode() != kSamsungAcAuto) return;
break;
default:
return;
}
remote_state[12] = (remote_state[12] & ~kSamsungAcFanMask) | (speed << 1);
}
uint8_t IRSamsungAc::getFan() {
return ((remote_state[12] & kSamsungAcFanMask) >> 1);
}
bool IRSamsungAc::getSwing() {
return (remote_state[8] & kSamsungAcSwingMask) == (kSamsungAcSwingMove << 4);
}
void IRSamsungAc::setSwing(const bool state) {
remote_state[8] &= ~kSamsungAcSwingMask; // Clear the previous swing state.
if (state)
remote_state[8] |= (kSamsungAcSwingMove << 4);
else
remote_state[8] |= (kSamsungAcSwingStop << 4);
}
bool IRSamsungAc::getBeep() {
return remote_state[13] & kSamsungAcBeepMask;
}
void IRSamsungAc::setBeep(const bool state) {
if (state)
remote_state[13] |= kSamsungAcBeepMask;
else
remote_state[13] &= ~kSamsungAcBeepMask;
}
bool IRSamsungAc::getClean() {
return (remote_state[10] & kSamsungAcCleanMask10) &&
(remote_state[11] & kSamsungAcCleanMask11);
}
void IRSamsungAc::setClean(const bool state) {
if (state) {
remote_state[10] |= kSamsungAcCleanMask10;
remote_state[11] |= kSamsungAcCleanMask11;
} else {
remote_state[10] &= ~kSamsungAcCleanMask10;
remote_state[11] &= ~kSamsungAcCleanMask11;
}
}
// Very unsure this is correct.
bool IRSamsungAc::getQuiet() {
return remote_state[11] & kSamsungAcQuietMask11;
}
// Very unsure this is correct.
void IRSamsungAc::setQuiet(const bool state) {
if (state) {
remote_state[11] |= kSamsungAcQuietMask11;
setFan(kSamsungAcFanAuto); // Quiet mode seems to set fan speed to auto.
} else {
remote_state[11] &= ~kSamsungAcQuietMask11;
}
}
// Convert the internal state into a human readable string.
#ifdef ARDUINO
String IRSamsungAc::toString() {
String result = "";
#else
std::string IRSamsungAc::toString() {
std::string result = "";
#endif // ARDUINO
result += "Power: ";
if (getPower())
result += "On";
else
result += "Off";
result += ", Mode: " + uint64ToString(getMode());
switch (getMode()) {
case kSamsungAcAuto:
result += " (AUTO)";
break;
case kSamsungAcCool:
result += " (COOL)";
break;
case kSamsungAcHeat:
result += " (HEAT)";
break;
case kSamsungAcDry:
result += " (DRY)";
break;
case kSamsungAcFan:
result += " (FAN)";
break;
default:
result += " (UNKNOWN)";
}
result += ", Temp: " + uint64ToString(getTemp()) + "C";
result += ", Fan: " + uint64ToString(getFan());
switch (getFan()) {
case kSamsungAcFanAuto:
case kSamsungAcFanAuto2:
result += " (AUTO)";
break;
case kSamsungAcFanLow:
result += " (LOW)";
break;
case kSamsungAcFanMed:
result += " (MED)";
break;
case kSamsungAcFanHigh:
result += " (HIGH)";
break;
case kSamsungAcFanTurbo:
result += " (TURBO)";
break;
default:
result += " (UNKNOWN)";
break;
}
result += ", Swing: ";
if (getSwing())
result += "On";
else
result += "Off";
result += ", Beep: ";
if (getBeep())
result += "On";
else
result += "Off";
result += ", Clean: ";
if (getBeep())
result += "On";
else
result += "Off";
result += ", Quiet: ";
if (getQuiet())
result += "On";
else
result += "Off";
return result;
}
#if DECODE_SAMSUNG_AC
// Decode the supplied Samsung A/C message.
//
// Args:
// results: Ptr to the data to decode and where to store the decode result.
// nbits: The number of data bits to expect. Typically kSamsungAcBits
// strict: Flag indicating if we should perform strict matching.
// Returns:
// boolean: True if it can decode it, false if it can't.
//
// Status: ALPHA / Untested.
//
//
// Ref:
// https://github.com/markszabo/IRremoteESP8266/issues/505
bool IRrecv::decodeSamsungAC(decode_results *results, uint16_t nbits,
bool strict) {
if (results->rawlen < 2 * nbits + kHeader * 3 + kFooter * 2 - 1)
return false; // Can't possibly be a valid Samsung A/C message.
if (strict) {
if (nbits != kSamsungAcBits)
return false;
}
uint16_t offset = kStartOffset;
uint16_t dataBitsSoFar = 0;
match_result_t data_result;
// Message Header
if (!matchMark(results->rawbuf[offset++], kSamsungAcBitMark))
return false;
if (!matchSpace(results->rawbuf[offset++], kSamsungAcHdrSpace))
return false;
// Section(s)
for (uint8_t section = 0, pos = 7, i = 0;
section < kSamsungAcSections;
section++, pos += 7) {
// Section Header
if (!matchMark(results->rawbuf[offset++], kSamsungAcSectionMark))
return false;
if (!matchSpace(results->rawbuf[offset++], kSamsungAcSectionSpace))
return false;
// Section Data
// Keep reading bytes until we either run out of section or state to fill.
for (; offset <= results->rawlen - 16 && i < pos;
i++, dataBitsSoFar += 8, offset += data_result.used) {
data_result = matchData(&(results->rawbuf[offset]), 8,
kSamsungAcBitMark,
kSamsungAcOneSpace,
kSamsungAcBitMark,
kSamsungAcZeroSpace,
kTolerance, 0, false);
if (data_result.success == false) {
DPRINT("DEBUG: offset = ");
DPRINTLN(offset + data_result.used);
return false; // Fail
}
results->state[i] = data_result.data;
}
// Section Footer
if (!matchMark(results->rawbuf[offset++], kSamsungAcBitMark))
return false;
if (section < kSamsungAcSections - 1) { // Inter-section gap.
if (!matchSpace(results->rawbuf[offset++], kSamsungAcSectionGap))
return false;
} else { // Last section / End of message gap.
if (offset <= results->rawlen &&
!matchAtLeast(results->rawbuf[offset++], kSamsungAcSectionGap))
return false;
}
}
// Compliance
if (strict) {
// Re-check we got the correct size/length due to the way we read the data.
if (dataBitsSoFar != kSamsungAcBits) return false;
// Is the model signature correct?
if (results->state[0] != 0x02 || results->state[1] != 0x92 ||
results->state[2] != 0x0F)
return false;
// Is the checksum valid?
if (!IRSamsungAc::validChecksum(results->state)) return false;
}
// Success
results->decode_type = SAMSUNG_AC;
results->bits = dataBitsSoFar;
// No need to record the state as we stored it as we decoded it.
// As we use result->state, we don't record value, address, or command as it
// is a union data type.
return true;
}
#endif // DECODE_SAMSUNG_AC

103
src/ir_Samsung.h Normal file
View File

@@ -0,0 +1,103 @@
// Samsung A/C
//
// Copyright 2018 David Conran
#ifndef IR_SAMSUNG_H_
#define IR_SAMSUNG_H_
#define __STDC_LIMIT_MACROS
#include <stdint.h>
#ifndef UNIT_TEST
#include <Arduino.h>
#else
#include <string>
#endif
#include "IRremoteESP8266.h"
#include "IRsend.h"
// SSSS AAA MMM SSSS U U N N GGGG
// S A A M M M S U U NN N G
// SSS AAAAA M M M SSS U U N N N G GG
// S A A M M S U U N NN G G
// SSSS A A M M SSSS UUU N N GGG
// Ref:
// https://github.com/markszabo/IRremoteESP8266/issues/505
// Constants
const uint8_t kSamsungAcAuto = 0;
const uint8_t kSamsungAcCool = 1;
const uint8_t kSamsungAcDry = 2;
const uint8_t kSamsungAcFan = 3;
const uint8_t kSamsungAcHeat = 4;
const uint8_t kSamsungAcModeMask = 0x70;
const uint8_t kSamsungAcFanAuto = 0;
const uint8_t kSamsungAcFanLow = 2;
const uint8_t kSamsungAcFanMed = 4;
const uint8_t kSamsungAcFanHigh = 5;
const uint8_t kSamsungAcFanAuto2 = 6;
const uint8_t kSamsungAcFanTurbo = 7;
const uint8_t kSamsungAcMinTemp = 16; // 16C
const uint8_t kSamsungAcMaxTemp = 30; // 30C
const uint8_t kSamsungAcAutoTemp = 25; // 25C
const uint8_t kSamsungAcTempMask = 0xF0;
const uint8_t kSamsungAcPowerMask1 = 0x20;
const uint8_t kSamsungAcPowerMask2 = 0x30;
const uint8_t kSamsungAcFanMask = 0x0E;
const uint8_t kSamsungAcSwingMask = 0x70;
const uint8_t kSamsungAcSwingMove = 0b010;
const uint8_t kSamsungAcSwingStop = 0b111;
const uint8_t kSamsungAcBeepMask = 0x02;
const uint8_t kSamsungAcCleanMask10 = 0x80;
const uint8_t kSamsungAcCleanMask11 = 0x02;
const uint8_t kSamsungAcQuietMask11 = 0x01;
// Classes
class IRSamsungAc {
public:
explicit IRSamsungAc(uint16_t pin);
void stateReset();
#if SEND_SAMSUNG_AC
void send();
#endif // SEND_SAMSUNG_AC
void begin();
void on();
void off();
void setPower(const bool state);
bool getPower();
void setTemp(const uint8_t temp);
uint8_t getTemp();
void setFan(const uint8_t speed);
uint8_t getFan();
void setMode(const uint8_t mode);
uint8_t getMode();
void setSwing(const bool state);
bool getSwing();
void setBeep(const bool state);
bool getBeep();
void setClean(const bool state);
bool getClean();
void setQuiet(const bool state);
bool getQuiet();
uint8_t* getRaw();
void setRaw(const uint8_t new_code[]);
static bool validChecksum(const uint8_t state[],
const uint16_t length = kSamsungAcStateLength);
static uint8_t calcChecksum(const uint8_t state[],
const uint16_t length = kSamsungAcStateLength);
#ifdef ARDUINO
String toString();
#else
std::string toString();
#endif
private:
// The state of the IR remote in IR code form.
uint8_t remote_state[kSamsungAcStateLength];
void checksum(const uint16_t length = kSamsungAcStateLength);
IRsend _irsend;
};
#endif // IR_SAMSUNG_H_

94
src/ir_Sanyo.cpp
View File

@@ -20,31 +20,33 @@
// Sanyo SA 8650B
// Ref:
// https://github.com/z3t0/Arduino-IRremote/blob/master/ir_Sanyo.cpp
#define SANYO_SA8650B_HDR_MARK 3500U // seen range 3500
#define SANYO_SA8650B_HDR_SPACE 950U // seen 950
#define SANYO_SA8650B_ONE_MARK 2400U // seen 2400
#define SANYO_SA8650B_ZERO_MARK 700U // seen 700
const uint16_t kSanyoSa8650bHdrMark = 3500; // seen range 3500
const uint16_t kSanyoSa8650bHdrSpace = 950; // seen 950
const uint16_t kSanyoSa8650bOneMark = 2400; // seen 2400
const uint16_t kSanyoSa8650bZeroMark = 700; // seen 700
// usually see 713 - not using ticks as get number wrapround
#define SANYO_SA8650B_DOUBLE_SPACE_USECS 800U
#define SANYO_SA8650B_RPT_LENGTH 45000U
const uint16_t kSanyoSa8650bDoubleSpaceUsecs = 800;
const uint16_t kSanyoSa8650bRptLength = 45000;
// Sanyo LC7461
// Ref:
// https://github.com/marcosamarinho/IRremoteESP8266/blob/master/ir_Sanyo.cpp
// http://slydiman.narod.ru/scr/kb/sanyo.htm
// http://pdf.datasheetcatalog.com/datasheet/sanyo/LC7461.pdf
#define SANYO_LC7461_ADDRESS_MASK ((1 << SANYO_LC7461_ADDRESS_BITS) - 1)
#define SANYO_LC7461_COMMAND_MASK ((1 << SANYO_LC7461_COMMAND_BITS) - 1)
#define SANYO_LC7461_HDR_MARK 9000U
#define SANYO_LC7461_HDR_SPACE 4500U
#define SANYO_LC7461_BIT_MARK 560U // 1T
#define SANYO_LC7461_ONE_SPACE 1690U // 3T
#define SANYO_LC7461_ZERO_SPACE 560U // 1T
#define SANYO_LC7461_MIN_COMMAND_LENGTH 108000UL
#define SANYO_LC7461_MIN_GAP SANYO_LC7461_MIN_COMMAND_LENGTH - \
(SANYO_LC7461_HDR_MARK + SANYO_LC7461_HDR_SPACE + SANYO_LC7461_BITS * \
(SANYO_LC7461_BIT_MARK + (SANYO_LC7461_ONE_SPACE + \
SANYO_LC7461_ZERO_SPACE) / 2) \
+ SANYO_LC7461_BIT_MARK)
const uint16_t kSanyoLc7461AddressMask = (1 << kSanyoLC7461AddressBits) - 1;
const uint16_t kSanyoLc7461CommandMask = (1 << kSanyoLC7461CommandBits) - 1;
const uint16_t kSanyoLc7461HdrMark = 9000;
const uint16_t kSanyoLc7461HdrSpace = 4500;
const uint16_t kSanyoLc7461BitMark = 560; // 1T
const uint16_t kSanyoLc7461OneSpace = 1690; // 3T
const uint16_t kSanyoLc7461ZeroSpace = 560; // 1T
const uint32_t kSanyoLc7461MinCommandLength = 108000;
const uint16_t kSanyoLc7461MinGap = kSanyoLc7461MinCommandLength -
(kSanyoLc7461HdrMark + kSanyoLc7461HdrSpace + kSanyoLC7461Bits *
(kSanyoLc7461BitMark + (kSanyoLc7461OneSpace + kSanyoLc7461ZeroSpace) / 2)
+ kSanyoLc7461BitMark);
#if SEND_SANYO
// Construct a Sanyo LC7461 message.
@@ -61,18 +63,18 @@
// According with LIRC, this protocol is used on Sanyo, Aiwa and Chinon
uint64_t IRsend::encodeSanyoLC7461(uint16_t address, uint8_t command) {
// Mask our input values to ensure the correct bit sizes.
address &= SANYO_LC7461_ADDRESS_MASK;
command &= SANYO_LC7461_COMMAND_MASK;
address &= kSanyoLc7461AddressMask;
command &= kSanyoLc7461CommandMask;
uint64_t data = address;
address ^= SANYO_LC7461_ADDRESS_MASK; // Invert the 13 LSBs.
address ^= kSanyoLc7461AddressMask; // Invert the 13 LSBs.
// Append the now inverted address.
data = (data << SANYO_LC7461_ADDRESS_BITS) | address;
data = (data << kSanyoLC7461AddressBits) | address;
// Append the command.
data = (data << SANYO_LC7461_COMMAND_BITS) | command;
command ^= SANYO_LC7461_COMMAND_MASK; // Invert the command.
data = (data << kSanyoLC7461CommandBits) | command;
command ^= kSanyoLc7461CommandMask; // Invert the command.
// Append the now inverted command.
data = (data << SANYO_LC7461_COMMAND_BITS) | command;
data = (data << kSanyoLC7461CommandBits) | command;
return data;
}
@@ -127,31 +129,31 @@ void IRsend::sendSanyoLC7461(uint64_t data, uint16_t nbits, uint16_t repeat) {
// http://pdf.datasheetcatalog.com/datasheet/sanyo/LC7461.pdf
bool IRrecv::decodeSanyoLC7461(decode_results *results, uint16_t nbits,
bool strict) {
if (strict && nbits != SANYO_LC7461_BITS)
if (strict && nbits != kSanyoLC7461Bits)
return false; // Not strictly in spec.
// This protocol is basically a 42-bit variant of the NEC protocol.
if (!decodeNEC(results, nbits, false))
return false; // Didn't match a NEC format (without strict)
// Bits 30 to 42+.
uint16_t address = results->value >> (SANYO_LC7461_BITS -
SANYO_LC7461_ADDRESS_BITS);
uint16_t address = results->value >> (kSanyoLC7461Bits -
kSanyoLC7461AddressBits);
// Bits 9 to 16.
uint8_t command = (results->value >> SANYO_LC7461_COMMAND_BITS) &
SANYO_LC7461_COMMAND_MASK;
uint8_t command = (results->value >> kSanyoLC7461CommandBits) &
kSanyoLc7461CommandMask;
// Compliance
if (strict) {
if (results->bits != nbits)
return false;
// Bits 17 to 29.
uint16_t inverted_address =
(results->value >> (SANYO_LC7461_COMMAND_BITS * 2)) &
SANYO_LC7461_ADDRESS_MASK;
(results->value >> (kSanyoLC7461CommandBits * 2)) &
kSanyoLc7461AddressMask;
// Bits 1-8.
uint8_t inverted_command = results->value & SANYO_LC7461_COMMAND_MASK;
if ((address ^ SANYO_LC7461_ADDRESS_MASK) != inverted_address)
uint8_t inverted_command = results->value & kSanyoLc7461CommandMask;
if ((address ^ kSanyoLc7461AddressMask) != inverted_address)
return false; // Address integrity check failed.
if ((command ^ SANYO_LC7461_COMMAND_MASK) != inverted_command)
if ((command ^ kSanyoLc7461CommandMask) != inverted_command)
return false; // Command integrity check failed.
}
@@ -182,9 +184,9 @@ bool IRrecv::decodeSanyoLC7461(decode_results *results, uint16_t nbits,
// Ref:
// https://github.com/z3t0/Arduino-IRremote/blob/master/ir_Sanyo.cpp
bool IRrecv::decodeSanyo(decode_results *results, uint16_t nbits, bool strict) {
if (results->rawlen < 2 * nbits + HEADER - 1)
if (results->rawlen < 2 * nbits + kHeader - 1)
return false; // Shorter than shortest possible.
if (strict && nbits != SANYO_SA8650B_BITS)
if (strict && nbits != kSanyoSA8650BBits)
return false; // Doesn't match the spec.
uint16_t offset = 0;
@@ -192,9 +194,9 @@ bool IRrecv::decodeSanyo(decode_results *results, uint16_t nbits, bool strict) {
// TODO(crankyoldgit): This repeat code looks like garbage, it should never
// match or if it does, it won't be reliable. We should probably just
// remove it.
if (results->rawbuf[offset++] < SANYO_SA8650B_DOUBLE_SPACE_USECS) {
if (results->rawbuf[offset++] < kSanyoSa8650bDoubleSpaceUsecs) {
results->bits = 0;
results->value = REPEAT;
results->value = kRepeat;
results->decode_type = SANYO;
results->address = 0;
results->command = 0;
@@ -203,27 +205,27 @@ bool IRrecv::decodeSanyo(decode_results *results, uint16_t nbits, bool strict) {
}
// Header
if (!matchMark(results->rawbuf[offset++], SANYO_SA8650B_HDR_MARK))
if (!matchMark(results->rawbuf[offset++], kSanyoSa8650bHdrMark))
return false;
// NOTE: These next two lines look very wrong. Treat as suspect.
if (!matchMark(results->rawbuf[offset++], SANYO_SA8650B_HDR_MARK))
if (!matchMark(results->rawbuf[offset++], kSanyoSa8650bHdrMark))
return false;
// Data
uint64_t data = 0;
while (offset + 1 < results->rawlen) {
if (!matchSpace(results->rawbuf[offset], SANYO_SA8650B_HDR_SPACE))
if (!matchSpace(results->rawbuf[offset], kSanyoSa8650bHdrSpace))
break;
offset++;
if (matchMark(results->rawbuf[offset], SANYO_SA8650B_ONE_MARK))
if (matchMark(results->rawbuf[offset], kSanyoSa8650bOneMark))
data = (data << 1) | 1; // 1
else if (matchMark(results->rawbuf[offset], SANYO_SA8650B_ZERO_MARK))
else if (matchMark(results->rawbuf[offset], kSanyoSa8650bZeroMark))
data <<= 1; // 0
else
return false;
offset++;
}
if (strict && SANYO_SA8650B_BITS > (offset - 1U) / 2U)
if (strict && kSanyoSA8650BBits > (offset - 1U) / 2U)
return false;
// Success

34
src/ir_Sharp.cpp
View File

@@ -33,16 +33,16 @@
#define SHARP_GAP (SHARP_GAP_TICKS * SHARP_TICK)
// Address(5) + Command(8) + Expansion(1) + Check(1)
#define SHARP_TOGGLE_MASK ((1 << (SHARP_BITS - SHARP_ADDRESS_BITS)) - 1)
#define SHARP_ADDRESS_MASK ((1 << SHARP_ADDRESS_BITS) - 1)
#define SHARP_COMMAND_MASK ((1 << SHARP_COMMAND_BITS) - 1)
#define SHARP_TOGGLE_MASK ((1 << (kSharpBits - kSharpAddressBits)) - 1)
#define SHARP_ADDRESS_MASK ((1 << kSharpAddressBits) - 1)
#define SHARP_COMMAND_MASK ((1 << kSharpCommandBits) - 1)
#if (SEND_SHARP || SEND_DENON)
// Send a (raw) Sharp message
//
// Args:
// data: Contents of the message to be sent.
// nbits: Nr. of bits of data to be sent. Typically SHARP_BITS.
// nbits: Nr. of bits of data to be sent. Typically kSharpBits.
// repeat: Nr. of additional times the message is to be sent.
//
// Status: BETA / Previously working fine.
@@ -107,17 +107,17 @@ uint32_t IRsend::encodeSharp(uint16_t address, uint16_t command,
uint16_t expansion, uint16_t check,
bool MSBfirst) {
// Mask any unexpected bits.
address &= ((1 << SHARP_ADDRESS_BITS) - 1);
command &= ((1 << SHARP_COMMAND_BITS) - 1);
address &= ((1 << kSharpAddressBits) - 1);
command &= ((1 << kSharpCommandBits) - 1);
expansion &= 1;
check &= 1;
if (!MSBfirst) { // Correct bit order if needed.
address = reverseBits(address, SHARP_ADDRESS_BITS);
command = reverseBits(command, SHARP_COMMAND_BITS);
address = reverseBits(address, kSharpAddressBits);
command = reverseBits(command, kSharpCommandBits);
}
// Concatinate all the bits.
return (address << (SHARP_COMMAND_BITS + 2)) | (command << 2) |
return (address << (kSharpCommandBits + 2)) | (command << 2) |
(expansion << 1) | check;
}
@@ -126,7 +126,7 @@ uint32_t IRsend::encodeSharp(uint16_t address, uint16_t command,
// Args:
// address: Address value to be sent.
// command: Command value to be sent.
// nbits: Nr. of bits of data to be sent. Typically SHARP_BITS.
// nbits: Nr. of bits of data to be sent. Typically kSharpBits.
// repeat: Nr. of additional times the message is to be sent.
//
// Status: DEPRICATED / Previously working fine.
@@ -156,7 +156,7 @@ void IRsend::sendSharp(uint16_t address, uint16_t command, uint16_t nbits,
//
// Args:
// results: Ptr to the data to decode and where to store the decode result.
// nbits: Nr. of data bits to expect. Typically SHARP_BITS.
// nbits: Nr. of data bits to expect. Typically kSharpBits.
// strict: Flag indicating if we should perform strict matching.
// expansion: Should we expect the expansion bit to be set. Default is true.
// Returns:
@@ -175,29 +175,29 @@ void IRsend::sendSharp(uint16_t address, uint16_t command, uint16_t nbits,
// http://www.hifi-remote.com/johnsfine/DecodeIR.html#Sharp
bool IRrecv::decodeSharp(decode_results *results, uint16_t nbits, bool strict,
bool expansion) {
if (results->rawlen < 2 * nbits + FOOTER - 1)
if (results->rawlen < 2 * nbits + kFooter - 1)
return false; // Not enough entries to be a Sharp message.
// Compliance
if (strict) {
if (nbits != SHARP_BITS)
if (nbits != kSharpBits)
return false; // Request is out of spec.
// DISABLED - See TODO
#ifdef UNIT_TEST
// An in spec message has the data sent normally, then inverted. So we
// expect twice as many entries than to just get the results.
if (results->rawlen < 2 * (2 * nbits + FOOTER))
if (results->rawlen < 2 * (2 * nbits + kFooter))
return false;
#endif
}
uint64_t data = 0;
uint16_t offset = OFFSET_START;
uint16_t offset = kStartOffset;
// No header
// But try to auto-calibrate off the initial mark signal.
if (!matchMark(results->rawbuf[offset], SHARP_BIT_MARK, 35)) return false;
// Calculate how long the common tick time is based on the header mark.
uint32_t tick = results->rawbuf[offset] * RAWTICK / SHARP_BIT_MARK_TICKS;
uint32_t tick = results->rawbuf[offset] * kRawTick / SHARP_BIT_MARK_TICKS;
// Data
for (uint16_t i = 0; i < nbits; i++, offset++) {
// Use a higher tolerance value for SHARP_BIT_MARK as it is quite small.
@@ -269,7 +269,7 @@ bool IRrecv::decodeSharp(decode_results *results, uint16_t nbits, bool strict,
// Address & command are actually transmitted in LSB first order.
results->address = reverseBits(data, nbits) & SHARP_ADDRESS_MASK;
results->command = reverseBits((data >> 2) & SHARP_COMMAND_MASK,
SHARP_COMMAND_BITS);
kSharpCommandBits);
return true;
}
#endif // (DECODE_SHARP || DECODE_DENON)

6
src/ir_Sherwood.cpp
View File

@@ -14,16 +14,16 @@
//
// Args:
// data: The contents of the command you want to send.
// nbits: The bit size of the command being sent. (SHERWOOD_BITS)
// nbits: The bit size of the command being sent. (kSherwoodBits)
// repeat: The nr. of times you want the command to be repeated. (Default: 1)
//
// Status: STABLE / Known working.
//
// Note:
// Sherwood remote codes appear to be NEC codes with a manditory repeat code.
// i.e. repeat should be >= SHERWOOD_MIN_REPEAT (1).
// i.e. repeat should be >= kSherwoodMinRepeat (1).
void IRsend::sendSherwood(uint64_t data, uint16_t nbits,
uint16_t repeat) {
sendNEC(data, nbits, std::max((uint16_t) SHERWOOD_MIN_REPEAT, repeat));
sendNEC(data, nbits, std::max((uint16_t) kSherwoodMinRepeat, repeat));
}
#endif

62
src/ir_Sony.cpp
View File

@@ -19,19 +19,19 @@
// Constants
// Ref:
// http://www.sbprojects.com/knowledge/ir/sirc.php
#define SONY_TICK 200U
#define SONY_HDR_MARK_TICKS 12U
#define SONY_HDR_MARK (SONY_HDR_MARK_TICKS * SONY_TICK)
#define SONY_SPACE_TICKS 3U
#define SONY_SPACE (SONY_SPACE_TICKS * SONY_TICK)
#define SONY_ONE_MARK_TICKS 6U
#define SONY_ONE_MARK (SONY_ONE_MARK_TICKS * SONY_TICK)
#define SONY_ZERO_MARK_TICKS 3U
#define SONY_ZERO_MARK (SONY_ZERO_MARK_TICKS * SONY_TICK)
#define SONY_RPT_LENGTH_TICKS 225U
#define SONY_RPT_LENGTH (SONY_RPT_LENGTH_TICKS * SONY_TICK)
#define SONY_MIN_GAP_TICKS 50U
#define SONY_MIN_GAP (SONY_MIN_GAP_TICKS * SONY_TICK)
const uint16_t kSonyTick = 200;
const uint16_t kSonyHdrMarkTicks = 12;
const uint16_t kSonyHdrMark = kSonyHdrMarkTicks * kSonyTick;
const uint16_t kSonySpaceTicks = 3;
const uint16_t kSonySpace = kSonySpaceTicks * kSonyTick;
const uint16_t kSonyOneMarkTicks = 6;
const uint16_t kSonyOneMark = kSonyOneMarkTicks * kSonyTick;
const uint16_t kSonyZeroMarkTicks = 3;
const uint16_t kSonyZeroMark = kSonyZeroMarkTicks * kSonyTick;
const uint16_t kSonyRptLengthTicks = 225;
const uint16_t kSonyRptLength = kSonyRptLengthTicks * kSonyTick;
const uint16_t kSonyMinGapTicks = 50;
const uint16_t kSonyMinGap = kSonyMinGapTicks * kSonyTick;
#if SEND_SONY
// Send a Sony/SIRC(Serial Infra-Red Control) message.
@@ -50,11 +50,11 @@
// Ref:
// http://www.sbprojects.com/knowledge/ir/sirc.php
void IRsend::sendSony(uint64_t data, uint16_t nbits, uint16_t repeat) {
sendGeneric(SONY_HDR_MARK, SONY_SPACE,
SONY_ONE_MARK, SONY_SPACE,
SONY_ZERO_MARK, SONY_SPACE,
sendGeneric(kSonyHdrMark, kSonySpace,
kSonyOneMark, kSonySpace,
kSonyZeroMark, kSonySpace,
0, // No Footer mark.
SONY_MIN_GAP, SONY_RPT_LENGTH,
kSonyMinGap, kSonyRptLength,
data, nbits, 40, true, repeat, 33);
}
@@ -107,7 +107,7 @@ uint32_t IRsend::encodeSony(uint16_t nbits, uint16_t command,
// Ref:
// http://www.sbprojects.com/knowledge/ir/sirc.php
bool IRrecv::decodeSony(decode_results *results, uint16_t nbits, bool strict) {
if (results->rawlen < 2 * nbits + HEADER - 1)
if (results->rawlen < 2 * nbits + kHeader - 1)
return false; // Message is smaller than we expected.
// Compliance
@@ -123,31 +123,31 @@ bool IRrecv::decodeSony(decode_results *results, uint16_t nbits, bool strict) {
}
uint64_t data = 0;
uint16_t offset = OFFSET_START;
uint16_t offset = kStartOffset;
uint16_t actualBits;
uint32_t timeSoFar = 0; // Time in uSecs of the message length.
// Header
timeSoFar += results->rawbuf[offset] * RAWTICK;
if (!matchMark(results->rawbuf[offset], SONY_HDR_MARK))
timeSoFar += results->rawbuf[offset] * kRawTick;
if (!matchMark(results->rawbuf[offset], kSonyHdrMark))
return false;
// Calculate how long the common tick time is based on the header mark.
uint32_t tick = results->rawbuf[offset++] * RAWTICK / SONY_HDR_MARK_TICKS;
uint32_t tick = results->rawbuf[offset++] * kRawTick / kSonyHdrMarkTicks;
// Data
for (actualBits = 0; offset < results->rawlen - 1; actualBits++, offset++) {
// The gap after a Sony packet for a repeat should be SONY_MIN_GAP or
// (SONY_RPT_LENGTH - timeSoFar) according to the spec.
if (matchSpace(results->rawbuf[offset], SONY_MIN_GAP_TICKS * tick) ||
matchAtLeast(results->rawbuf[offset], SONY_RPT_LENGTH - timeSoFar))
// The gap after a Sony packet for a repeat should be kSonyMinGap or
// (kSonyRptLength - timeSoFar) according to the spec.
if (matchSpace(results->rawbuf[offset], kSonyMinGapTicks * tick) ||
matchAtLeast(results->rawbuf[offset], kSonyRptLength - timeSoFar))
break; // Found a repeat space.
timeSoFar += results->rawbuf[offset] * RAWTICK;
if (!matchSpace(results->rawbuf[offset++], SONY_SPACE_TICKS * tick))
timeSoFar += results->rawbuf[offset] * kRawTick;
if (!matchSpace(results->rawbuf[offset++], kSonySpaceTicks * tick))
return false;
timeSoFar += results->rawbuf[offset] * RAWTICK;
if (matchMark(results->rawbuf[offset], SONY_ONE_MARK_TICKS * tick))
timeSoFar += results->rawbuf[offset] * kRawTick;
if (matchMark(results->rawbuf[offset], kSonyOneMarkTicks * tick))
data = (data << 1) | 1;
else if (matchMark(results->rawbuf[offset], SONY_ZERO_MARK_TICKS * tick))
else if (matchMark(results->rawbuf[offset], kSonyZeroMarkTicks * tick))
data <<= 1;
else
return false;

102
src/ir_Toshiba.cpp
View File

@@ -28,32 +28,32 @@
// Toshiba A/C
// Ref:
// https://github.com/r45635/HVAC-IR-Control/blob/master/HVAC_ESP8266/HVAC_ESP8266T.ino#L77
#define TOSHIBA_AC_HDR_MARK 4400U
#define TOSHIBA_AC_HDR_SPACE 4300U
#define TOSHIBA_AC_BIT_MARK 543U
#define TOSHIBA_AC_ONE_SPACE 1623U
#define TOSHIBA_AC_ZERO_SPACE 472U
#define TOSHIBA_AC_MIN_GAP 7048U
const uint16_t kToshibaAcHdrMark = 4400;
const uint16_t kToshibaAcHdrSpace = 4300;
const uint16_t kToshibaAcBitMark = 543;
const uint16_t kToshibaAcOneSpace = 1623;
const uint16_t kToshibaAcZeroSpace = 472;
const uint16_t kToshibaAcMinGap = 7048;
#if SEND_TOSHIBA_AC
// Send a Toshiba A/C message.
//
// Args:
// data: An array of bytes containing the IR command.
// nbytes: Nr. of bytes of data in the array. (>=TOSHIBA_AC_STATE_LENGTH)
// nbytes: Nr. of bytes of data in the array. (>=kToshibaACStateLength)
// repeat: Nr. of times the message is to be repeated.
// (Default = TOSHIBA_AC_MIN_REPEAT).
// (Default = kToshibaACMinRepeat).
//
// Status: StABLE / Working.
//
void IRsend::sendToshibaAC(unsigned char data[], uint16_t nbytes,
uint16_t repeat) {
if (nbytes < TOSHIBA_AC_STATE_LENGTH)
if (nbytes < kToshibaACStateLength)
return; // Not enough bytes to send a proper message.
sendGeneric(TOSHIBA_AC_HDR_MARK, TOSHIBA_AC_HDR_SPACE,
TOSHIBA_AC_BIT_MARK, TOSHIBA_AC_ONE_SPACE,
TOSHIBA_AC_BIT_MARK, TOSHIBA_AC_ZERO_SPACE,
TOSHIBA_AC_BIT_MARK, TOSHIBA_AC_MIN_GAP,
sendGeneric(kToshibaAcHdrMark, kToshibaAcHdrSpace,
kToshibaAcBitMark, kToshibaAcOneSpace,
kToshibaAcBitMark, kToshibaAcZeroSpace,
kToshibaAcBitMark, kToshibaAcMinGap,
data, nbytes, 38, true, repeat, 50);
}
#endif // SEND_TOSHIBA_AC
@@ -75,14 +75,14 @@ void IRToshibaAC::stateReset() {
// Known good state obtained from:
// https://github.com/r45635/HVAC-IR-Control/blob/master/HVAC_ESP8266/HVAC_ESP8266T.ino#L103
// Note: Can't use the following because it requires -std=c++11
// uint8_t remote_state[TOSHIBA_AC_STATE_LENGTH] = {
// uint8_t remote_state[kToshibaACStateLength] = {
// 0xF2, 0x0D, 0x03, 0xFC, 0x01, 0x00, 0x00, 0x00, 0x00 };
remote_state[0] = 0xF2;
remote_state[1] = 0x0D;
remote_state[2] = 0x03;
remote_state[3] = 0xFC;
remote_state[4] = 0x01;
for (uint8_t i = 5; i < TOSHIBA_AC_STATE_LENGTH; i++)
for (uint8_t i = 5; i < kToshibaACStateLength; i++)
remote_state[i] = 0;
mode_state = remote_state[6] & 0b00000011;
checksum(); // Calculate the checksum
@@ -109,7 +109,7 @@ uint8_t* IRToshibaAC::getRaw() {
// Override the internal state with the new state.
void IRToshibaAC::setRaw(uint8_t newState[]) {
for (uint8_t i = 0; i < TOSHIBA_AC_STATE_LENGTH; i++) {
for (uint8_t i = 0; i < kToshibaACStateLength; i++) {
remote_state[i] = newState[i];
}
mode_state = getMode(true);
@@ -154,14 +154,14 @@ void IRToshibaAC::checksum(const uint16_t length) {
// Set the requested power state of the A/C to off.
void IRToshibaAC::on() {
// state = ON;
remote_state[6] &= ~TOSHIBA_AC_POWER;
remote_state[6] &= ~kToshibaAcPower;
setMode(mode_state);
}
// Set the requested power state of the A/C to off.
void IRToshibaAC::off() {
// state = OFF;
remote_state[6] |= (TOSHIBA_AC_POWER | 0b00000011);
remote_state[6] |= (kToshibaAcPower | 0b00000011);
}
// Set the requested power state of the A/C.
@@ -174,28 +174,28 @@ void IRToshibaAC::setPower(bool state) {
// Return the requested power state of the A/C.
bool IRToshibaAC::getPower() {
return((remote_state[6] & TOSHIBA_AC_POWER) == 0);
return((remote_state[6] & kToshibaAcPower) == 0);
}
// Set the temp. in deg C
void IRToshibaAC::setTemp(uint8_t temp) {
temp = std::max((uint8_t) TOSHIBA_AC_MIN_TEMP, temp);
temp = std::min((uint8_t) TOSHIBA_AC_MAX_TEMP, temp);
remote_state[5] = (temp - TOSHIBA_AC_MIN_TEMP) << 4;
temp = std::max((uint8_t) kToshibaAcMinTemp, temp);
temp = std::min((uint8_t) kToshibaAcMaxTemp, temp);
remote_state[5] = (temp - kToshibaAcMinTemp) << 4;
}
// Return the set temp. in deg C
uint8_t IRToshibaAC::getTemp() {
return((remote_state[5] >> 4) + TOSHIBA_AC_MIN_TEMP);
return((remote_state[5] >> 4) + kToshibaAcMinTemp);
}
// Set the speed of the fan, 0-5.
// 0 is auto, 1-5 is the speed, 5 is Max.
void IRToshibaAC::setFan(uint8_t fan) {
// Bounds check
if (fan > TOSHIBA_AC_FAN_MAX)
fan = TOSHIBA_AC_FAN_MAX; // Set the fan to maximum if out of range.
if (fan > TOSHIBA_AC_FAN_AUTO) fan++;
if (fan > kToshibaAcFanMax)
fan = kToshibaAcFanMax; // Set the fan to maximum if out of range.
if (fan > kToshibaAcFanAuto) fan++;
remote_state[6] &= 0b00011111; // Clear the previous fan state
remote_state[6] |= (fan << 5);
}
@@ -203,7 +203,7 @@ void IRToshibaAC::setFan(uint8_t fan) {
// Return the requested state of the unit's fan.
uint8_t IRToshibaAC::getFan() {
uint8_t fan = remote_state[6] >> 5;
if (fan == TOSHIBA_AC_FAN_AUTO) return TOSHIBA_AC_FAN_AUTO;
if (fan == kToshibaAcFanAuto) return kToshibaAcFanAuto;
return --fan;
}
@@ -223,11 +223,11 @@ uint8_t IRToshibaAC::getMode(bool useRaw) {
void IRToshibaAC::setMode(uint8_t mode) {
// If we get an unexpected mode, default to AUTO.
switch (mode) {
case TOSHIBA_AC_AUTO: break;
case TOSHIBA_AC_COOL: break;
case TOSHIBA_AC_DRY: break;
case TOSHIBA_AC_HEAT: break;
default: mode = TOSHIBA_AC_AUTO;
case kToshibaAcAuto: break;
case kToshibaAcCool: break;
case kToshibaAcDry: break;
case kToshibaAcHeat: break;
default: mode = kToshibaAcAuto;
}
mode_state = mode;
// Only adjust the remote_state if we have power set to on.
@@ -252,16 +252,16 @@ std::string IRToshibaAC::toString() {
result += "Off";
result += ", Mode: " + uint64ToString(getMode());
switch (getMode()) {
case TOSHIBA_AC_AUTO:
case kToshibaAcAuto:
result += " (AUTO)";
break;
case TOSHIBA_AC_COOL:
case kToshibaAcCool:
result += " (COOL)";
break;
case TOSHIBA_AC_HEAT:
case kToshibaAcHeat:
result += " (HEAT)";
break;
case TOSHIBA_AC_DRY:
case kToshibaAcDry:
result += " (DRY)";
break;
default:
@@ -270,10 +270,10 @@ std::string IRToshibaAC::toString() {
result += ", Temp: " + uint64ToString(getTemp()) + "C";
result += ", Fan: " + uint64ToString(getFan());
switch (getFan()) {
case TOSHIBA_AC_FAN_AUTO:
case kToshibaAcFanAuto:
result += " (AUTO)";
break;
case TOSHIBA_AC_FAN_MAX:
case kToshibaAcFanMax:
result += " (MAX)";
break;
}
@@ -285,7 +285,7 @@ std::string IRToshibaAC::toString() {
// Places successful decode information in the results pointer.
// Args:
// results: Ptr to the data to decode and where to store the decode result.
// nbits: The number of data bits to expect. Typically TOSHIBA_AC_BITS.
// nbits: The number of data bits to expect. Typically kToshibaACBits.
// strict: Flag to indicate if we strictly adhere to the specification.
// Returns:
// boolean: True if it can decode it, false if it can't.
@@ -296,32 +296,32 @@ std::string IRToshibaAC::toString() {
//
bool IRrecv::decodeToshibaAC(decode_results *results, uint16_t nbits,
bool strict) {
uint16_t offset = OFFSET_START;
uint16_t offset = kStartOffset;
uint16_t dataBitsSoFar = 0;
// Have we got enough data to successfully decode?
if (results->rawlen < TOSHIBA_AC_BITS + HEADER + FOOTER - 1)
if (results->rawlen < kToshibaACBits + kHeader + kFooter - 1)
return false; // Can't possibly be a valid message.
// Compliance
if (strict && nbits != TOSHIBA_AC_BITS)
if (strict && nbits != kToshibaACBits)
return false; // Must be called with the correct nr. of bytes.
// Header
if (!matchMark(results->rawbuf[offset++], TOSHIBA_AC_HDR_MARK))
if (!matchMark(results->rawbuf[offset++], kToshibaAcHdrMark))
return false;
if (!matchSpace(results->rawbuf[offset++], TOSHIBA_AC_HDR_SPACE))
if (!matchSpace(results->rawbuf[offset++], kToshibaAcHdrSpace))
return false;
// Data
for (uint8_t i = 0; i < TOSHIBA_AC_STATE_LENGTH; i++) {
for (uint8_t i = 0; i < kToshibaACStateLength; i++) {
// Read a byte's worth of data.
match_result_t data_result = matchData(&(results->rawbuf[offset]), 8,
TOSHIBA_AC_BIT_MARK,
TOSHIBA_AC_ONE_SPACE,
TOSHIBA_AC_BIT_MARK,
TOSHIBA_AC_ZERO_SPACE);
kToshibaAcBitMark,
kToshibaAcOneSpace,
kToshibaAcBitMark,
kToshibaAcZeroSpace);
if (data_result.success == false) return false; // Fail
dataBitsSoFar += 8;
results->state[i] = (uint8_t) data_result.data;
@@ -329,8 +329,8 @@ bool IRrecv::decodeToshibaAC(decode_results *results, uint16_t nbits,
}
// Footer
if (!matchMark(results->rawbuf[offset++], TOSHIBA_AC_BIT_MARK)) return false;
if (!matchSpace(results->rawbuf[offset++], TOSHIBA_AC_MIN_GAP)) return false;
if (!matchMark(results->rawbuf[offset++], kToshibaAcBitMark)) return false;
if (!matchSpace(results->rawbuf[offset++], kToshibaAcMinGap)) return false;
// Compliance
if (strict) {

37
src/ir_Toshiba.h
View File

@@ -21,15 +21,26 @@
// Toshiba A/C support added by David Conran
// Constants
#define TOSHIBA_AC_AUTO 0U
#define TOSHIBA_AC_COOL 1U
#define TOSHIBA_AC_DRY 2U
#define TOSHIBA_AC_HEAT 3U
#define TOSHIBA_AC_POWER 4U
#define TOSHIBA_AC_FAN_AUTO 0U
#define TOSHIBA_AC_FAN_MAX 5U
#define TOSHIBA_AC_MIN_TEMP 17U // 17C
#define TOSHIBA_AC_MAX_TEMP 30U // 30C
const uint8_t kToshibaAcAuto = 0;
const uint8_t kToshibaAcCool = 1;
const uint8_t kToshibaAcDry = 2;
const uint8_t kToshibaAcHeat = 3;
const uint8_t kToshibaAcPower = 4;
const uint8_t kToshibaAcFanAuto = 0;
const uint8_t kToshibaAcFanMax = 5;
const uint8_t kToshibaAcMinTemp = 17; // 17C
const uint8_t kToshibaAcMaxTemp = 30; // 30C
// Legacy defines. (Deperecated)
#define TOSHIBA_AC_AUTO kToshibaAcAuto
#define TOSHIBA_AC_COOL kToshibaAcCool
#define TOSHIBA_AC_DRY kToshibaAcDry
#define TOSHIBA_AC_HEAT kToshibaAcHeat
#define TOSHIBA_AC_POWER kToshibaAcPower
#define TOSHIBA_AC_FAN_AUTO kToshibaAcFanAuto
#define TOSHIBA_AC_FAN_MAX kToshibaAcFanMax
#define TOSHIBA_AC_MIN_TEMP kToshibaAcMinTemp
#define TOSHIBA_AC_MAX_TEMP kToshibaAcMaxTemp
class IRToshibaAC {
public:
@@ -53,7 +64,7 @@ class IRToshibaAC {
void setRaw(uint8_t newState[]);
uint8_t* getRaw();
static bool validChecksum(const uint8_t state[],
const uint16_t length = TOSHIBA_AC_STATE_LENGTH);
const uint16_t length = kToshibaACStateLength);
#ifdef ARDUINO
String toString();
#else
@@ -63,10 +74,10 @@ class IRToshibaAC {
private:
#endif
uint8_t remote_state[TOSHIBA_AC_STATE_LENGTH];
void checksum(const uint16_t length = TOSHIBA_AC_STATE_LENGTH);
uint8_t remote_state[kToshibaACStateLength];
void checksum(const uint16_t length = kToshibaACStateLength);
static uint8_t calcChecksum(const uint8_t state[],
const uint16_t length = TOSHIBA_AC_STATE_LENGTH);
const uint16_t length = kToshibaACStateLength);
uint8_t mode_state;
IRsend _irsend;
};

70
src/ir_Trotec.cpp
View File

@@ -5,33 +5,33 @@
#include "IRutils.h"
// Constants
#define TROTEC_HDR_MARK 5952U
#define TROTEC_HDR_SPACE 7364U
#define TROTEC_ONE_MARK 592U
#define TROTEC_ONE_SPACE 1560U
#define TROTEC_ZERO_MARK 592U
#define TROTEC_ZERO_SPACE 592U
#define TROTEC_GAP 6184U
#define TROTEC_GAP_END 1500U // made up value
const uint16_t kTrotecHdrMark = 5952;
const uint16_t kTrotecHdrSpace = 7364;
const uint16_t kTrotecOneMark = 592;
const uint16_t kTrotecOneSpace = 1560;
const uint16_t kTrotecZeroMark = 592;
const uint16_t kTrotecZeroSpace = 592;
const uint16_t kTrotecGap = 6184;
const uint16_t kTrotecGapEnd = 1500; // made up value
#if SEND_TROTEC
void IRsend::sendTrotec(unsigned char data[], uint16_t nbytes,
uint16_t repeat) {
if (nbytes < TROTEC_COMMAND_LENGTH)
if (nbytes < kTrotecStateLength)
return;
for (uint16_t r = 0; r <= repeat; r++) {
sendGeneric(TROTEC_HDR_MARK, TROTEC_HDR_SPACE,
TROTEC_ONE_MARK, TROTEC_ONE_SPACE,
TROTEC_ZERO_MARK, TROTEC_ZERO_SPACE,
TROTEC_ONE_MARK, TROTEC_GAP,
sendGeneric(kTrotecHdrMark, kTrotecHdrSpace,
kTrotecOneMark, kTrotecOneSpace,
kTrotecZeroMark, kTrotecZeroSpace,
kTrotecOneMark, kTrotecGap,
data, nbytes, 36, false, 0, // Repeats handled elsewhere
50);
// More footer
enableIROut(36);
mark(TROTEC_ONE_MARK);
space(TROTEC_GAP_END);
mark(kTrotecOneMark);
space(kTrotecGapEnd);
}
}
#endif // SEND_TROTEC
@@ -61,16 +61,16 @@ void IRTrotecESP::checksum() {
}
void IRTrotecESP::stateReset() {
for (uint8_t i = 2; i < TROTEC_COMMAND_LENGTH; i++)
for (uint8_t i = 2; i < kTrotecStateLength; i++)
trotec[i] = 0x0;
trotec[0] = TROTEC_INTRO1;
trotec[1] = TROTEC_INTRO2;
trotec[0] = kTrotecIntro1;
trotec[1] = kTrotecIntro2;
setPower(false);
setTemp(TROTEC_DEF_TEMP);
setSpeed(TROTEC_FAN_MED);
setMode(TROTEC_AUTO);
setTemp(kTrotecDefTemp);
setSpeed(kTrotecFanMed);
setMode(kTrotecAuto);
}
uint8_t* IRTrotecESP::getRaw() {
@@ -80,13 +80,13 @@ uint8_t* IRTrotecESP::getRaw() {
void IRTrotecESP::setPower(bool state) {
if (state)
trotec[2] |= (TROTEC_ON << 3);
trotec[2] |= (kTrotecOn << 3);
else
trotec[2] &= ~(TROTEC_ON << 3);
trotec[2] &= ~(kTrotecOn << 3);
}
uint8_t IRTrotecESP::getPower() {
return trotec[2] & (TROTEC_ON << 3);
return trotec[2] & (kTrotecOn << 3);
}
void IRTrotecESP::setSpeed(uint8_t speed) {
@@ -106,12 +106,12 @@ uint8_t IRTrotecESP::getMode() {
}
void IRTrotecESP::setTemp(uint8_t temp) {
if (temp < TROTEC_MIN_TEMP)
temp = TROTEC_MIN_TEMP;
else if (temp > TROTEC_MAX_TEMP)
temp = TROTEC_MAX_TEMP;
if (temp < kTrotecMinTemp)
temp = kTrotecMinTemp;
else if (temp > kTrotecMaxTemp)
temp = kTrotecMaxTemp;
trotec[3] = (trotec[3] & 0x80) | (temp - TROTEC_MIN_TEMP);
trotec[3] = (trotec[3] & 0x80) | (temp - kTrotecMinTemp);
}
uint8_t IRTrotecESP::getTemp() {
@@ -120,23 +120,23 @@ uint8_t IRTrotecESP::getTemp() {
void IRTrotecESP::setSleep(bool sleep) {
if (sleep)
trotec[3] |= (TROTEC_SLEEP_ON << 7);
trotec[3] |= (kTrotecSleepOn << 7);
else
trotec[3] &= ~(TROTEC_SLEEP_ON << 7);
trotec[3] &= ~(kTrotecSleepOn << 7);
}
bool IRTrotecESP::getSleep(void) {
return trotec[3] & (TROTEC_SLEEP_ON << 7);
return trotec[3] & (kTrotecSleepOn << 7);
}
void IRTrotecESP::setTimer(uint8_t timer) {
if (timer > TROTEC_MAX_TIMER) timer = TROTEC_MAX_TIMER;
if (timer > kTrotecMaxTimer) timer = kTrotecMaxTimer;
if (timer) {
trotec[5] |= (TROTEC_TIMER_ON << 6);
trotec[5] |= (kTrotecTimerOn << 6);
trotec[6] = timer;
} else {
trotec[5] &= ~(TROTEC_TIMER_ON << 6);
trotec[5] &= ~(kTrotecTimerOn << 6);
trotec[6] = 0;
}
}

50
src/ir_Trotec.h
View File

@@ -8,38 +8,50 @@
// Constants
// Byte 0
#define TROTEC_INTRO1 0x12
const uint8_t kTrotecIntro1 = 0x12;
// Byte 1
#define TROTEC_INTRO2 0x34
const uint8_t kTrotecIntro2 = 0x34;
// Byte 2
#define TROTEC_AUTO 0
#define TROTEC_COOL 1
#define TROTEC_DRY 2
#define TROTEC_FAN 3
const uint8_t kTrotecAuto = 0;
const uint8_t kTrotecCool = 1;
const uint8_t kTrotecDry = 2;
const uint8_t kTrotecFan = 3;
#define TROTEC_ON 1
#define TROTEC_OFF 0
const uint8_t kTrotecOn = 1;
const uint8_t kTrotecOff = 0;
#define TROTEC_FAN_LOW 1
#define TROTEC_FAN_MED 2
#define TROTEC_FAN_HIGH 3
const uint8_t kTrotecFanLow = 1;
const uint8_t kTrotecFanMed = 2;
const uint8_t kTrotecFanHigh = 3;
// Byte 3
#define TROTEC_MIN_TEMP 18
#define TROTEC_MAX_TEMP 32
#define TROTEC_DEF_TEMP 25
const uint8_t kTrotecMinTemp = 18;
const uint8_t kTrotecDefTemp = 25;
const uint8_t kTrotecMaxTemp = 32;
#define TROTEC_SLEEP_ON 1
const uint8_t kTrotecSleepOn = 1;
// Byte 5
#define TROTEC_TIMER_ON 1
const uint8_t kTrotecTimerOn = 1;
// Byte 6
#define TROTEC_MIN_TIMER 0
#define TROTEC_MAX_TIMER 23
const uint8_t kTrotecMinTimer = 0;
const uint8_t kTrotecMaxTimer = 23;
// Legacy defines. (Deperecated)
#define TROTEC_AUTO kTrotecAuto
#define TROTEC_COOL kTrotecCool
#define TROTEC_DRY kTrotecDry
#define TROTEC_FAN kTrotecFan
#define TROTEC_FAN_LOW kTrotecFanLow
#define TROTEC_FAN_MED kTrotecFanMed
#define TROTEC_FAN_HIGH kTrotecFanHigh
#define TROTEC_MIN_TEMP kTrotecMinTemp
#define TROTEC_MAX_TEMP kTrotecMaxTemp
#define TROTEC_MIN_TIMER kTrotecMinTimer
#define TROTEC_MAX_TIMER kTrotecMaxTimer
class IRTrotecESP {
public:
@@ -71,7 +83,7 @@ class IRTrotecESP {
uint8_t* getRaw();
private:
uint8_t trotec[TROTEC_COMMAND_LENGTH];
uint8_t trotec[kTrotecStateLength];
void stateReset();
void checksum();
IRsend _irsend;

162
src/ir_Whirlpool.cpp Normal file
View File

@@ -0,0 +1,162 @@
// Copyright 2018 David Conran
//
// Code to emulate Whirlpool protocol compatible devices.
// Should be compatible with:
// * SPIS409L, SPIS412L, SPIW409L, SPIW412L, SPIW418L
//
#include <algorithm>
#ifndef ARDUINO
#include <string>
#endif
#include "IRremoteESP8266.h"
#include "IRrecv.h"
#include "IRsend.h"
#include "IRutils.h"
// WW WW HH HH IIIII RRRRRR LL PPPPPP OOOOO OOOOO LL
// WW WW HH HH III RR RR LL PP PP OO OO OO OO LL
// WW W WW HHHHHHH III RRRRRR LL PPPPPP OO OO OO OO LL
// WW WWW WW HH HH III RR RR LL PP OO OO OO OO LL
// WW WW HH HH IIIII RR RR LLLLLLL PP OOOO0 OOOO0 LLLLLLL
// Constants
// Ref: https://github.com/markszabo/IRremoteESP8266/issues/509
const uint16_t kWhirlpoolAcHdrMark = 8950;
const uint16_t kWhirlpoolAcHdrSpace = 4484;
const uint16_t kWhirlpoolAcBitMark = 597;
const uint16_t kWhirlpoolAcOneSpace = 1649;
const uint16_t kWhirlpoolAcZeroSpace = 533;
const uint16_t kWhirlpoolAcGap = 7920;
const uint32_t kWhirlpoolAcMinGap = 100000; // Completely made up value.
const uint8_t kWhirlpoolAcSections = 3;
#if SEND_WHIRLPOOL_AC
// Send a Whirlpool A/C message.
//
// Args:
// data: An array of bytes containing the IR command.
// nbytes: Nr. of bytes of data in the array. (>=kWhirlpoolAcStateLength)
// repeat: Nr. of times the message is to be repeated. (Default = 0).
//
// Status: ALPHA / Untested.
//
// Ref:
// https://github.com/markszabo/IRremoteESP8266/issues/509
void IRsend::sendWhirlpoolAC(unsigned char data[], uint16_t nbytes,
uint16_t repeat) {
if (nbytes < kWhirlpoolAcStateLength)
return; // Not enough bytes to send a proper message.
for (uint16_t r = 0; r <= repeat; r++) {
// Section 1
sendGeneric(kWhirlpoolAcHdrMark, kWhirlpoolAcHdrSpace,
kWhirlpoolAcBitMark, kWhirlpoolAcOneSpace,
kWhirlpoolAcBitMark, kWhirlpoolAcZeroSpace,
kWhirlpoolAcBitMark,
kWhirlpoolAcGap,
data, 6, // 6 bytes == 48 bits
38000, // Complete guess of the modulation frequency.
false, 0, 50);
// Section 2
sendGeneric(0, 0,
kWhirlpoolAcBitMark, kWhirlpoolAcOneSpace,
kWhirlpoolAcBitMark, kWhirlpoolAcZeroSpace,
kWhirlpoolAcBitMark,
kWhirlpoolAcGap,
data + 6, 8, // 8 bytes == 64 bits
38000, // Complete guess of the modulation frequency.
false, 0, 50);
// Section 3
sendGeneric(0, 0,
kWhirlpoolAcBitMark, kWhirlpoolAcOneSpace,
kWhirlpoolAcBitMark, kWhirlpoolAcZeroSpace,
kWhirlpoolAcBitMark, kWhirlpoolAcMinGap,
data + 14, 7, // 7 bytes == 56 bits
38000, // Complete guess of the modulation frequency.
false, 0, 50);
}
}
#endif // SEND_WHIRLPOOL_AC
#if DECODE_WHIRLPOOL_AC
// Decode the supplied Whirlpool A/C message.
//
// Args:
// results: Ptr to the data to decode and where to store the decode result.
// nbits: The number of data bits to expect. Typically kWhirlpoolAcBits
// strict: Flag indicating if we should perform strict matching.
// Returns:
// boolean: True if it can decode it, false if it can't.
//
// Status: ALPHA / Untested.
//
//
// Ref:
// https://github.com/markszabo/IRremoteESP8266/issues/509
bool IRrecv::decodeWhirlpoolAC(decode_results *results, uint16_t nbits,
bool strict) {
if (results->rawlen < 2 * nbits + 4 + kHeader + kFooter - 1)
return false; // Can't possibly be a valid Whirlpool A/C message.
if (strict) {
if (nbits != kWhirlpoolAcBits)
return false;
}
uint16_t offset = kStartOffset;
uint16_t dataBitsSoFar = 0;
uint16_t i = 0;
match_result_t data_result;
uint8_t sectionSize[kWhirlpoolAcSections] = {6, 8, 7};
// Header
if (!matchMark(results->rawbuf[offset++], kWhirlpoolAcHdrMark))
return false;
if (!matchSpace(results->rawbuf[offset++], kWhirlpoolAcHdrSpace))
return false;
// Data Section
// Keep reading bytes until we either run out of section or state to fill.
for (uint8_t section = 0, pos = 0;
section < kWhirlpoolAcSections;
section++) {
pos += sectionSize[section];
for (; offset <= results->rawlen - 16 && i < pos;
i++, dataBitsSoFar += 8, offset += data_result.used) {
data_result = matchData(&(results->rawbuf[offset]), 8,
kWhirlpoolAcBitMark,
kWhirlpoolAcOneSpace,
kWhirlpoolAcBitMark,
kWhirlpoolAcZeroSpace,
kTolerance, kMarkExcess, false);
if (data_result.success == false) break; // Fail
// Data is in LSB order. We need to reverse it.
results->state[i] = (uint8_t) data_result.data;
}
// Section Footer
if (!matchMark(results->rawbuf[offset++], kWhirlpoolAcBitMark))
return false;
if (section < kWhirlpoolAcSections - 1) { // Inter-section gaps.
if (!matchSpace(results->rawbuf[offset++], kWhirlpoolAcGap))
return false;
} else { // Last section / End of message gap.
if (offset <= results->rawlen &&
!matchAtLeast(results->rawbuf[offset++], kWhirlpoolAcGap))
return false;
}
}
// Compliance
if (strict) {
// Re-check we got the correct size/length due to the way we read the data.
if (dataBitsSoFar != kWhirlpoolAcBits) return false;
}
// Success
results->decode_type = WHIRLPOOL_AC;
results->bits = dataBitsSoFar;
// No need to record the state as we stored it as we decoded it.
// As we use result->state, we don't record value, address, or command as it
// is a union data type.
return true;
}
#endif // WHIRLPOOL_AC

93
src/ir_Whynter.cpp
View File

@@ -16,27 +16,25 @@
// Whynter originally added from https://github.com/shirriff/Arduino-IRremote/
// Constants
#define WHYNTER_TICK 50U
#define WHYNTER_HDR_MARK_TICKS 57U
#define WHYNTER_HDR_MARK (WHYNTER_HDR_MARK_TICKS * WHYNTER_TICK)
#define WHYNTER_HDR_SPACE_TICKS 57U
#define WHYNTER_HDR_SPACE (WHYNTER_HDR_SPACE_TICKS * \
WHYNTER_TICK)
#define WHYNTER_BIT_MARK_TICKS 15U
#define WHYNTER_BIT_MARK (WHYNTER_BIT_MARK_TICKS * WHYNTER_TICK)
#define WHYNTER_ONE_SPACE_TICKS 43U
#define WHYNTER_ONE_SPACE (WHYNTER_ONE_SPACE_TICKS * \
WHYNTER_TICK)
#define WHYNTER_ZERO_SPACE_TICKS 15U
#define WHYNTER_ZERO_SPACE (WHYNTER_ZERO_SPACE_TICKS * \
WHYNTER_TICK)
#define WHYNTER_MIN_COMMAND_LENGTH_TICKS 2160U // Completely made up value.
#define WHYNTER_MIN_COMMAND_LENGTH (WHYNTER_MIN_COMMAND_LENGTH_TICKS * \
WHYNTER_TICK)
#define WHYNTER_MIN_GAP_TICKS (WHYNTER_MIN_COMMAND_LENGTH_TICKS - \
(2 * (WHYNTER_BIT_MARK_TICKS + WHYNTER_ZERO_SPACE_TICKS) + \
WHYNTER_BITS * (WHYNTER_BIT_MARK_TICKS + WHYNTER_ONE_SPACE_TICKS)))
#define WHYNTER_MIN_GAP (WHYNTER_MIN_GAP_TICKS * WHYNTER_TICK)
const uint16_t kWhynterTick = 50;
const uint16_t kWhynterHdrMarkTicks = 57;
const uint16_t kWhynterHdrMark = kWhynterHdrMarkTicks * kWhynterTick;
const uint16_t kWhynterHdrSpaceTicks = 57;
const uint16_t kWhynterHdrSpace = kWhynterHdrSpaceTicks * kWhynterTick;
const uint16_t kWhynterBitMarkTicks = 15;
const uint16_t kWhynterBitMark = kWhynterBitMarkTicks * kWhynterTick;
const uint16_t kWhynterOneSpaceTicks = 43;
const uint16_t kWhynterOneSpace = kWhynterOneSpaceTicks * kWhynterTick;
const uint16_t kWhynterZeroSpaceTicks = 15;
const uint16_t kWhynterZeroSpace = kWhynterZeroSpaceTicks * kWhynterTick;
const uint16_t kWhynterMinCommandLengthTicks = 2160; // Totally made up value.
const uint32_t kWhynterMinCommandLength = kWhynterMinCommandLengthTicks *
kWhynterTick;
const uint16_t kWhynterMinGapTicks = kWhynterMinCommandLengthTicks -
(2 * (kWhynterBitMarkTicks + kWhynterZeroSpaceTicks) +
kWhynterBits * (kWhynterBitMarkTicks + kWhynterOneSpaceTicks));
const uint16_t kWhynterMinGap = kWhynterMinGapTicks * kWhynterTick;
#if SEND_WHYNTER
// Send a Whynter message.
@@ -56,14 +54,14 @@ void IRsend::sendWhynter(uint64_t data, uint16_t nbits, uint16_t repeat) {
for (uint16_t i = 0; i <= repeat; i++) {
// (Pre-)Header
mark(WHYNTER_BIT_MARK);
space(WHYNTER_ZERO_SPACE);
sendGeneric(WHYNTER_HDR_MARK, WHYNTER_HDR_SPACE,
WHYNTER_BIT_MARK, WHYNTER_ONE_SPACE,
WHYNTER_BIT_MARK, WHYNTER_ZERO_SPACE,
WHYNTER_BIT_MARK, WHYNTER_MIN_GAP,
WHYNTER_MIN_COMMAND_LENGTH - (WHYNTER_BIT_MARK +
WHYNTER_ZERO_SPACE),
mark(kWhynterBitMark);
space(kWhynterZeroSpace);
sendGeneric(kWhynterHdrMark, kWhynterHdrSpace,
kWhynterBitMark, kWhynterOneSpace,
kWhynterBitMark, kWhynterZeroSpace,
kWhynterBitMark, kWhynterMinGap,
kWhynterMinCommandLength - (kWhynterBitMark +
kWhynterZeroSpace),
data, nbits, 38, true, 0, // Repeats are already handled.
50);
}
@@ -86,47 +84,46 @@ void IRsend::sendWhynter(uint64_t data, uint16_t nbits, uint16_t repeat) {
// https://github.com/z3t0/Arduino-IRremote/blob/master/ir_Whynter.cpp
bool IRrecv::decodeWhynter(decode_results *results, uint16_t nbits,
bool strict) {
if (results->rawlen < 2 * nbits + 2 * HEADER + FOOTER - 1)
return false; // We don't have enough entries to possibly match.
if (results->rawlen < 2 * nbits + 2 * kHeader + kFooter - 1)
return false; // We don't have enough entries to possibly match.
// Compliance
if (strict && nbits != WHYNTER_BITS)
if (strict && nbits != kWhynterBits)
return false; // Incorrect nr. of bits per spec.
uint16_t offset = OFFSET_START;
uint16_t offset = kStartOffset;
// Header
// Sequence begins with a bit mark and a zero space.
// These are typically small, so we'll prefer to do the calibration
// on the much larger header mark & space that are next.
if (!matchMark(results->rawbuf[offset++], WHYNTER_BIT_MARK)) return false;
if (!matchSpace(results->rawbuf[offset++], WHYNTER_ZERO_SPACE)) return false;
if (!matchMark(results->rawbuf[offset++], kWhynterBitMark)) return false;
if (!matchSpace(results->rawbuf[offset++], kWhynterZeroSpace)) return false;
// Main header mark and space
if (!matchMark(results->rawbuf[offset], WHYNTER_HDR_MARK)) return false;
if (!matchMark(results->rawbuf[offset], kWhynterHdrMark)) return false;
// Calculate how long the common tick time is based on the header mark.
uint32_t m_tick = results->rawbuf[offset++] * RAWTICK /
WHYNTER_HDR_MARK_TICKS;
if (!matchSpace(results->rawbuf[offset], WHYNTER_HDR_SPACE)) return false;
uint32_t m_tick = results->rawbuf[offset++] * kRawTick / kWhynterHdrMarkTicks;
if (!matchSpace(results->rawbuf[offset], kWhynterHdrSpace)) return false;
// Calculate how long the common tick time is based on the header space.
uint32_t s_tick = results->rawbuf[offset++] * RAWTICK /
WHYNTER_HDR_SPACE_TICKS;
uint32_t s_tick = results->rawbuf[offset++] * kRawTick /
kWhynterHdrSpaceTicks;
// Data
uint64_t data = 0;
match_result_t data_result = matchData(&(results->rawbuf[offset]), nbits,
WHYNTER_BIT_MARK_TICKS * m_tick,
WHYNTER_ONE_SPACE_TICKS * s_tick,
WHYNTER_BIT_MARK_TICKS * m_tick,
WHYNTER_ZERO_SPACE_TICKS * s_tick);
kWhynterBitMarkTicks * m_tick,
kWhynterOneSpaceTicks * s_tick,
kWhynterBitMarkTicks * m_tick,
kWhynterZeroSpaceTicks * s_tick);
if (data_result.success == false) return false;
data = data_result.data;
offset += data_result.used;
// Footer
if (!matchMark(results->rawbuf[offset++], WHYNTER_BIT_MARK_TICKS * m_tick))
if (!matchMark(results->rawbuf[offset++], kWhynterBitMarkTicks * m_tick))
return false;
if (offset < results->rawlen &&
!matchAtLeast(results->rawbuf[offset], WHYNTER_MIN_GAP_TICKS * s_tick))
if (offset < results->rawlen && !matchAtLeast(results->rawbuf[offset],
kWhynterMinGapTicks * s_tick))
return false;
// Success

76
test/IRrecv_test.cpp
View File

@@ -10,7 +10,7 @@
// Tests for the IRrecv object.
TEST(TestIRrecv, DefaultBufferSize) {
IRrecv irrecv_default(1);
EXPECT_EQ(RAWBUF, irrecv_default.getBufSize());
EXPECT_EQ(kRawBuf, irrecv_default.getBufSize());
}
TEST(TestIRrecv, LargeBufferSize) {
@@ -30,7 +30,7 @@ TEST(TestIRrecv, MediumBufferSize) {
TEST(TestIRrecv, IRrecvDestructor) {
IRrecv *irrecv_ptr = new IRrecv(1);
EXPECT_EQ(RAWBUF, irrecv_ptr->getBufSize());
EXPECT_EQ(kRawBuf, irrecv_ptr->getBufSize());
delete irrecv_ptr;
irrecv_ptr = new IRrecv(1, 1234);
@@ -120,7 +120,7 @@ TEST(TestDecode, DecodeNEC) {
irsend.makeDecodeResult();
ASSERT_TRUE(irrecv.decode(&irsend.capture));
EXPECT_EQ(NEC, irsend.capture.decode_type);
EXPECT_EQ(NEC_BITS, irsend.capture.bits);
EXPECT_EQ(kNECBits, irsend.capture.bits);
EXPECT_EQ(0x807F40BF, irsend.capture.value);
}
@@ -134,7 +134,7 @@ TEST(TestDecode, DecodeJVC) {
irsend.makeDecodeResult();
ASSERT_TRUE(irrecv.decode(&irsend.capture));
EXPECT_EQ(JVC, irsend.capture.decode_type);
EXPECT_EQ(JVC_BITS, irsend.capture.bits);
EXPECT_EQ(kJvcBits, irsend.capture.bits);
EXPECT_EQ(0xC2B8, irsend.capture.value);
}
@@ -148,15 +148,15 @@ TEST(TestDecode, DecodeLG) {
irsend.makeDecodeResult();
ASSERT_TRUE(irrecv.decode(&irsend.capture));
EXPECT_EQ(LG, irsend.capture.decode_type);
EXPECT_EQ(LG_BITS, irsend.capture.bits);
EXPECT_EQ(kLgBits, irsend.capture.bits);
EXPECT_EQ(0x4B4AE51, irsend.capture.value);
irsend.reset();
irsend.sendLG(0xB4B4AE51, LG32_BITS);
irsend.sendLG(0xB4B4AE51, kLg32Bits);
irsend.makeDecodeResult();
ASSERT_TRUE(irrecv.decode(&irsend.capture));
EXPECT_EQ(LG, irsend.capture.decode_type);
EXPECT_EQ(LG32_BITS, irsend.capture.bits);
EXPECT_EQ(kLg32Bits, irsend.capture.bits);
EXPECT_EQ(0xB4B4AE51, irsend.capture.value);
}
@@ -168,9 +168,9 @@ TEST(TestDecode, DecodePanasonic) {
irsend.reset();
irsend.sendPanasonic64(0x40040190ED7C);
irsend.makeDecodeResult();
ASSERT_TRUE(irrecv.decodePanasonic(&irsend.capture, PANASONIC_BITS, true));
ASSERT_TRUE(irrecv.decodePanasonic(&irsend.capture, kPanasonicBits, true));
EXPECT_EQ(PANASONIC, irsend.capture.decode_type);
EXPECT_EQ(PANASONIC_BITS, irsend.capture.bits);
EXPECT_EQ(kPanasonicBits, irsend.capture.bits);
EXPECT_EQ(0x40040190ED7C, irsend.capture.value);
}
@@ -184,7 +184,7 @@ TEST(TestDecode, DecodeSamsung) {
irsend.makeDecodeResult();
ASSERT_TRUE(irrecv.decode(&irsend.capture));
EXPECT_EQ(SAMSUNG, irsend.capture.decode_type);
EXPECT_EQ(SAMSUNG_BITS, irsend.capture.bits);
EXPECT_EQ(kSamsungBits, irsend.capture.bits);
EXPECT_EQ(0xE0E09966, irsend.capture.value);
}
@@ -199,7 +199,7 @@ TEST(TestDecode, DecodeSherwood) {
ASSERT_TRUE(irrecv.decode(&irsend.capture));
// Sherwood codes are really NEC codes.
EXPECT_EQ(NEC, irsend.capture.decode_type);
EXPECT_EQ(NEC_BITS, irsend.capture.bits);
EXPECT_EQ(kNECBits, irsend.capture.bits);
EXPECT_EQ(0x807F40BF, irsend.capture.value);
}
@@ -213,7 +213,7 @@ TEST(TestDecode, DecodeWhynter) {
irsend.makeDecodeResult();
ASSERT_TRUE(irrecv.decode(&irsend.capture));
EXPECT_EQ(WHYNTER, irsend.capture.decode_type);
EXPECT_EQ(WHYNTER_BITS, irsend.capture.bits);
EXPECT_EQ(kWhynterBits, irsend.capture.bits);
EXPECT_EQ(0x87654321, irsend.capture.value);
}
@@ -225,30 +225,30 @@ TEST(TestDecode, DecodeSony) {
// Synthesised Normal Sony 20-bit message.
irsend.reset();
irsend.sendSony(irsend.encodeSony(SONY_20_BITS, 0x1, 0x1, 0x1));
irsend.sendSony(irsend.encodeSony(kSony20Bits, 0x1, 0x1, 0x1));
irsend.makeDecodeResult();
ASSERT_TRUE(irrecv.decode(&irsend.capture));
EXPECT_EQ(SONY, irsend.capture.decode_type);
EXPECT_EQ(SONY_20_BITS, irsend.capture.bits);
EXPECT_EQ(kSony20Bits, irsend.capture.bits);
EXPECT_EQ(0x81080, irsend.capture.value);
// Synthesised Normal Sony 15-bit message.
irsend.reset();
irsend.sendSony(irsend.encodeSony(SONY_15_BITS, 21, 1), SONY_15_BITS);
irsend.sendSony(irsend.encodeSony(kSony15Bits, 21, 1), kSony15Bits);
irsend.makeDecodeResult();
ASSERT_TRUE(irrecv.decode(&irsend.capture));
EXPECT_EQ(SONY, irsend.capture.decode_type);
EXPECT_EQ(SONY_15_BITS, irsend.capture.bits);
EXPECT_EQ(kSony15Bits, irsend.capture.bits);
EXPECT_EQ(0x5480, irsend.capture.value);
// Synthesised Normal Sony 12-bit message.
irsend.reset();
irsend.sendSony(irsend.encodeSony(SONY_12_BITS, 21, 1), SONY_12_BITS);
irsend.sendSony(irsend.encodeSony(kSony12Bits, 21, 1), kSony12Bits);
irsend.makeDecodeResult();
ASSERT_TRUE(irrecv.decode(&irsend.capture));
EXPECT_EQ(SONY, irsend.capture.decode_type);
EXPECT_EQ(SONY_12_BITS, irsend.capture.bits);
EXPECT_EQ(kSony12Bits, irsend.capture.bits);
EXPECT_EQ(0xA90, irsend.capture.value);
}
@@ -262,7 +262,7 @@ TEST(TestDecode, DecodeSharp) {
irsend.makeDecodeResult();
ASSERT_TRUE(irrecv.decode(&irsend.capture));
EXPECT_EQ(SHARP, irsend.capture.decode_type);
EXPECT_EQ(SHARP_BITS, irsend.capture.bits);
EXPECT_EQ(kSharpBits, irsend.capture.bits);
EXPECT_EQ(0x454A, irsend.capture.value);
}
@@ -276,7 +276,7 @@ TEST(TestDecode, DecodeSanyo) {
irsend.makeDecodeResult();
ASSERT_TRUE(irrecv.decode(&irsend.capture));
EXPECT_EQ(SANYO_LC7461, irsend.capture.decode_type);
EXPECT_EQ(SANYO_LC7461_BITS, irsend.capture.bits);
EXPECT_EQ(kSanyoLC7461Bits, irsend.capture.bits);
EXPECT_EQ(0x2468DCB56A9, irsend.capture.value);
}
@@ -292,7 +292,7 @@ TEST(TestDecode, DecodeRCMM) {
irsend.makeDecodeResult();
ASSERT_TRUE(irrecv.decode(&irsend.capture));
EXPECT_EQ(RCMM, irsend.capture.decode_type);
EXPECT_EQ(RCMM_BITS, irsend.capture.bits);
EXPECT_EQ(kRCMMBits, irsend.capture.bits);
EXPECT_EQ(0xe0a600, irsend.capture.value);
// Normal RCMM 12-bit message.
@@ -324,7 +324,7 @@ TEST(TestDecode, DecodeMitsubishi) {
irsend.makeDecodeResult();
ASSERT_TRUE(irrecv.decode(&irsend.capture));
EXPECT_EQ(MITSUBISHI, irsend.capture.decode_type);
EXPECT_EQ(MITSUBISHI_BITS, irsend.capture.bits);
EXPECT_EQ(kMitsubishiBits, irsend.capture.bits);
EXPECT_EQ(0xC2B8, irsend.capture.value);
}
@@ -339,15 +339,15 @@ TEST(TestDecode, DecodeRC5) {
irsend.makeDecodeResult();
ASSERT_TRUE(irrecv.decode(&irsend.capture));
EXPECT_EQ(RC5, irsend.capture.decode_type);
EXPECT_EQ(RC5_BITS, irsend.capture.bits);
EXPECT_EQ(kRC5Bits, irsend.capture.bits);
EXPECT_EQ(0x175, irsend.capture.value);
// Synthesised Normal RC-5X 13-bit message.
irsend.reset();
irsend.sendRC5(irsend.encodeRC5X(0x02, 0x41, true), RC5X_BITS);
irsend.sendRC5(irsend.encodeRC5X(0x02, 0x41, true), kRC5XBits);
irsend.makeDecodeResult();
ASSERT_TRUE(irrecv.decode(&irsend.capture));
EXPECT_EQ(RC5X, irsend.capture.decode_type);
EXPECT_EQ(RC5X_BITS, irsend.capture.bits);
EXPECT_EQ(kRC5XBits, irsend.capture.bits);
EXPECT_EQ(0x1881, irsend.capture.value);
}
@@ -362,16 +362,16 @@ TEST(TestDecode, DecodeRC6) {
irsend.makeDecodeResult();
ASSERT_TRUE(irrecv.decode(&irsend.capture));
EXPECT_EQ(RC6, irsend.capture.decode_type);
EXPECT_EQ(RC6_MODE0_BITS, irsend.capture.bits);
EXPECT_EQ(kRC6Mode0Bits, irsend.capture.bits);
EXPECT_EQ(0x175, irsend.capture.value);
// Normal RC-6 36-bit message.
irsend.reset();
irsend.sendRC6(0xC800F742A, RC6_36_BITS);
irsend.sendRC6(0xC800F742A, kRC6_36Bits);
irsend.makeDecodeResult();
ASSERT_TRUE(irrecv.decode(&irsend.capture));
EXPECT_EQ(RC6, irsend.capture.decode_type);
EXPECT_EQ(RC6_36_BITS, irsend.capture.bits);
EXPECT_EQ(kRC6_36Bits, irsend.capture.bits);
EXPECT_EQ(0xC800F742A, irsend.capture.value);
}
@@ -385,7 +385,7 @@ TEST(TestDecode, DecodeDish) {
irsend.makeDecodeResult();
ASSERT_TRUE(irrecv.decode(&irsend.capture));
EXPECT_EQ(DISH, irsend.capture.decode_type);
EXPECT_EQ(DISH_BITS, irsend.capture.bits);
EXPECT_EQ(kDishBits, irsend.capture.bits);
EXPECT_EQ(0x9C00, irsend.capture.value);
}
@@ -404,7 +404,7 @@ TEST(TestDecode, DecodeDenon) {
EXPECT_EQ(0x2278, irsend.capture.value);
// Legacy Denon 14-bit message.
irsend.reset();
irsend.sendDenon(0x1278, DENON_LEGACY_BITS);
irsend.sendDenon(0x1278, kDenonLegacyBits);
irsend.makeDecodeResult();
ASSERT_TRUE(irrecv.decode(&irsend.capture));
EXPECT_EQ(DENON, irsend.capture.decode_type);
@@ -430,7 +430,7 @@ TEST(TestDecode, DecodeCoolix) {
irsend.makeDecodeResult();
ASSERT_TRUE(irrecv.decode(&irsend.capture));
EXPECT_EQ(COOLIX, irsend.capture.decode_type);
EXPECT_EQ(COOLIX_BITS, irsend.capture.bits);
EXPECT_EQ(kCoolixBits, irsend.capture.bits);
EXPECT_EQ(0x123456, irsend.capture.value);
}
@@ -444,7 +444,7 @@ TEST(TestDecode, DecodeAiwa) {
irsend.makeDecodeResult();
ASSERT_TRUE(irrecv.decode(&irsend.capture));
EXPECT_EQ(AIWA_RC_T501, irsend.capture.decode_type);
EXPECT_EQ(AIWA_RC_T501_BITS, irsend.capture.bits);
EXPECT_EQ(kAiwaRcT501Bits, irsend.capture.bits);
EXPECT_EQ(0x7F, irsend.capture.value);
}
@@ -498,16 +498,28 @@ TEST(TestMatchData, MarkEncoded) {
irsend.reset();
irsend.sendRaw(mark_encoded_raw, 11, 38000);
irsend.makeDecodeResult();
// MSBF order.
result = irrecv.matchData(irsend.capture.rawbuf + 1, 5, 1500, 500, 500, 500);
ASSERT_TRUE(result.success);
EXPECT_EQ(0b01011, result.data);
EXPECT_EQ(10, result.used);
// LSBF order.
result = irrecv.matchData(irsend.capture.rawbuf + 1, 5, 1500, 500, 500, 500,
kTolerance, kMarkExcess, false);
ASSERT_TRUE(result.success);
EXPECT_EQ(0b11010, result.data); // Bits reversed of the previous test.
EXPECT_EQ(10, result.used);
irsend.reset();
irsend.sendRaw(mark_encoded_raw, 11, 38000);
irsend.makeDecodeResult();
// MSBF order.
result = irrecv.matchData(irsend.capture.rawbuf + 1, 5, 1000, 500, 500, 500);
ASSERT_FALSE(result.success);
// LSBF order.
result = irrecv.matchData(irsend.capture.rawbuf + 1, 5, 1000, 500, 500, 500,
kTolerance, kMarkExcess, false);
ASSERT_FALSE(result.success);
}
// Test matchData() on "equal total bit time" encoded data.

4
test/IRsend_test.cpp
View File

@@ -101,7 +101,7 @@ TEST(TestSendRaw, GeneralUse) {
irsend.reset();
irsend.sendRaw(rawData, 67, 38);
irsend.makeDecodeResult();
ASSERT_TRUE(irrecv.decodeNEC(&irsend.capture, NEC_BITS, false));
ASSERT_TRUE(irrecv.decodeNEC(&irsend.capture, kNECBits, false));
EXPECT_EQ(NEC, irsend.capture.decode_type);
EXPECT_EQ(32, irsend.capture.bits);
EXPECT_EQ(0xC3E0E0E8, irsend.capture.value);
@@ -135,7 +135,7 @@ TEST(TestSendRaw, NoTrailingGap) {
irsend.makeDecodeResult();
EXPECT_TRUE(irrecv.decodeNEC(&irsend.capture));
EXPECT_EQ(NEC, irsend.capture.decode_type);
EXPECT_EQ(NEC_BITS, irsend.capture.bits);
EXPECT_EQ(kNECBits, irsend.capture.bits);
}
TEST(TestLowLevelSend, MarkFrequencyModulationAt38kHz) {

6
test/IRsend_test.h
View File

@@ -68,10 +68,10 @@ class IRsendTest: public IRsend {
for (uint16_t i = 0;
(i < RAW_BUF - 1) && (offset < OUTPUT_BUF);
i++, offset++)
if (output[offset] / RAWTICK > UINT16_MAX)
if (output[offset] / kRawTick > UINT16_MAX)
rawbuf[i + 1] = UINT16_MAX;
else
rawbuf[i + 1] = output[offset] / RAWTICK;
rawbuf[i + 1] = output[offset] / kRawTick;
}
void dumpRawResult() {
@@ -81,7 +81,7 @@ class IRsendTest: public IRsend {
for (uint16_t i = 1; i < capture.rawlen; i++) {
if (i % 8 == 1)
std::cout << std::endl << " ";
std::cout << (capture.rawbuf[i] * RAWTICK);
std::cout << (capture.rawbuf[i] * kRawTick);
// std::cout << "(" << capture.rawbuf[i] << ")";
if (i < capture.rawlen - 1)
std::cout << ", ";

18
test/IRutils_test.cpp
View File

@@ -115,7 +115,7 @@ TEST(TestGetCorrectedRawLength, WithLargeValues) {
irsend.makeDecodeResult();
irrecv.decode(&irsend.capture);
irsend.capture.rawbuf[3] = 60000;
ASSERT_EQ(2, RAWTICK); // The following values rely on RAWTICK being 2.
ASSERT_EQ(2, kRawTick); // The following values rely on kRawTick being 2.
EXPECT_EQ(7 + 2, getCorrectedRawLength(&irsend.capture));
irsend.capture.rawbuf[4] = UINT16_MAX - 1;
EXPECT_EQ(7 + 2 * 2, getCorrectedRawLength(&irsend.capture));
@@ -167,7 +167,7 @@ TEST(TestResultToSourceCode, SimpleProtocols) {
irsend.makeDecodeResult();
ASSERT_TRUE(irrecv.decode(&irsend.capture));
ASSERT_EQ(NEC, irsend.capture.decode_type);
ASSERT_EQ(NEC_BITS, irsend.capture.bits);
ASSERT_EQ(kNECBits, irsend.capture.bits);
EXPECT_EQ(
"uint16_t rawData[68] = {8960, 4480, 560, 560, 560, 560, 560, 560, "
"560, 560, 560, 1680, 560, 560, 560, 560, 560, 560, 560, 1680, "
@@ -186,7 +186,7 @@ TEST(TestResultToSourceCode, SimpleProtocols) {
irsend.makeDecodeResult();
ASSERT_TRUE(irrecv.decode(&irsend.capture));
ASSERT_EQ(NIKAI, irsend.capture.decode_type);
ASSERT_EQ(NIKAI_BITS, irsend.capture.bits);
ASSERT_EQ(kNikaiBits, irsend.capture.bits);
EXPECT_EQ(
"uint16_t rawData[52] = {4000, 4000, 500, 2000, 500, 2000, "
"500, 2000, 500, 2000, 500, 1000, 500, 1000, 500, 2000, 500, 1000, "
@@ -202,7 +202,7 @@ TEST(TestResultToSourceCode, ComplexProtocols) {
IRrecv irrecv(1);
irsend.begin();
uint8_t state[TOSHIBA_AC_STATE_LENGTH] = {
uint8_t state[kToshibaACStateLength] = {
0xF2, 0x0D, 0x03, 0xFC, 0x01, 0x00, 0x00, 0x00, 0x01};
irsend.reset();
@@ -210,7 +210,7 @@ TEST(TestResultToSourceCode, ComplexProtocols) {
irsend.makeDecodeResult();
ASSERT_TRUE(irrecv.decode(&irsend.capture));
ASSERT_EQ(TOSHIBA_AC, irsend.capture.decode_type);
ASSERT_EQ(TOSHIBA_AC_BITS, irsend.capture.bits);
ASSERT_EQ(kToshibaACBits, irsend.capture.bits);
EXPECT_EQ(
"uint16_t rawData[296] = {4400, 4300, 542, 1622, 542, 1622, "
"542, 1622, 542, 1622, 542, 472, 542, 472, 542, 1622, 542, 472, "
@@ -252,7 +252,7 @@ TEST(TestResultToTimingInfo, General) {
irsend.makeDecodeResult();
ASSERT_TRUE(irrecv.decode(&irsend.capture));
ASSERT_EQ(NEC, irsend.capture.decode_type);
ASSERT_EQ(NEC_BITS, irsend.capture.bits);
ASSERT_EQ(kNECBits, irsend.capture.bits);
EXPECT_EQ(
"Raw Timing[68]:\n"
" + 8960, - 4480, + 560, - 560, + 560, - 560,"
@@ -297,7 +297,7 @@ TEST(TestResultToHumanReadableBasic, SimpleCodes) {
irsend.makeDecodeResult();
ASSERT_TRUE(irrecv.decode(&irsend.capture));
ASSERT_EQ(NEC, irsend.capture.decode_type);
ASSERT_EQ(NEC_BITS, irsend.capture.bits);
ASSERT_EQ(kNECBits, irsend.capture.bits);
EXPECT_EQ(
"Encoding : NEC\n"
"Code : 8F704FB (32 bits)\n",
@@ -310,7 +310,7 @@ TEST(TestResultToHumanReadableBasic, ComplexCodes) {
irsend.begin();
uint8_t state[TOSHIBA_AC_STATE_LENGTH] = {
uint8_t state[kToshibaACStateLength] = {
0xF2, 0x0D, 0x03, 0xFC, 0x01, 0x00, 0x00, 0x00, 0x01};
irsend.reset();
@@ -318,7 +318,7 @@ TEST(TestResultToHumanReadableBasic, ComplexCodes) {
irsend.makeDecodeResult();
ASSERT_TRUE(irrecv.decode(&irsend.capture));
ASSERT_EQ(TOSHIBA_AC, irsend.capture.decode_type);
ASSERT_EQ(TOSHIBA_AC_BITS, irsend.capture.bits);
ASSERT_EQ(kToshibaACBits, irsend.capture.bits);
EXPECT_EQ(
"Encoding : TOSHIBA_AC\n"
"Code : F20D03FC0100000001 (72 bits)\n",

26
test/Makefile
View File

@@ -34,7 +34,8 @@ TESTS = IRutils_test IRsend_test ir_NEC_test ir_GlobalCache_test \
ir_Aiwa_test ir_Denon_test ir_Sanyo_test ir_Daikin_test ir_Coolix_test \
ir_Gree_test IRrecv_test ir_Pronto_test ir_Fujitsu_test ir_Nikai_test \
ir_Toshiba_test ir_Midea_test ir_Magiquest_test ir_Lasertag_test \
ir_Carrier_test ir_Haier_test ir_Hitachi_test ir_GICable_test
ir_Carrier_test ir_Haier_test ir_Hitachi_test ir_GICable_test \
ir_Whirlpool_test ir_Lutron_test
# All Google Test headers. Usually you shouldn't change this
# definition.
@@ -77,7 +78,7 @@ PROTOCOLS = ir_NEC.o ir_Sony.o ir_Samsung.o ir_JVC.o ir_RCMM.o ir_RC5_RC6.o \
ir_Panasonic.o ir_Whynter.o ir_Coolix.o ir_Aiwa.o ir_Sherwood.o \
ir_Kelvinator.o ir_Daikin.o ir_Gree.o ir_Pronto.o ir_Nikai.o ir_Toshiba.o \
ir_Midea.o ir_Magiquest.o ir_Lasertag.o ir_Carrier.o ir_Haier.o \
ir_Hitachi.o ir_GICable.o
ir_Hitachi.o ir_GICable.o ir_Whirlpool.o ir_Lutron.o
# Common object files
COMMON_OBJ = IRutils.o IRtimer.o IRsend.o IRrecv.o ir_GlobalCache.o \
@@ -287,7 +288,7 @@ ir_Whynter_test : $(COMMON_OBJ) ir_Whynter_test.o
ir_Coolix.o : $(USER_DIR)/ir_Coolix.cpp $(COMMON_DEPS)
$(CXX) $(CPPFLAGS) $(CXXFLAGS) -c $(USER_DIR)/ir_Coolix.cpp
ir_Coolix_test.o : ir_Coolix_test.cpp $(COMMON_TEST_DEPS) $(GTEST_HEADERS)
ir_Coolix_test.o : ir_Coolix_test.cpp $(USER_DIR)/ir_Coolix.h $(COMMON_TEST_DEPS) $(GTEST_HEADERS)
$(CXX) $(CPPFLAGS) $(CXXFLAGS) -I$(USER_DIR) -c ir_Coolix_test.cpp
ir_Coolix_test : $(COMMON_OBJ) ir_Coolix_test.o
@@ -427,3 +428,22 @@ ir_GICable_test.o : ir_GICable_test.cpp $(COMMON_TEST_DEPS) $(GTEST_HEADERS)
ir_GICable_test : $(COMMON_OBJ) ir_GICable_test.o
$(CXX) $(CPPFLAGS) $(CXXFLAGS) -lpthread $^ -o $@
ir_Whirlpool.o : $(USER_DIR)/ir_Whirlpool.cpp $(COMMON_DEPS) $(GTEST_HEADERS)
$(CXX) $(CPPFLAGS) $(CXXFLAGS) -c $(USER_DIR)/ir_Whirlpool.cpp
ir_Whirlpool_test.o : ir_Whirlpool_test.cpp $(COMMON_TEST_DEPS) $(GTEST_HEADERS)
$(CXX) $(CPPFLAGS) $(CXXFLAGS) -I$(USER_DIR) -c ir_Whirlpool_test.cpp
ir_Whirlpool_test : $(COMMON_OBJ) ir_Whirlpool_test.o
$(CXX) $(CPPFLAGS) $(CXXFLAGS) -lpthread $^ -o $@
ir_Lutron.o : $(USER_DIR)/ir_Lutron.cpp $(COMMON_DEPS) $(GTEST_HEADERS)
$(CXX) $(CPPFLAGS) $(CXXFLAGS) -c $(USER_DIR)/ir_Lutron.cpp
ir_Lutron_test.o : ir_Lutron_test.cpp $(COMMON_TEST_DEPS) $(GTEST_HEADERS)
$(CXX) $(CPPFLAGS) $(CXXFLAGS) -I$(USER_DIR) -c ir_Lutron_test.cpp
ir_Lutron_test : $(COMMON_OBJ) ir_Lutron_test.o
$(CXX) $(CPPFLAGS) $(CXXFLAGS) -lpthread $^ -o $@

56
test/ir_Aiwa_test.cpp
View File

@@ -40,7 +40,7 @@ TEST(TestSendAiwa, SendWithRepeats) {
irsend.begin();
irsend.reset();
irsend.sendAiwaRCT501(0x7F, AIWA_RC_T501_BITS, 0); // No repeats.
irsend.sendAiwaRCT501(0x7F, kAiwaRcT501Bits, 0); // No repeats.
EXPECT_EQ(
"m8960s4480"
"m560s560m560s1680m560s1680m560s1680m560s560m560s1680m560s1680m560s560"
@@ -50,7 +50,7 @@ TEST(TestSendAiwa, SendWithRepeats) {
"m560s560m560s560m560s1680m560s1680m560s1680m560s1680m560s1680m560s1680"
"m560s1680m560s1680m560s23520", irsend.outputStr());
irsend.reset();
irsend.sendAiwaRCT501(0x7F, AIWA_RC_T501_BITS, 1); // 1 repeat.
irsend.sendAiwaRCT501(0x7F, kAiwaRcT501Bits, 1); // 1 repeat.
EXPECT_EQ(
"m8960s4480"
"m560s560m560s1680m560s1680m560s1680m560s560m560s1680m560s1680m560s560"
@@ -61,7 +61,7 @@ TEST(TestSendAiwa, SendWithRepeats) {
"m560s1680m560s1680m560s23520"
"m8960s2240m560s96320", irsend.outputStr());
irsend.reset();
irsend.sendAiwaRCT501(0x7F, AIWA_RC_T501_BITS, 2); // 2 repeats.
irsend.sendAiwaRCT501(0x7F, kAiwaRcT501Bits, 2); // 2 repeats.
EXPECT_EQ(
"m8960s4480"
"m560s560m560s1680m560s1680m560s1680m560s560m560s1680m560s1680m560s560"
@@ -118,10 +118,10 @@ TEST(TestDecodeAiwa, NormalDecodeWithStrict) {
irsend.reset();
irsend.sendAiwaRCT501(0x7F);
irsend.makeDecodeResult();
ASSERT_TRUE(irrecv.decodeAiwaRCT501(&irsend.capture, AIWA_RC_T501_BITS,
ASSERT_TRUE(irrecv.decodeAiwaRCT501(&irsend.capture, kAiwaRcT501Bits,
true));
EXPECT_EQ(AIWA_RC_T501, irsend.capture.decode_type);
EXPECT_EQ(AIWA_RC_T501_BITS, irsend.capture.bits);
EXPECT_EQ(kAiwaRcT501Bits, irsend.capture.bits);
EXPECT_EQ(0x7F, irsend.capture.value);
EXPECT_EQ(0x0, irsend.capture.address);
EXPECT_EQ(0x0, irsend.capture.command);
@@ -131,10 +131,10 @@ TEST(TestDecodeAiwa, NormalDecodeWithStrict) {
irsend.reset();
irsend.sendAiwaRCT501(0x0);
irsend.makeDecodeResult();
ASSERT_TRUE(irrecv.decodeAiwaRCT501(&irsend.capture, AIWA_RC_T501_BITS,
ASSERT_TRUE(irrecv.decodeAiwaRCT501(&irsend.capture, kAiwaRcT501Bits,
true));
EXPECT_EQ(AIWA_RC_T501, irsend.capture.decode_type);
EXPECT_EQ(AIWA_RC_T501_BITS, irsend.capture.bits);
EXPECT_EQ(kAiwaRcT501Bits, irsend.capture.bits);
EXPECT_EQ(0x0, irsend.capture.value);
EXPECT_EQ(0x0, irsend.capture.address);
EXPECT_EQ(0x0, irsend.capture.command);
@@ -144,10 +144,10 @@ TEST(TestDecodeAiwa, NormalDecodeWithStrict) {
irsend.reset();
irsend.sendAiwaRCT501(0x7FFF);
irsend.makeDecodeResult();
ASSERT_TRUE(irrecv.decodeAiwaRCT501(&irsend.capture, AIWA_RC_T501_BITS,
ASSERT_TRUE(irrecv.decodeAiwaRCT501(&irsend.capture, kAiwaRcT501Bits,
true));
EXPECT_EQ(AIWA_RC_T501, irsend.capture.decode_type);
EXPECT_EQ(AIWA_RC_T501_BITS, irsend.capture.bits);
EXPECT_EQ(kAiwaRcT501Bits, irsend.capture.bits);
EXPECT_EQ(0x7FFF, irsend.capture.value);
EXPECT_EQ(0x0, irsend.capture.address);
EXPECT_EQ(0x0, irsend.capture.command);
@@ -162,12 +162,12 @@ TEST(TestDecodeAiwa, NormalDecodeWithRepeatAndStrict) {
// Normal Aiwa 15-bit(42bit) message with 2 repeats.
irsend.reset();
irsend.sendAiwaRCT501(0x7F, AIWA_RC_T501_BITS, 2);
irsend.sendAiwaRCT501(0x7F, kAiwaRcT501Bits, 2);
irsend.makeDecodeResult();
ASSERT_TRUE(irrecv.decodeAiwaRCT501(&irsend.capture, AIWA_RC_T501_BITS,
ASSERT_TRUE(irrecv.decodeAiwaRCT501(&irsend.capture, kAiwaRcT501Bits,
true));
EXPECT_EQ(AIWA_RC_T501, irsend.capture.decode_type);
EXPECT_EQ(AIWA_RC_T501_BITS, irsend.capture.bits);
EXPECT_EQ(kAiwaRcT501Bits, irsend.capture.bits);
EXPECT_EQ(0x7F, irsend.capture.value);
EXPECT_EQ(0x0, irsend.capture.address);
EXPECT_EQ(0x0, irsend.capture.command);
@@ -182,47 +182,47 @@ TEST(TestDecodeAiwa, DecodeWithNonStrictValues) {
irsend.reset();
// Confirm using sendNEC(data, 42, 1) can make a legal Aiwa message.
irsend.sendNEC(0x1D8113F00FF, 42, AIWA_RC_T501_MIN_REPEAT);
irsend.sendNEC(0x1D8113F00FF, 42, kAiwaRcT501MinRepeats);
irsend.makeDecodeResult();
// MUST pass with strict on.
ASSERT_TRUE(irrecv.decodeAiwaRCT501(&irsend.capture, AIWA_RC_T501_BITS,
ASSERT_TRUE(irrecv.decodeAiwaRCT501(&irsend.capture, kAiwaRcT501Bits,
true));
ASSERT_EQ(0x7F, irsend.capture.value);
irsend.reset();
// Use sendNEC(data, 42) to make/send an illegal value Aiwa message.
// Value is illegal due to bad pre & post data.
irsend.sendNEC(0x1234567890A, 42, AIWA_RC_T501_MIN_REPEAT);
irsend.sendNEC(0x1234567890A, 42, kAiwaRcT501MinRepeats);
irsend.makeDecodeResult();
// Should fail with strict on.
ASSERT_FALSE(irrecv.decodeAiwaRCT501(&irsend.capture, AIWA_RC_T501_BITS,
ASSERT_FALSE(irrecv.decodeAiwaRCT501(&irsend.capture, kAiwaRcT501Bits,
true));
// Should fail if strict off too.
ASSERT_FALSE(irrecv.decodeAiwaRCT501(&irsend.capture, AIWA_RC_T501_BITS,
ASSERT_FALSE(irrecv.decodeAiwaRCT501(&irsend.capture, kAiwaRcT501Bits,
false));
irsend.reset();
// Use sendNEC(data, 42) to make/send an illegal value Aiwa message.
// Value is illegal due to bad post data only.
irsend.sendNEC(0x1D8113F00FE, 42, AIWA_RC_T501_MIN_REPEAT);
irsend.sendNEC(0x1D8113F00FE, 42, kAiwaRcT501MinRepeats);
irsend.makeDecodeResult();
// Should fail with strict on.
ASSERT_FALSE(irrecv.decodeAiwaRCT501(&irsend.capture, AIWA_RC_T501_BITS,
ASSERT_FALSE(irrecv.decodeAiwaRCT501(&irsend.capture, kAiwaRcT501Bits,
true));
// Should fail if strict off too.
ASSERT_FALSE(irrecv.decodeAiwaRCT501(&irsend.capture, AIWA_RC_T501_BITS,
ASSERT_FALSE(irrecv.decodeAiwaRCT501(&irsend.capture, kAiwaRcT501Bits,
false));
irsend.reset();
// Use sendNEC(data, 42) to make/send an illegal value Aiwa message.
// Value is illegal due to bad pre data only.
irsend.sendNEC(0x0D8113F00FF, 42, AIWA_RC_T501_MIN_REPEAT);
irsend.sendNEC(0x0D8113F00FF, 42, kAiwaRcT501MinRepeats);
irsend.makeDecodeResult();
// Should fail with strict on.
ASSERT_FALSE(irrecv.decodeAiwaRCT501(&irsend.capture, AIWA_RC_T501_BITS,
ASSERT_FALSE(irrecv.decodeAiwaRCT501(&irsend.capture, kAiwaRcT501Bits,
true));
// Should fail if strict off too.
ASSERT_FALSE(irrecv.decodeAiwaRCT501(&irsend.capture, AIWA_RC_T501_BITS,
ASSERT_FALSE(irrecv.decodeAiwaRCT501(&irsend.capture, kAiwaRcT501Bits,
false));
}
@@ -236,7 +236,7 @@ TEST(TestDecodeAiwa, DecodeWithNonStrictSizes) {
irsend.sendAiwaRCT501(0x0, 8); // Illegal size Aiwa 8-bit message.
irsend.makeDecodeResult();
// Should fail with strict on.
ASSERT_FALSE(irrecv.decodeAiwaRCT501(&irsend.capture, AIWA_RC_T501_BITS,
ASSERT_FALSE(irrecv.decodeAiwaRCT501(&irsend.capture, kAiwaRcT501Bits,
true));
// Should pass if strict off.
ASSERT_TRUE(irrecv.decodeAiwaRCT501(&irsend.capture, 8, false));
@@ -248,7 +248,7 @@ TEST(TestDecodeAiwa, DecodeWithNonStrictSizes) {
irsend.sendAiwaRCT501(0x12345678, 32); // Illegal size Aiwa 32-bit message.
irsend.makeDecodeResult();
// Should fail with strict on.
ASSERT_FALSE(irrecv.decodeAiwaRCT501(&irsend.capture, AIWA_RC_T501_BITS,
ASSERT_FALSE(irrecv.decodeAiwaRCT501(&irsend.capture, kAiwaRcT501Bits,
true));
// Should fail with strict when we ask for the wrong bit size.
ASSERT_FALSE(irrecv.decodeAiwaRCT501(&irsend.capture, 32, true));
@@ -278,7 +278,7 @@ TEST(TestDecodeAiwa, Decode64BitMessages) {
// Reconfirm it by sending a true 64bit NEC message with the Aiwa prefix.
irsend.reset();
irsend.sendNEC(0x76044FFFFFFFFFFF, 64, AIWA_RC_T501_MIN_REPEAT);
irsend.sendNEC(0x76044FFFFFFFFFFF, 64, kAiwaRcT501MinRepeats);
irsend.makeDecodeResult();
// Should work with a 'normal' match (not strict)
ASSERT_TRUE(irrecv.decodeAiwaRCT501(&irsend.capture, 37, false));
@@ -308,7 +308,7 @@ TEST(TestDecodeAiwa, DecodeGlobalCacheExample) {
ASSERT_TRUE(irrecv.decodeAiwaRCT501(&irsend.capture));
EXPECT_EQ(AIWA_RC_T501, irsend.capture.decode_type);
EXPECT_EQ(AIWA_RC_T501_BITS, irsend.capture.bits);
EXPECT_EQ(kAiwaRcT501Bits, irsend.capture.bits);
EXPECT_EQ(0x7F, irsend.capture.value);
EXPECT_EQ(0x0, irsend.capture.address);
EXPECT_EQ(0x0, irsend.capture.command);
@@ -333,6 +333,6 @@ TEST(TestDecodeAiwa, FailToDecodeNonAiwaExample) {
irsend.makeDecodeResult();
ASSERT_FALSE(irrecv.decodeAiwaRCT501(&irsend.capture));
ASSERT_FALSE(irrecv.decodeAiwaRCT501(&irsend.capture, AIWA_RC_T501_BITS,
ASSERT_FALSE(irrecv.decodeAiwaRCT501(&irsend.capture, kAiwaRcT501Bits,
false));
}

14
test/ir_Carrier_test.cpp
View File

@@ -84,7 +84,7 @@ TEST(TestSendCarrierAC, SendWithRepeats) {
irsend.begin();
irsend.reset();
irsend.sendCarrierAC(0x12345678, CARRIER_AC_BITS, 2); // two repeats.
irsend.sendCarrierAC(0x12345678, kCarrierAcBits, 2); // two repeats.
EXPECT_EQ(
"m8532s4228"
"m628s532m628s532m628s532m628s1320m628s532m628s532m628s1320m628s532"
@@ -153,9 +153,9 @@ TEST(TestDecodeCarrierAC, NormalDecodeWithStrict) {
irsend.reset();
irsend.sendCarrierAC(0x0);
irsend.makeDecodeResult();
ASSERT_TRUE(irrecv.decodeCarrierAC(&irsend.capture, CARRIER_AC_BITS, true));
ASSERT_TRUE(irrecv.decodeCarrierAC(&irsend.capture, kCarrierAcBits, true));
EXPECT_EQ(CARRIER_AC, irsend.capture.decode_type);
EXPECT_EQ(CARRIER_AC_BITS, irsend.capture.bits);
EXPECT_EQ(kCarrierAcBits, irsend.capture.bits);
EXPECT_EQ(0x0, irsend.capture.value);
EXPECT_EQ(0x0, irsend.capture.address);
EXPECT_EQ(0x0, irsend.capture.command);
@@ -164,9 +164,9 @@ TEST(TestDecodeCarrierAC, NormalDecodeWithStrict) {
irsend.reset();
irsend.sendCarrierAC(0xB335ABE2);
irsend.makeDecodeResult();
ASSERT_TRUE(irrecv.decodeCarrierAC(&irsend.capture, CARRIER_AC_BITS, true));
ASSERT_TRUE(irrecv.decodeCarrierAC(&irsend.capture, kCarrierAcBits, true));
EXPECT_EQ(CARRIER_AC, irsend.capture.decode_type);
EXPECT_EQ(CARRIER_AC_BITS, irsend.capture.bits);
EXPECT_EQ(kCarrierAcBits, irsend.capture.bits);
EXPECT_EQ(0xB335ABE2, irsend.capture.value);
EXPECT_EQ(0xB335, irsend.capture.address);
EXPECT_EQ(0xABE2, irsend.capture.command);
@@ -178,7 +178,7 @@ TEST(TestDecodeCarrierAC, NormalDecodeWithStrict) {
irsend.makeDecodeResult();
ASSERT_TRUE(irrecv.decode(&irsend.capture));
EXPECT_EQ(CARRIER_AC, irsend.capture.decode_type);
EXPECT_EQ(CARRIER_AC_BITS, irsend.capture.bits);
EXPECT_EQ(kCarrierAcBits, irsend.capture.bits);
EXPECT_EQ(0xB335ABE2, irsend.capture.value);
}
@@ -211,7 +211,7 @@ TEST(TestDecodeCarrierAC, RealExamples) {
irsend.makeDecodeResult();
ASSERT_TRUE(irrecv.decode(&irsend.capture));
EXPECT_EQ(CARRIER_AC, irsend.capture.decode_type);
EXPECT_EQ(CARRIER_AC_BITS, irsend.capture.bits);
EXPECT_EQ(kCarrierAcBits, irsend.capture.bits);
EXPECT_EQ(0xB335ABE2, irsend.capture.value);
EXPECT_EQ(0xB335, irsend.capture.address);
EXPECT_EQ(0xABE2, irsend.capture.command);

185
test/ir_Coolix_test.cpp
View File

@@ -1,7 +1,8 @@
// Copyright 2017 David Conran
// Copyright 2017-2018 David Conran
#include "IRsend.h"
#include "IRsend_test.h"
#include "ir_Coolix.h"
#include "gtest/gtest.h"
// Tests for sendCOOLIX().
@@ -54,7 +55,7 @@ TEST(TestSendCoolix, SendWithRepeats) {
irsend.begin();
irsend.reset();
irsend.sendCOOLIX(0xAA55AA, COOLIX_BITS, 1); // 1 repeat.
irsend.sendCOOLIX(0xAA55AA, kCoolixBits, 1); // 1 repeat.
EXPECT_EQ(
"m4480s4480"
"m560s1680m560s560m560s1680m560s560m560s1680m560s560m560s1680m560s560"
@@ -72,7 +73,7 @@ TEST(TestSendCoolix, SendWithRepeats) {
"m560s1680m560s560m560s1680m560s560m560s1680m560s560m560s1680m560s560"
"m560s560m560s1680m560s560m560s1680m560s560m560s1680m560s560m560s1680"
"m560s5040", irsend.outputStr());
irsend.sendCOOLIX(0xAA55AA, COOLIX_BITS, 2); // 2 repeats.
irsend.sendCOOLIX(0xAA55AA, kCoolixBits, 2); // 2 repeats.
EXPECT_EQ(
"m4480s4480"
"m560s1680m560s560m560s1680m560s560m560s1680m560s560m560s1680m560s560"
@@ -153,9 +154,9 @@ TEST(TestDecodeCoolix, NormalDecodeWithStrict) {
irsend.reset();
irsend.sendCOOLIX(0x123456);
irsend.makeDecodeResult();
ASSERT_TRUE(irrecv.decodeCOOLIX(&irsend.capture, COOLIX_BITS, true));
ASSERT_TRUE(irrecv.decodeCOOLIX(&irsend.capture, kCoolixBits, true));
EXPECT_EQ(COOLIX, irsend.capture.decode_type);
EXPECT_EQ(COOLIX_BITS, irsend.capture.bits);
EXPECT_EQ(kCoolixBits, irsend.capture.bits);
EXPECT_EQ(0x123456, irsend.capture.value);
EXPECT_EQ(0x0, irsend.capture.address);
EXPECT_EQ(0x0, irsend.capture.command);
@@ -165,9 +166,9 @@ TEST(TestDecodeCoolix, NormalDecodeWithStrict) {
irsend.reset();
irsend.sendCOOLIX(0x0);
irsend.makeDecodeResult();
ASSERT_TRUE(irrecv.decodeCOOLIX(&irsend.capture, COOLIX_BITS, true));
ASSERT_TRUE(irrecv.decodeCOOLIX(&irsend.capture, kCoolixBits, true));
EXPECT_EQ(COOLIX, irsend.capture.decode_type);
EXPECT_EQ(COOLIX_BITS, irsend.capture.bits);
EXPECT_EQ(kCoolixBits, irsend.capture.bits);
EXPECT_EQ(0x0, irsend.capture.value);
EXPECT_EQ(0x0, irsend.capture.address);
EXPECT_EQ(0x0, irsend.capture.command);
@@ -177,9 +178,9 @@ TEST(TestDecodeCoolix, NormalDecodeWithStrict) {
irsend.reset();
irsend.sendCOOLIX(0xFFFFFF);
irsend.makeDecodeResult();
ASSERT_TRUE(irrecv.decodeCOOLIX(&irsend.capture, COOLIX_BITS, true));
ASSERT_TRUE(irrecv.decodeCOOLIX(&irsend.capture, kCoolixBits, true));
EXPECT_EQ(COOLIX, irsend.capture.decode_type);
EXPECT_EQ(COOLIX_BITS, irsend.capture.bits);
EXPECT_EQ(kCoolixBits, irsend.capture.bits);
EXPECT_EQ(0xFFFFFF, irsend.capture.value);
EXPECT_EQ(0x0, irsend.capture.address);
EXPECT_EQ(0x0, irsend.capture.command);
@@ -194,24 +195,24 @@ TEST(TestDecodeCoolix, NormalDecodeWithRepeatAndStrict) {
// Normal Coolix 16-bit message with 2 repeats.
irsend.reset();
irsend.sendCOOLIX(0x123456, COOLIX_BITS, 2);
irsend.sendCOOLIX(0x123456, kCoolixBits, 2);
irsend.makeDecodeResult();
ASSERT_TRUE(irrecv.decodeCOOLIX(&irsend.capture, COOLIX_BITS, true));
ASSERT_TRUE(irrecv.decodeCOOLIX(&irsend.capture, kCoolixBits, true));
EXPECT_EQ(COOLIX, irsend.capture.decode_type);
EXPECT_EQ(COOLIX_BITS, irsend.capture.bits);
EXPECT_EQ(kCoolixBits, irsend.capture.bits);
EXPECT_EQ(0x123456, irsend.capture.value);
EXPECT_FALSE(irsend.capture.repeat);
irsend.makeDecodeResult(4 * COOLIX_BITS + 4);
ASSERT_TRUE(irrecv.decodeCOOLIX(&irsend.capture, COOLIX_BITS, true));
irsend.makeDecodeResult(4 * kCoolixBits + 4);
ASSERT_TRUE(irrecv.decodeCOOLIX(&irsend.capture, kCoolixBits, true));
EXPECT_EQ(COOLIX, irsend.capture.decode_type);
EXPECT_EQ(COOLIX_BITS, irsend.capture.bits);
EXPECT_EQ(kCoolixBits, irsend.capture.bits);
EXPECT_EQ(0x123456, irsend.capture.value);
irsend.makeDecodeResult(2 * (4 * COOLIX_BITS + 4));
ASSERT_TRUE(irrecv.decodeCOOLIX(&irsend.capture, COOLIX_BITS, true));
irsend.makeDecodeResult(2 * (4 * kCoolixBits + 4));
ASSERT_TRUE(irrecv.decodeCOOLIX(&irsend.capture, kCoolixBits, true));
EXPECT_EQ(COOLIX, irsend.capture.decode_type);
EXPECT_EQ(COOLIX_BITS, irsend.capture.bits);
EXPECT_EQ(kCoolixBits, irsend.capture.bits);
EXPECT_EQ(0x123456, irsend.capture.value);
}
@@ -225,7 +226,7 @@ TEST(TestDecodeCoolix, DecodeWithNonStrictSizes) {
irsend.sendCOOLIX(0x12, 8); // Illegal value Coolix 8-bit message.
irsend.makeDecodeResult();
// Should fail with strict on.
ASSERT_FALSE(irrecv.decodeCOOLIX(&irsend.capture, COOLIX_BITS, true));
ASSERT_FALSE(irrecv.decodeCOOLIX(&irsend.capture, kCoolixBits, true));
// Should pass if strict off.
ASSERT_TRUE(irrecv.decodeCOOLIX(&irsend.capture, 8, false));
EXPECT_EQ(COOLIX, irsend.capture.decode_type);
@@ -236,7 +237,7 @@ TEST(TestDecodeCoolix, DecodeWithNonStrictSizes) {
irsend.sendCOOLIX(0x12345678, 32); // Illegal value Coolix 32-bit message.
irsend.makeDecodeResult();
// Shouldn't pass with strict when we ask for less bits than we got.
ASSERT_FALSE(irrecv.decodeCOOLIX(&irsend.capture, COOLIX_BITS, true));
ASSERT_FALSE(irrecv.decodeCOOLIX(&irsend.capture, kCoolixBits, true));
irsend.makeDecodeResult();
// Should fail with strict when we ask for the wrong bit size.
@@ -249,7 +250,7 @@ TEST(TestDecodeCoolix, DecodeWithNonStrictSizes) {
// Decode should fail if asked to decode non-multiples of 8 bits.
irsend.reset();
irsend.sendCOOLIX(0x123456, COOLIX_BITS, 2);
irsend.sendCOOLIX(0x123456, kCoolixBits, 2);
irsend.makeDecodeResult();
ASSERT_FALSE(irrecv.decodeCOOLIX(&irsend.capture, 9, false));
}
@@ -286,5 +287,145 @@ TEST(TestDecodeCoolix, FailToDecodeNonCoolixExample) {
irsend.makeDecodeResult();
ASSERT_FALSE(irrecv.decodeCOOLIX(&irsend.capture));
ASSERT_FALSE(irrecv.decodeCOOLIX(&irsend.capture, COOLIX_BITS, false));
ASSERT_FALSE(irrecv.decodeCOOLIX(&irsend.capture, kCoolixBits, false));
}
// Tests for the IRCoolixAC class.
TEST(TestCoolixACClass, SetAndGetRaw) {
IRCoolixAC ircoolix(0);
ircoolix.setRaw(kCoolixOff);
EXPECT_EQ(kCoolixOff, ircoolix.getRaw());
ircoolix.setRaw(kCoolixDefaultState);
EXPECT_EQ(kCoolixDefaultState, ircoolix.getRaw());
}
TEST(TestCoolixACClass, SetAndGetTemp) {
IRCoolixAC ircoolix(0);
ircoolix.setTemp(25);
EXPECT_EQ(25, ircoolix.getTemp());
ircoolix.setTemp(kCoolixTempMin);
EXPECT_EQ(kCoolixTempMin, ircoolix.getTemp());
ircoolix.setTemp(kCoolixTempMax);
EXPECT_EQ(kCoolixTempMax, ircoolix.getTemp());
ircoolix.setTemp(kCoolixTempMin - 1);
EXPECT_EQ(kCoolixTempMin, ircoolix.getTemp());
ircoolix.setTemp(kCoolixTempMax + 1);
EXPECT_EQ(kCoolixTempMax, ircoolix.getTemp());
}
TEST(TestCoolixACClass, SetAndGetMode) {
IRCoolixAC ircoolix(0);
ircoolix.setMode(kCoolixHeat);
EXPECT_EQ(kCoolixHeat, ircoolix.getMode());
ircoolix.setMode(kCoolixCool);
EXPECT_EQ(kCoolixCool, ircoolix.getMode());
ircoolix.setMode(kCoolixDry);
EXPECT_EQ(kCoolixDry, ircoolix.getMode());
ircoolix.setMode(kCoolixAuto);
EXPECT_EQ(kCoolixAuto, ircoolix.getMode());
ircoolix.setMode(kCoolixFan);
EXPECT_EQ(kCoolixFan, ircoolix.getMode());
}
TEST(TestCoolixACClass, SetAndGetFan) {
IRCoolixAC ircoolix(0);
ircoolix.setFan(kCoolixFanMax);
EXPECT_EQ(kCoolixFanMax, ircoolix.getFan());
ircoolix.setFan(kCoolixFanMin);
EXPECT_EQ(kCoolixFanMin, ircoolix.getFan());
ircoolix.setFan(kCoolixFanZoneFollow);
EXPECT_EQ(kCoolixFanZoneFollow, ircoolix.getFan());
ircoolix.setFan(kCoolixFanAuto);
EXPECT_EQ(kCoolixFanAuto, ircoolix.getFan());
ircoolix.setFan(kCoolixFanMax);
EXPECT_EQ(kCoolixFanMax, ircoolix.getFan());
ASSERT_NE(3, kCoolixFanAuto);
// Now try some unexpected value.
ircoolix.setFan(3);
EXPECT_EQ(kCoolixFanAuto, ircoolix.getFan());
}
TEST(TestCoolixACClass, SetGetClearSensorTempAndZoneFollow) {
IRCoolixAC ircoolix(0);
ircoolix.setRaw(kCoolixDefaultState);
EXPECT_FALSE(ircoolix.getZoneFollow());
EXPECT_LT(kCoolixSensorTempMax, ircoolix.getSensorTemp());
ircoolix.setSensorTemp(25);
EXPECT_TRUE(ircoolix.getZoneFollow());
EXPECT_EQ(25, ircoolix.getSensorTemp());
// Lower bounds
ircoolix.setSensorTemp(kCoolixSensorTempMin);
EXPECT_TRUE(ircoolix.getZoneFollow());
EXPECT_EQ(kCoolixSensorTempMin, ircoolix.getSensorTemp());
ircoolix.setSensorTemp(kCoolixSensorTempMin - 1);
EXPECT_TRUE(ircoolix.getZoneFollow());
EXPECT_EQ(kCoolixSensorTempMin, ircoolix.getSensorTemp());
// Upper bounds
ircoolix.setSensorTemp(kCoolixSensorTempMax);
EXPECT_TRUE(ircoolix.getZoneFollow());
EXPECT_EQ(kCoolixSensorTempMax, ircoolix.getSensorTemp());
ircoolix.setSensorTemp(kCoolixSensorTempMax + 1);
EXPECT_TRUE(ircoolix.getZoneFollow());
EXPECT_EQ(kCoolixSensorTempMax, ircoolix.getSensorTemp());
// Clearing
ircoolix.clearSensorTemp();
EXPECT_FALSE(ircoolix.getZoneFollow());
EXPECT_LT(kCoolixSensorTempMax, ircoolix.getSensorTemp());
}
TEST(TestCoolixACClass, SpecialModesAndReset) {
IRCoolixAC ircoolix(0);
ASSERT_NE(kCoolixSwing, ircoolix.getRaw());
ircoolix.setSwing();
ASSERT_EQ(kCoolixSwing, ircoolix.getRaw());
ircoolix.setTurbo();
ASSERT_EQ(kCoolixTurbo, ircoolix.getRaw());
ircoolix.setSleep();
ASSERT_EQ(kCoolixSleep, ircoolix.getRaw());
ircoolix.setLed();
ASSERT_EQ(kCoolixLed, ircoolix.getRaw());
ircoolix.setClean();
ASSERT_EQ(kCoolixClean, ircoolix.getRaw());
ircoolix.stateReset();
ASSERT_NE(kCoolixClean, ircoolix.getRaw());
}
TEST(TestCoolixACClass, HumanReadable) {
IRCoolixAC ircoolix(0);
// Initial starting point.
EXPECT_EQ("Power: On, Fan: 5 (AUTO), Mode: 2 (AUTO), Temp: 25C, "
"Zone Follow: Off, Sensor Temp: Ignored",
ircoolix.toString());
ircoolix.setSensorTemp(24);
ircoolix.setTemp(22);
ircoolix.setMode(kCoolixCool);
ircoolix.setFan(kCoolixFanMin);
EXPECT_EQ("Power: On, Fan: 4 (MIN), Mode: 0 (COOL), Temp: 22C, "
"Zone Follow: On, Sensor Temp: 24C",
ircoolix.toString());
ircoolix.setSwing();
EXPECT_EQ("Power: On, Fan: 3 (UNKNOWN), Swing: Toggle", ircoolix.toString());
ircoolix.setPower(false);
EXPECT_EQ("Power: Off", ircoolix.toString());
}
TEST(TestCoolixACClass, KnownExamples) {
IRCoolixAC ircoolix(0);
ircoolix.setRaw(0b101100101011111111100100);
EXPECT_EQ("Power: On, Fan: 5 (AUTO), Mode: 4 (FAN), Zone Follow: Off, "
"Sensor Temp: Ignored", ircoolix.toString());
ircoolix.setRaw(0b101100101001111100000000);
EXPECT_EQ("Power: On, Fan: 4 (MIN), Mode: 0 (COOL), Temp: 17C, "
"Zone Follow: Off, Sensor Temp: Ignored", ircoolix.toString());
}

140
test/ir_Daikin_test.cpp
View File

@@ -13,7 +13,7 @@ TEST(TestSendDaikin, SendDataOnly) {
IRsendTest irsend(4);
irsend.begin();
uint8_t daikin_code[DAIKIN_COMMAND_LENGTH] = {
uint8_t daikin_code[kDaikinStateLength] = {
0x11, 0xDA, 0x27, 0xF0, 0x00, 0x00, 0x00, 0x20,
0x11, 0xDA, 0x27, 0x00, 0x00, 0x41, 0x1E, 0x00,
0xB0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xC0, 0x00, 0x00, 0xE3};
@@ -69,13 +69,13 @@ TEST(TestSendDaikin, SendWithRepeats) {
irsend.begin();
irsend.reset();
uint8_t daikin_code[DAIKIN_COMMAND_LENGTH] = {
uint8_t daikin_code[kDaikinStateLength] = {
0x11, 0xDA, 0x27, 0xF0, 0x00, 0x00, 0x00, 0x20,
0x11, 0xDA, 0x27, 0x00, 0x00, 0x41, 0x1E, 0x00,
0xB0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xC0, 0x00, 0x00, 0xE3};
irsend.reset();
irsend.sendDaikin(daikin_code, DAIKIN_COMMAND_LENGTH, 1);
irsend.sendDaikin(daikin_code, kDaikinStateLength, 1);
EXPECT_EQ(
"m428s428m428s428m428s428m428s428m428s428"
"m428s29428m3650s1623"
@@ -164,21 +164,21 @@ TEST(TestSendDaikin, SendUnexpectedSizes) {
IRsendTest irsend(4);
irsend.begin();
uint8_t daikin_short_code[DAIKIN_COMMAND_LENGTH - 1] = {
uint8_t daikin_short_code[kDaikinStateLength - 1] = {
0x11, 0xDA, 0x27, 0xF0, 0x00, 0x00, 0x00, 0x20,
0x11, 0xDA, 0x27, 0x00, 0x00, 0x41, 0x1E, 0x00,
0xB0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xC0, 0x00, 0x00};
irsend.reset();
irsend.sendDaikin(daikin_short_code, DAIKIN_COMMAND_LENGTH - 1);
irsend.sendDaikin(daikin_short_code, kDaikinStateLength - 1);
ASSERT_EQ("", irsend.outputStr());
uint8_t daikin_long_code[DAIKIN_COMMAND_LENGTH + 1] = {
uint8_t daikin_long_code[kDaikinStateLength + 1] = {
0x11, 0xDA, 0x27, 0xF0, 0x00, 0x00, 0x00, 0x20,
0x11, 0xDA, 0x27, 0x00, 0x00, 0x41, 0x1E, 0x00,
0xB0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xC0, 0x00, 0x00, 0xE3, 0x11};
irsend.reset();
irsend.sendDaikin(daikin_long_code, DAIKIN_COMMAND_LENGTH + 1);
irsend.sendDaikin(daikin_long_code, kDaikinStateLength + 1);
ASSERT_EQ(
"m428s428m428s428m428s428m428s428m428s428"
"m428s29428m3650s1623"
@@ -247,25 +247,25 @@ TEST(TestDaikinClass, Temperature) {
irdaikin.begin();
irdaikin.setTemp(0);
EXPECT_EQ(DAIKIN_MIN_TEMP, irdaikin.getTemp());
EXPECT_EQ(kDaikinMinTemp, irdaikin.getTemp());
irdaikin.setTemp(255);
EXPECT_EQ(DAIKIN_MAX_TEMP, irdaikin.getTemp());
EXPECT_EQ(kDaikinMaxTemp, irdaikin.getTemp());
irdaikin.setTemp(DAIKIN_MIN_TEMP);
EXPECT_EQ(DAIKIN_MIN_TEMP, irdaikin.getTemp());
irdaikin.setTemp(kDaikinMinTemp);
EXPECT_EQ(kDaikinMinTemp, irdaikin.getTemp());
irdaikin.setTemp(DAIKIN_MAX_TEMP);
EXPECT_EQ(DAIKIN_MAX_TEMP, irdaikin.getTemp());
irdaikin.setTemp(kDaikinMaxTemp);
EXPECT_EQ(kDaikinMaxTemp, irdaikin.getTemp());
irdaikin.setTemp(DAIKIN_MIN_TEMP - 1);
EXPECT_EQ(DAIKIN_MIN_TEMP, irdaikin.getTemp());
irdaikin.setTemp(kDaikinMinTemp - 1);
EXPECT_EQ(kDaikinMinTemp, irdaikin.getTemp());
irdaikin.setTemp(DAIKIN_MAX_TEMP + 1);
EXPECT_EQ(DAIKIN_MAX_TEMP, irdaikin.getTemp());
irdaikin.setTemp(kDaikinMaxTemp + 1);
EXPECT_EQ(kDaikinMaxTemp, irdaikin.getTemp());
irdaikin.setTemp(DAIKIN_MIN_TEMP + 1);
EXPECT_EQ(DAIKIN_MIN_TEMP + 1, irdaikin.getTemp());
irdaikin.setTemp(kDaikinMinTemp + 1);
EXPECT_EQ(kDaikinMinTemp + 1, irdaikin.getTemp());
irdaikin.setTemp(21);
EXPECT_EQ(21, irdaikin.getTemp());
@@ -281,29 +281,29 @@ TEST(TestDaikinClass, OperatingMode) {
IRDaikinESP irdaikin(0);
irdaikin.begin();
irdaikin.setMode(DAIKIN_AUTO);
EXPECT_EQ(DAIKIN_AUTO, irdaikin.getMode());
irdaikin.setMode(kDaikinAuto);
EXPECT_EQ(kDaikinAuto, irdaikin.getMode());
irdaikin.setMode(DAIKIN_COOL);
EXPECT_EQ(DAIKIN_COOL, irdaikin.getMode());
irdaikin.setMode(kDaikinCool);
EXPECT_EQ(kDaikinCool, irdaikin.getMode());
irdaikin.setMode(DAIKIN_HEAT);
EXPECT_EQ(DAIKIN_HEAT, irdaikin.getMode());
irdaikin.setMode(kDaikinHeat);
EXPECT_EQ(kDaikinHeat, irdaikin.getMode());
irdaikin.setMode(DAIKIN_DRY);
EXPECT_EQ(DAIKIN_DRY, irdaikin.getMode());
irdaikin.setMode(kDaikinDry);
EXPECT_EQ(kDaikinDry, irdaikin.getMode());
irdaikin.setMode(DAIKIN_FAN);
EXPECT_EQ(DAIKIN_FAN, irdaikin.getMode());
irdaikin.setMode(kDaikinFan);
EXPECT_EQ(kDaikinFan, irdaikin.getMode());
irdaikin.setMode(DAIKIN_FAN + 1);
EXPECT_EQ(DAIKIN_AUTO, irdaikin.getMode());
irdaikin.setMode(kDaikinFan + 1);
EXPECT_EQ(kDaikinAuto, irdaikin.getMode());
irdaikin.setMode(DAIKIN_AUTO + 1);
EXPECT_EQ(DAIKIN_AUTO, irdaikin.getMode());
irdaikin.setMode(kDaikinAuto + 1);
EXPECT_EQ(kDaikinAuto, irdaikin.getMode());
irdaikin.setMode(255);
EXPECT_EQ(DAIKIN_AUTO, irdaikin.getMode());
EXPECT_EQ(kDaikinAuto, irdaikin.getMode());
}
TEST(TestDaikinClass, VaneSwing) {
@@ -405,40 +405,40 @@ TEST(TestDaikinClass, FanSpeed) {
// Unexpected value should default to Auto.
irdaikin.setFan(0);
EXPECT_EQ(DAIKIN_FAN_AUTO, irdaikin.getFan());
EXPECT_EQ(kDaikinFanAuto, irdaikin.getFan());
// Unexpected value should default to Auto.
irdaikin.setFan(255);
EXPECT_EQ(DAIKIN_FAN_AUTO, irdaikin.getFan());
EXPECT_EQ(kDaikinFanAuto, irdaikin.getFan());
irdaikin.setFan(DAIKIN_FAN_MAX);
EXPECT_EQ(DAIKIN_FAN_MAX, irdaikin.getFan());
irdaikin.setFan(kDaikinFanMax);
EXPECT_EQ(kDaikinFanMax, irdaikin.getFan());
// Beyond Max should default to Auto.
irdaikin.setFan(DAIKIN_FAN_MAX + 1);
EXPECT_EQ(DAIKIN_FAN_AUTO, irdaikin.getFan());
irdaikin.setFan(kDaikinFanMax + 1);
EXPECT_EQ(kDaikinFanAuto, irdaikin.getFan());
irdaikin.setFan(DAIKIN_FAN_MAX - 1);
EXPECT_EQ(DAIKIN_FAN_MAX - 1, irdaikin.getFan());
irdaikin.setFan(kDaikinFanMax - 1);
EXPECT_EQ(kDaikinFanMax - 1, irdaikin.getFan());
irdaikin.setFan(DAIKIN_FAN_MIN);
EXPECT_EQ(DAIKIN_FAN_MIN, irdaikin.getFan());
irdaikin.setFan(kDaikinFanMin);
EXPECT_EQ(kDaikinFanMin, irdaikin.getFan());
irdaikin.setFan(DAIKIN_FAN_MIN + 1);
EXPECT_EQ(DAIKIN_FAN_MIN + 1, irdaikin.getFan());
irdaikin.setFan(kDaikinFanMin + 1);
EXPECT_EQ(kDaikinFanMin + 1, irdaikin.getFan());
// Beyond Min should default to Auto.
irdaikin.setFan(DAIKIN_FAN_MIN - 1);
EXPECT_EQ(DAIKIN_FAN_AUTO, irdaikin.getFan());
irdaikin.setFan(kDaikinFanMin - 1);
EXPECT_EQ(kDaikinFanAuto, irdaikin.getFan());
irdaikin.setFan(3);
EXPECT_EQ(3, irdaikin.getFan());
irdaikin.setFan(DAIKIN_FAN_AUTO);
EXPECT_EQ(DAIKIN_FAN_AUTO, irdaikin.getFan());
irdaikin.setFan(kDaikinFanAuto);
EXPECT_EQ(kDaikinFanAuto, irdaikin.getFan());
irdaikin.setFan(DAIKIN_FAN_QUIET);
EXPECT_EQ(DAIKIN_FAN_QUIET, irdaikin.getFan());
irdaikin.setFan(kDaikinFanQuiet);
EXPECT_EQ(kDaikinFanQuiet, irdaikin.getFan());
}
TEST(TestDaikinClass, CurrentTime) {
@@ -598,27 +598,27 @@ TEST(TestDaikinClass, RenderTime) {
TEST(TestDaikinClass, SetAndGetRaw) {
IRDaikinESP irdaikin(0);
uint8_t initialState[DAIKIN_COMMAND_LENGTH] = {
uint8_t initialState[kDaikinStateLength] = {
0x11, 0xDA, 0x27, 0x00, 0x42, 0x00, 0x00, 0x54,
0x11, 0xDA, 0x27, 0x00, 0x00, 0x49, 0x1E, 0x00,
0xB0, 0x00, 0x00, 0x06, 0x60, 0x00, 0x00, 0xC0, 0x00, 0x00, 0x4F};
uint8_t expectedState[DAIKIN_COMMAND_LENGTH] = {
uint8_t expectedState[kDaikinStateLength] = {
0x11, 0xDA, 0x27, 0x00, 0x42, 0x00, 0x00, 0x54,
0x11, 0xDA, 0x27, 0x00, 0x00, 0x48, 0x2A, 0x00,
0xB0, 0x00, 0x00, 0x06, 0x60, 0x00, 0x00, 0xC0, 0x00, 0x02, 0x5A};
EXPECT_STATE_EQ(initialState, irdaikin.getRaw(), DAIKIN_BITS);
EXPECT_STATE_EQ(initialState, irdaikin.getRaw(), kDaikinBits);
// toggle the power state.
irdaikin.setPower(!irdaikin.getPower());
irdaikin.setTemp(21);
irdaikin.setMold(true);
EXPECT_STATE_EQ(expectedState, irdaikin.getRaw(), DAIKIN_BITS);
EXPECT_STATE_EQ(expectedState, irdaikin.getRaw(), kDaikinBits);
irdaikin.setRaw(initialState);
EXPECT_STATE_EQ(initialState, irdaikin.getRaw(), DAIKIN_BITS);
EXPECT_STATE_EQ(initialState, irdaikin.getRaw(), kDaikinBits);
}
TEST(TestDaikinClass, ChecksumValidation) {
uint8_t daikin_code[DAIKIN_COMMAND_LENGTH] = {
uint8_t daikin_code[kDaikinStateLength] = {
0x11, 0xDA, 0x27, 0xF0, 0x00, 0x00, 0x00, 0x02,
0x11, 0xDA, 0x27, 0x00, 0x00, 0x41, 0x1E, 0x00,
0xB0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xC0, 0x00, 0x00, 0xE1};
@@ -648,9 +648,9 @@ TEST(TestDaikinClass, HumanReadable) {
"Swing (Horizontal): Off, Swing (Vertical): Off, "
"Current Time: 0:00, On Time: Off, Off Time: Off",
irdaikin.toString());
irdaikin.setMode(DAIKIN_AUTO);
irdaikin.setMode(kDaikinAuto);
irdaikin.setTemp(25);
irdaikin.setFan(DAIKIN_FAN_AUTO);
irdaikin.setFan(kDaikinFanAuto);
irdaikin.setQuiet(true);
irdaikin.setSensor(true);
irdaikin.setEye(true);
@@ -675,8 +675,8 @@ TEST(TestDaikinClass, MessageConstuction) {
irdaikin.begin();
irsend.begin();
irdaikin.setFan(DAIKIN_FAN_MIN);
irdaikin.setMode(DAIKIN_COOL);
irdaikin.setFan(kDaikinFanMin);
irdaikin.setMode(kDaikinCool);
irdaikin.setTemp(27);
irdaikin.setSwingVertical(false);
irdaikin.setSwingHorizontal(true);
@@ -684,8 +684,8 @@ TEST(TestDaikinClass, MessageConstuction) {
irdaikin.setPower(true);
// Check everything for kicks.
EXPECT_EQ(DAIKIN_FAN_MIN, irdaikin.getFan());
EXPECT_EQ(DAIKIN_COOL, irdaikin.getMode());
EXPECT_EQ(kDaikinFanMin, irdaikin.getFan());
EXPECT_EQ(kDaikinCool, irdaikin.getMode());
EXPECT_EQ(27, irdaikin.getTemp());
EXPECT_FALSE(irdaikin.getSwingVertical());
EXPECT_TRUE(irdaikin.getSwingHorizontal());
@@ -746,11 +746,11 @@ TEST(TestDecodeDaikin, RealExample) {
IRrecv irrecv(4);
irsend.begin();
uint8_t expectedState[DAIKIN_COMMAND_LENGTH] = {
uint8_t expectedState[kDaikinStateLength] = {
0x11, 0xDA, 0x27, 0x00, 0x42, 0x3A, 0x05, 0x93, 0x11, 0xDA, 0x27, 0x00,
0x00, 0x3F, 0x3A, 0x00, 0xA0, 0x00, 0x0A, 0x25, 0x17, 0x01, 0x00, 0xC0,
0x00, 0x00, 0x32};
uint16_t rawData[DAIKIN_RAW_BITS] = {
uint16_t rawData[kDaikinRawBits] = {
416, 446, 416, 446, 416, 446, 418, 446, 416, 446, 416, 25434,
3436, 1768, 390, 1336, 390, 446, 416, 446, 416, 446, 416, 1336,
390, 446, 416, 446, 416, 446, 416, 446, 416, 1336, 390, 448,
@@ -802,11 +802,11 @@ TEST(TestDecodeDaikin, RealExample) {
390, 1336, 390, 446, 416, 446, 416}; // Captured by @sillyfrog
irsend.reset();
irsend.sendRaw(rawData, DAIKIN_RAW_BITS, 38000);
irsend.sendRaw(rawData, kDaikinRawBits, 38000);
irsend.makeDecodeResult();
EXPECT_TRUE(irrecv.decode(&irsend.capture));
ASSERT_EQ(DAIKIN, irsend.capture.decode_type);
ASSERT_EQ(DAIKIN_BITS, irsend.capture.bits);
ASSERT_EQ(kDaikinBits, irsend.capture.bits);
EXPECT_STATE_EQ(expectedState, irsend.capture.state, irsend.capture.bits);
}
@@ -817,7 +817,7 @@ TEST(TestDecodeDaikin, SyntheticExample) {
IRrecv irrecv(4);
irsend.begin();
uint8_t expectedState[DAIKIN_COMMAND_LENGTH] = {
uint8_t expectedState[kDaikinStateLength] = {
0x11, 0xDA, 0x27, 0x00, 0x42, 0x3A, 0x05, 0x93, 0x11, 0xDA, 0x27, 0x00,
0x00, 0x3F, 0x3A, 0x00, 0xA0, 0x00, 0x0A, 0x25, 0x17, 0x01, 0x00, 0xC0,
0x00, 0x00, 0x32};
@@ -827,6 +827,6 @@ TEST(TestDecodeDaikin, SyntheticExample) {
irsend.makeDecodeResult();
EXPECT_TRUE(irrecv.decode(&irsend.capture));
ASSERT_EQ(DAIKIN, irsend.capture.decode_type);
ASSERT_EQ(DAIKIN_BITS, irsend.capture.bits);
ASSERT_EQ(kDaikinBits, irsend.capture.bits);
EXPECT_STATE_EQ(expectedState, irsend.capture.state, irsend.capture.bits);
}

8
test/ir_Denon_test.cpp
View File

@@ -179,12 +179,12 @@ TEST(TestDecodeDenon, NormalDecodeWithStrict) {
// Legacy Denon 14-bit message.
irsend.reset();
irsend.sendDenon(0x1278, DENON_LEGACY_BITS);
irsend.sendDenon(0x1278, kDenonLegacyBits);
irsend.makeDecodeResult();
ASSERT_TRUE(irrecv.decodeDenon(&irsend.capture, DENON_LEGACY_BITS, true));
ASSERT_TRUE(irrecv.decodeDenon(&irsend.capture, kDenonLegacyBits, true));
EXPECT_EQ(DENON, irsend.capture.decode_type);
EXPECT_EQ(DENON_LEGACY_BITS, irsend.capture.bits);
EXPECT_EQ(kDenonLegacyBits, irsend.capture.bits);
EXPECT_EQ(0x1278, irsend.capture.value);
EXPECT_EQ(0x0, irsend.capture.address);
EXPECT_EQ(0x0, irsend.capture.command);
@@ -266,7 +266,7 @@ TEST(TestDecodeDenon, FailToDecodeNonDenonExample) {
irsend.makeDecodeResult();
ASSERT_FALSE(irrecv.decodeDenon(&irsend.capture));
ASSERT_FALSE(irrecv.decodeDenon(&irsend.capture, DENON_LEGACY_BITS, false));
ASSERT_FALSE(irrecv.decodeDenon(&irsend.capture, kDenonLegacyBits, false));
ASSERT_FALSE(irrecv.decodeDenon(&irsend.capture, DENON_BITS, false));
ASSERT_FALSE(irrecv.decodeDenon(&irsend.capture, DENON_48_BITS, false));
}

28
test/ir_Dish_test.cpp
View File

@@ -69,7 +69,7 @@ TEST(TestSendDish, SendWithRepeats) {
irsend.begin();
irsend.reset();
irsend.sendDISH(0x9C00, DISH_BITS, 0); // 0 repeats.
irsend.sendDISH(0x9C00, kDishBits, 0); // 0 repeats.
EXPECT_EQ(
"m400s6100"
"m400s1700m400s2800m400s2800m400s1700m400s1700m400s1700m400s2800m400s2800"
@@ -77,7 +77,7 @@ TEST(TestSendDish, SendWithRepeats) {
"m400s6100", irsend.outputStr());
irsend.reset();
irsend.sendDISH(0x9C00, DISH_BITS, 1); // 1 repeat.
irsend.sendDISH(0x9C00, kDishBits, 1); // 1 repeat.
EXPECT_EQ(
"m400s6100"
"m400s1700m400s2800m400s2800m400s1700m400s1700m400s1700m400s2800m400s2800"
@@ -87,7 +87,7 @@ TEST(TestSendDish, SendWithRepeats) {
"m400s2800m400s2800m400s2800m400s2800m400s2800m400s2800m400s2800m400s2800"
"m400s6100", irsend.outputStr());
irsend.sendDISH(0x9C00, DISH_BITS, 2); // 2 repeats.
irsend.sendDISH(0x9C00, kDishBits, 2); // 2 repeats.
EXPECT_EQ(
"m400s6100"
"m400s1700m400s2800m400s2800m400s1700m400s1700m400s1700m400s2800m400s2800"
@@ -173,9 +173,9 @@ TEST(TestDecodeDish, NormalDecodeWithStrict) {
irsend.reset();
irsend.sendDISH(0x9C00);
irsend.makeDecodeResult();
ASSERT_TRUE(irrecv.decodeDISH(&irsend.capture, DISH_BITS, true));
ASSERT_TRUE(irrecv.decodeDISH(&irsend.capture, kDishBits, true));
EXPECT_EQ(DISH, irsend.capture.decode_type);
EXPECT_EQ(DISH_BITS, irsend.capture.bits);
EXPECT_EQ(kDishBits, irsend.capture.bits);
EXPECT_EQ(0x9C00, irsend.capture.value);
EXPECT_EQ(0x0, irsend.capture.address);
EXPECT_EQ(0x0, irsend.capture.command);
@@ -192,7 +192,7 @@ TEST(TestDecodeDish, DecodeWithNonStrictSize) {
irsend.sendDISH(0x12, 8); // Illegal size Dish message. (smaller)
irsend.makeDecodeResult();
ASSERT_FALSE(irrecv.decodeDISH(&irsend.capture, DISH_BITS, true));
ASSERT_FALSE(irrecv.decodeDISH(&irsend.capture, kDishBits, true));
irsend.makeDecodeResult();
// Should fail with strict when we ask for the wrong bit size.
@@ -209,7 +209,7 @@ TEST(TestDecodeDish, DecodeWithNonStrictSize) {
irsend.sendDISH(0x12345678, 32); // Illegal size Dish message. (larger)
irsend.makeDecodeResult();
ASSERT_FALSE(irrecv.decodeDISH(&irsend.capture, DISH_BITS, true));
ASSERT_FALSE(irrecv.decodeDISH(&irsend.capture, kDishBits, true));
irsend.makeDecodeResult();
// Should fail with strict when we ask for the wrong bit size.
@@ -256,9 +256,9 @@ TEST(TestDecodeDish, DecodeGlobalCacheExample) {
irsend.sendGC(gc_test_dtv, 27);
irsend.makeDecodeResult();
ASSERT_TRUE(irrecv.decodeDISH(&irsend.capture, DISH_BITS, true));
ASSERT_TRUE(irrecv.decodeDISH(&irsend.capture, kDishBits, true));
EXPECT_EQ(DISH, irsend.capture.decode_type);
EXPECT_EQ(DISH_BITS, irsend.capture.bits);
EXPECT_EQ(kDishBits, irsend.capture.bits);
EXPECT_EQ(0x0, irsend.capture.value);
EXPECT_EQ(0x0, irsend.capture.address);
EXPECT_EQ(0x0, irsend.capture.command);
@@ -266,7 +266,7 @@ TEST(TestDecodeDish, DecodeGlobalCacheExample) {
ASSERT_TRUE(irrecv.decodeDISH(&irsend.capture));
EXPECT_EQ(DISH, irsend.capture.decode_type);
EXPECT_EQ(DISH_BITS, irsend.capture.bits);
EXPECT_EQ(kDishBits, irsend.capture.bits);
EXPECT_EQ(0x0, irsend.capture.value);
EXPECT_EQ(0x0, irsend.capture.address);
EXPECT_EQ(0x0, irsend.capture.command);
@@ -285,9 +285,9 @@ TEST(TestDecodeDish, DecodeGlobalCacheExample) {
irsend.sendGC(gc_test_hopper, 73);
irsend.makeDecodeResult();
ASSERT_TRUE(irrecv.decodeDISH(&irsend.capture, DISH_BITS, true));
ASSERT_TRUE(irrecv.decodeDISH(&irsend.capture, kDishBits, true));
EXPECT_EQ(DISH, irsend.capture.decode_type);
EXPECT_EQ(DISH_BITS, irsend.capture.bits);
EXPECT_EQ(kDishBits, irsend.capture.bits);
EXPECT_EQ(0x9C00, irsend.capture.value);
EXPECT_EQ(0x0, irsend.capture.address);
EXPECT_EQ(0x0, irsend.capture.command);
@@ -295,7 +295,7 @@ TEST(TestDecodeDish, DecodeGlobalCacheExample) {
ASSERT_TRUE(irrecv.decodeDISH(&irsend.capture));
EXPECT_EQ(DISH, irsend.capture.decode_type);
EXPECT_EQ(DISH_BITS, irsend.capture.bits);
EXPECT_EQ(kDishBits, irsend.capture.bits);
EXPECT_EQ(0x9C00, irsend.capture.value);
EXPECT_EQ(0x0, irsend.capture.address);
EXPECT_EQ(0x0, irsend.capture.command);
@@ -317,5 +317,5 @@ TEST(TestDecodeDish, FailToDecodeNonDishExample) {
irsend.makeDecodeResult();
ASSERT_FALSE(irrecv.decodeDISH(&irsend.capture));
ASSERT_FALSE(irrecv.decodeDISH(&irsend.capture, DISH_BITS, false));
ASSERT_FALSE(irrecv.decodeDISH(&irsend.capture, kDishBits, false));
}

130
test/ir_Fujitsu_test.cpp
View File

@@ -25,16 +25,16 @@ template<typename T, size_t size>
// Test sending typical data only.
TEST(TestIRFujitsuACClass, GetRawDefault) {
IRFujitsuAC fujitsu = IRFujitsuAC(4); // AR-RAH2E
fujitsu.setCmd(FUJITSU_AC_CMD_TURN_ON);
fujitsu.setSwing(FUJITSU_AC_SWING_BOTH);
fujitsu.setMode(FUJITSU_AC_MODE_COOL);
fujitsu.setFanSpeed(FUJITSU_AC_FAN_HIGH);
fujitsu.setCmd(kFujitsuAcCmdTurnOn);
fujitsu.setSwing(kFujitsuAcSwingBoth);
fujitsu.setMode(kFujitsuAcModeCool);
fujitsu.setFanSpeed(kFujitsuAcFanHigh);
fujitsu.setTemp(24);
uint8_t expected_arrah2e[16] = {
0x14, 0x63, 0x00, 0x10, 0x10, 0xFE, 0x09, 0x30,
0x81, 0x01, 0x31, 0x00, 0x00, 0x00, 0x20, 0xFD};
EXPECT_TRUE(ArraysMatch(expected_arrah2e, fujitsu.getRaw()));
EXPECT_EQ(FUJITSU_AC_STATE_LENGTH, fujitsu.getStateLength());
EXPECT_EQ(kFujitsuAcStateLength, fujitsu.getStateLength());
EXPECT_EQ("Power: On, Mode: 1 (COOL), Temp: 24C, Fan: 1 (HIGH), "
"Swing: Vert + Horiz, Command: N/A", fujitsu.toString());
@@ -43,7 +43,7 @@ TEST(TestIRFujitsuACClass, GetRawDefault) {
0x81, 0x01, 0x31, 0x00, 0x00, 0x00, 0x1D};
fujitsu.setModel(ARDB1);
EXPECT_TRUE(ArraysMatch(expected_ardb1, fujitsu.getRaw()));
EXPECT_EQ(FUJITSU_AC_STATE_LENGTH - 1, fujitsu.getStateLength());
EXPECT_EQ(kFujitsuAcStateLength - 1, fujitsu.getStateLength());
EXPECT_EQ("Power: On, Mode: 1 (COOL), Temp: 24C, Fan: 1 (HIGH), "
"Swing: Vert + Horiz, Command: N/A", fujitsu.toString());
}
@@ -54,14 +54,14 @@ TEST(TestIRFujitsuACClass, GetRawTurnOff) {
fujitsu.off();
uint8_t expected_arrah2e[7] = {0x14, 0x63, 0x0, 0x10, 0x10, 0x02, 0xFD};
EXPECT_TRUE(ArraysMatch(expected_arrah2e, fujitsu.getRaw()));
EXPECT_EQ(FUJITSU_AC_STATE_LENGTH_SHORT, fujitsu.getStateLength());
EXPECT_EQ(kFujitsuAcStateLengthShort, fujitsu.getStateLength());
EXPECT_EQ("Power: Off, Mode: 1 (COOL), Temp: 24C, Fan: 1 (HIGH), "
"Swing: Vert + Horiz, Command: N/A", fujitsu.toString());
fujitsu.setModel(ARDB1);
uint8_t expected_ardb1[6] = {0x14, 0x63, 0x0, 0x10, 0x10, 0x02};
EXPECT_TRUE(ArraysMatch(expected_ardb1, fujitsu.getRaw()));
EXPECT_EQ(FUJITSU_AC_STATE_LENGTH_SHORT - 1, fujitsu.getStateLength());
EXPECT_EQ(kFujitsuAcStateLengthShort - 1, fujitsu.getStateLength());
EXPECT_EQ("Power: Off, Mode: 1 (COOL), Temp: 24C, Fan: 1 (HIGH), "
"Swing: Vert + Horiz, Command: N/A", fujitsu.toString());
}
@@ -71,7 +71,7 @@ TEST(TestIRFujitsuACClass, GetRawStepHoriz) {
fujitsu.stepHoriz();
uint8_t expected[7] = {0x14, 0x63, 0x0, 0x10, 0x10, 0x79, 0x86};
EXPECT_TRUE(ArraysMatch(expected, fujitsu.getRaw()));
EXPECT_EQ(FUJITSU_AC_STATE_LENGTH_SHORT, fujitsu.getStateLength());
EXPECT_EQ(kFujitsuAcStateLengthShort, fujitsu.getStateLength());
EXPECT_EQ("Power: On, Mode: 1 (COOL), Temp: 24C, Fan: 1 (HIGH), "
"Swing: Vert + Horiz, Command: Step vane horizontally",
fujitsu.toString());
@@ -83,7 +83,7 @@ TEST(TestIRFujitsuACClass, GetRawStepVert) {
fujitsu.stepVert();
uint8_t expected_arrah2e[7] = {0x14, 0x63, 0x0, 0x10, 0x10, 0x6C, 0x93};
EXPECT_TRUE(ArraysMatch(expected_arrah2e, fujitsu.getRaw()));
EXPECT_EQ(FUJITSU_AC_STATE_LENGTH_SHORT, fujitsu.getStateLength());
EXPECT_EQ(kFujitsuAcStateLengthShort, fujitsu.getStateLength());
EXPECT_EQ("Power: On, Mode: 1 (COOL), Temp: 24C, Fan: 1 (HIGH), "
"Swing: Vert + Horiz, Command: Step vane vertically",
fujitsu.toString());
@@ -92,7 +92,7 @@ TEST(TestIRFujitsuACClass, GetRawStepVert) {
fujitsu.stepVert();
uint8_t expected_ardb1[6] = {0x14, 0x63, 0x0, 0x10, 0x10, 0x6C};
EXPECT_TRUE(ArraysMatch(expected_ardb1, fujitsu.getRaw()));
EXPECT_EQ(FUJITSU_AC_STATE_LENGTH_SHORT - 1,
EXPECT_EQ(kFujitsuAcStateLengthShort - 1,
fujitsu.getStateLength());
EXPECT_EQ("Power: On, Mode: 1 (COOL), Temp: 24C, Fan: 1 (HIGH), "
"Swing: Vert + Horiz, Command: Step vane vertically",
@@ -101,10 +101,10 @@ TEST(TestIRFujitsuACClass, GetRawStepVert) {
TEST(TestIRFujitsuACClass, GetRawWithSwingHoriz) {
IRFujitsuAC fujitsu = IRFujitsuAC(4);
fujitsu.setCmd(FUJITSU_AC_CMD_STAY_ON);
fujitsu.setSwing(FUJITSU_AC_SWING_HORIZ);
fujitsu.setMode(FUJITSU_AC_MODE_COOL);
fujitsu.setFanSpeed(FUJITSU_AC_FAN_QUIET);
fujitsu.setCmd(kFujitsuAcCmdStayOn);
fujitsu.setSwing(kFujitsuAcSwingHoriz);
fujitsu.setMode(kFujitsuAcModeCool);
fujitsu.setFanSpeed(kFujitsuAcFanQuiet);
fujitsu.setTemp(25);
uint8_t expected[16] = {0x14, 0x63, 0x0, 0x10, 0x10, 0xFE, 0x9, 0x30,
0x90, 0x1, 0x24, 0x0, 0x0, 0x0, 0x20, 0xFB};
@@ -116,10 +116,10 @@ TEST(TestIRFujitsuACClass, GetRawWithSwingHoriz) {
TEST(TestIRFujitsuACClass, GetRawWithFan) {
IRFujitsuAC fujitsu = IRFujitsuAC(4);
fujitsu.setCmd(FUJITSU_AC_CMD_STAY_ON);
fujitsu.setSwing(FUJITSU_AC_SWING_HORIZ);
fujitsu.setMode(FUJITSU_AC_MODE_FAN);
fujitsu.setFanSpeed(FUJITSU_AC_FAN_MED);
fujitsu.setCmd(kFujitsuAcCmdStayOn);
fujitsu.setSwing(kFujitsuAcSwingHoriz);
fujitsu.setMode(kFujitsuAcModeFan);
fujitsu.setFanSpeed(kFujitsuAcFanMed);
fujitsu.setTemp(20); // temp doesn't matter for fan
// but it is sent by the RC anyway
fujitsu.setModel(ARRAH2E);
@@ -127,7 +127,7 @@ TEST(TestIRFujitsuACClass, GetRawWithFan) {
0x14, 0x63, 0x0, 0x10, 0x10, 0xFE, 0x9, 0x30,
0x40, 0x3, 0x22, 0x0, 0x0, 0x0, 0x20, 0x4B};
EXPECT_TRUE(ArraysMatch(expected_arrah2e, fujitsu.getRaw()));
EXPECT_EQ(FUJITSU_AC_STATE_LENGTH, fujitsu.getStateLength());
EXPECT_EQ(kFujitsuAcStateLength, fujitsu.getStateLength());
EXPECT_EQ("Power: On, Mode: 3 (FAN), Temp: 20C, Fan: 2 (MED), Swing: Horiz, "
"Command: N/A", fujitsu.toString());
@@ -136,15 +136,15 @@ TEST(TestIRFujitsuACClass, GetRawWithFan) {
0x14, 0x63, 0x0, 0x10, 0x10, 0xFC, 0x8, 0x30,
0x40, 0x3, 0x22, 0x0, 0x0, 0x0, 0x6B};
EXPECT_TRUE(ArraysMatch(expected_ardb1, fujitsu.getRaw()));
EXPECT_EQ(FUJITSU_AC_STATE_LENGTH - 1, fujitsu.getStateLength());
EXPECT_EQ(kFujitsuAcStateLength - 1, fujitsu.getStateLength());
EXPECT_EQ("Power: On, Mode: 3 (FAN), Temp: 20C, Fan: 2 (MED), Swing: Horiz, "
"Command: N/A", fujitsu.toString());
}
TEST(TestIRFujitsuACClass, SetRaw) {
IRFujitsuAC fujitsu = IRFujitsuAC(0);
EXPECT_EQ(FUJITSU_AC_STATE_LENGTH, fujitsu.getStateLength());
uint8_t expected_default_arrah2e[FUJITSU_AC_STATE_LENGTH] = {
EXPECT_EQ(kFujitsuAcStateLength, fujitsu.getStateLength());
uint8_t expected_default_arrah2e[kFujitsuAcStateLength] = {
0x14, 0x63, 0x00, 0x10, 0x10, 0xFE, 0x09, 0x30,
0x81, 0x01, 0x31, 0x00, 0x00, 0x00, 0x20, 0xFD};
EXPECT_TRUE(ArraysMatch(expected_default_arrah2e, fujitsu.getRaw()));
@@ -152,11 +152,11 @@ TEST(TestIRFujitsuACClass, SetRaw) {
"Swing: Vert + Horiz, Command: N/A", fujitsu.toString());
// Now set a new state via setRaw();
// This state is a real state from an AR-DB1 remote.
uint8_t new_state1[FUJITSU_AC_STATE_LENGTH - 1] = {
uint8_t new_state1[kFujitsuAcStateLength - 1] = {
0x14, 0x63, 0x00, 0x10, 0x10, 0xFC, 0x08, 0x30,
0x30, 0x01, 0x00, 0x00, 0x00, 0x00, 0x9F};
fujitsu.setRaw(new_state1, FUJITSU_AC_STATE_LENGTH - 1);
EXPECT_EQ(FUJITSU_AC_STATE_LENGTH - 1, fujitsu.getStateLength());
fujitsu.setRaw(new_state1, kFujitsuAcStateLength - 1);
EXPECT_EQ(kFujitsuAcStateLength - 1, fujitsu.getStateLength());
EXPECT_TRUE(ArraysMatch(new_state1, fujitsu.getRaw()));
EXPECT_EQ("Power: On, Mode: 1 (COOL), Temp: 19C, Fan: 0 (AUTO), "
"Swing: Off, Command: N/A", fujitsu.toString());
@@ -168,20 +168,20 @@ TEST(TestSendFujitsuAC, GenerateMessage) {
fujitsu.begin();
irsend.begin();
fujitsu.setCmd(FUJITSU_AC_CMD_STAY_ON);
fujitsu.setSwing(FUJITSU_AC_SWING_BOTH);
fujitsu.setMode(FUJITSU_AC_MODE_COOL);
fujitsu.setFanSpeed(FUJITSU_AC_FAN_HIGH);
fujitsu.setCmd(kFujitsuAcCmdStayOn);
fujitsu.setSwing(kFujitsuAcSwingBoth);
fujitsu.setMode(kFujitsuAcModeCool);
fujitsu.setFanSpeed(kFujitsuAcFanHigh);
fujitsu.setTemp(24);
EXPECT_EQ(FUJITSU_AC_FAN_HIGH, fujitsu.getFanSpeed());
EXPECT_EQ(FUJITSU_AC_MODE_COOL, fujitsu.getMode());
EXPECT_EQ(kFujitsuAcFanHigh, fujitsu.getFanSpeed());
EXPECT_EQ(kFujitsuAcModeCool, fujitsu.getMode());
EXPECT_EQ(24, fujitsu.getTemp());
EXPECT_EQ(FUJITSU_AC_SWING_BOTH, fujitsu.getSwing());
EXPECT_EQ(FUJITSU_AC_CMD_STAY_ON, fujitsu.getCmd());
EXPECT_EQ(kFujitsuAcSwingBoth, fujitsu.getSwing());
EXPECT_EQ(kFujitsuAcCmdStayOn, fujitsu.getCmd());
irsend.reset();
irsend.sendFujitsuAC(fujitsu.getRaw(), FUJITSU_AC_STATE_LENGTH);
irsend.sendFujitsuAC(fujitsu.getRaw(), kFujitsuAcStateLength);
EXPECT_EQ(
"m3324s1574m448s390m448s390m448s1182m448s390m448s1182m448s390m448s390m448"
"s390m448s1182m448s1182m448s390m448s390m448s390m448s1182m448s1182m448s390"
@@ -209,10 +209,10 @@ TEST(TestSendFujitsuAC, GenerateShortMessage) {
fujitsu.off();
EXPECT_EQ(FUJITSU_AC_CMD_TURN_OFF, fujitsu.getCmd());
EXPECT_EQ(kFujitsuAcCmdTurnOff, fujitsu.getCmd());
irsend.reset();
irsend.sendFujitsuAC(fujitsu.getRaw(), FUJITSU_AC_STATE_LENGTH_SHORT);
irsend.sendFujitsuAC(fujitsu.getRaw(), kFujitsuAcStateLengthShort);
EXPECT_EQ(
"m3324s1574m448s390m448s390m448s1182m448s390m448s1182m448s390m448s390m448"
"s390m448s1182m448s1182m448s390m448s390m448s390m448s1182m448s1182m448s390"
@@ -232,8 +232,8 @@ TEST(TestSendFujitsuAC, Issue275) {
irsend.begin();
irsend.reset();
fujitsu.setCmd(FUJITSU_AC_CMD_TURN_OFF);
irsend.sendFujitsuAC(fujitsu.getRaw(), FUJITSU_AC_STATE_LENGTH_SHORT);
fujitsu.setCmd(kFujitsuAcCmdTurnOff);
irsend.sendFujitsuAC(fujitsu.getRaw(), kFujitsuAcStateLengthShort);
EXPECT_EQ(
// Header
"m3324s1574"
@@ -299,24 +299,24 @@ TEST(TestDecodeFujitsuAC, SyntheticShortMessages) {
irsend.reset();
fujitsu.setModel(ARRAH2E);
fujitsu.setCmd(FUJITSU_AC_CMD_TURN_OFF);
fujitsu.setCmd(kFujitsuAcCmdTurnOff);
irsend.sendFujitsuAC(fujitsu.getRaw(), fujitsu.getStateLength());
irsend.makeDecodeResult();
EXPECT_TRUE(irrecv.decode(&irsend.capture));
ASSERT_EQ(FUJITSU_AC, irsend.capture.decode_type);
ASSERT_EQ(FUJITSU_AC_MIN_BITS + 8, irsend.capture.bits);
ASSERT_EQ(kFujitsuAcMinBits + 8, irsend.capture.bits);
uint8_t expected_arrah2e[7] = {0x14, 0x63, 0x0, 0x10, 0x10, 0x02, 0xFD};
EXPECT_TRUE(ArraysMatch(expected_arrah2e, irsend.capture.state));
irsend.reset();
fujitsu.setModel(ARDB1);
fujitsu.setCmd(FUJITSU_AC_CMD_TURN_OFF);
fujitsu.setCmd(kFujitsuAcCmdTurnOff);
irsend.sendFujitsuAC(fujitsu.getRaw(), fujitsu.getStateLength());
irsend.makeDecodeResult();
EXPECT_TRUE(irrecv.decode(&irsend.capture));
ASSERT_EQ(FUJITSU_AC, irsend.capture.decode_type);
ASSERT_EQ(FUJITSU_AC_MIN_BITS, irsend.capture.bits);
ASSERT_EQ(kFujitsuAcMinBits, irsend.capture.bits);
uint8_t expected_ardb1[6] = {0x14, 0x63, 0x0, 0x10, 0x10, 0x02};
EXPECT_TRUE(ArraysMatch(expected_ardb1, irsend.capture.state));
}
@@ -330,23 +330,23 @@ TEST(TestDecodeFujitsuAC, SyntheticLongMessages) {
irsend.reset();
fujitsu.setModel(ARRAH2E);
fujitsu.setCmd(FUJITSU_AC_CMD_STAY_ON);
fujitsu.setSwing(FUJITSU_AC_SWING_VERT);
fujitsu.setMode(FUJITSU_AC_MODE_COOL);
fujitsu.setFanSpeed(FUJITSU_AC_FAN_QUIET);
fujitsu.setCmd(kFujitsuAcCmdStayOn);
fujitsu.setSwing(kFujitsuAcSwingVert);
fujitsu.setMode(kFujitsuAcModeCool);
fujitsu.setFanSpeed(kFujitsuAcFanQuiet);
fujitsu.setTemp(18);
irsend.sendFujitsuAC(fujitsu.getRaw(), fujitsu.getStateLength());
ASSERT_EQ(FUJITSU_AC_STATE_LENGTH, fujitsu.getStateLength());
ASSERT_EQ(kFujitsuAcStateLength, fujitsu.getStateLength());
irsend.makeDecodeResult();
EXPECT_TRUE(irrecv.decodeFujitsuAC(&irsend.capture));
ASSERT_EQ(FUJITSU_AC, irsend.capture.decode_type);
ASSERT_EQ(FUJITSU_AC_BITS, irsend.capture.bits);
uint8_t expected_arrah2e[FUJITSU_AC_STATE_LENGTH] = {
ASSERT_EQ(kFujitsuAcBits, irsend.capture.bits);
uint8_t expected_arrah2e[kFujitsuAcStateLength] = {
0x14, 0x63, 0x00, 0x10, 0x10, 0xFE, 0x09, 0x30,
0x20, 0x01, 0x14, 0x00, 0x00, 0x00, 0x20, 0x7B};
EXPECT_TRUE(ArraysMatch(expected_arrah2e, irsend.capture.state));
fujitsu.setRaw(irsend.capture.state, irsend.capture.bits / 8);
EXPECT_EQ(FUJITSU_AC_STATE_LENGTH, fujitsu.getStateLength());
EXPECT_EQ(kFujitsuAcStateLength, fujitsu.getStateLength());
EXPECT_EQ("Power: On, Mode: 1 (COOL), Temp: 18C, Fan: 4 (QUIET), "
"Swing: Vert, Command: N/A", fujitsu.toString());
@@ -357,13 +357,13 @@ TEST(TestDecodeFujitsuAC, SyntheticLongMessages) {
irsend.makeDecodeResult();
EXPECT_TRUE(irrecv.decode(&irsend.capture));
ASSERT_EQ(FUJITSU_AC, irsend.capture.decode_type);
ASSERT_EQ(FUJITSU_AC_BITS - 8, irsend.capture.bits);
uint8_t expected_ardb1[FUJITSU_AC_STATE_LENGTH - 1] = {
ASSERT_EQ(kFujitsuAcBits - 8, irsend.capture.bits);
uint8_t expected_ardb1[kFujitsuAcStateLength - 1] = {
0x14, 0x63, 0x00, 0x10, 0x10, 0xFC, 0x08, 0x30,
0x20, 0x01, 0x14, 0x00, 0x00, 0x00, 0x9B};
EXPECT_TRUE(ArraysMatch(expected_ardb1, irsend.capture.state));
fujitsu.setRaw(irsend.capture.state, irsend.capture.bits / 8);
EXPECT_EQ(FUJITSU_AC_STATE_LENGTH - 1, fujitsu.getStateLength());
EXPECT_EQ(kFujitsuAcStateLength - 1, fujitsu.getStateLength());
EXPECT_EQ("Power: On, Mode: 1 (COOL), Temp: 18C, Fan: 4 (QUIET), "
"Swing: Vert, Command: N/A", fujitsu.toString());
}
@@ -391,11 +391,11 @@ TEST(TestDecodeFujitsuAC, RealShortARDB1OffExample) {
irsend.makeDecodeResult();
EXPECT_TRUE(irrecv.decode(&irsend.capture));
ASSERT_EQ(FUJITSU_AC, irsend.capture.decode_type);
ASSERT_EQ(FUJITSU_AC_MIN_BITS, irsend.capture.bits);
ASSERT_EQ(kFujitsuAcMinBits, irsend.capture.bits);
uint8_t expected[6] = {0x14, 0x63, 0x0, 0x10, 0x10, 0x02};
EXPECT_TRUE(ArraysMatch(expected, irsend.capture.state));
fujitsu.setRaw(irsend.capture.state, irsend.capture.bits / 8);
EXPECT_EQ(FUJITSU_AC_STATE_LENGTH_SHORT - 1, fujitsu.getStateLength());
EXPECT_EQ(kFujitsuAcStateLengthShort - 1, fujitsu.getStateLength());
EXPECT_EQ("Power: Off, Mode: 0 (AUTO), Temp: 16C, Fan: 0 (AUTO), "
"Swing: Off, Command: N/A", fujitsu.toString());
}
@@ -433,13 +433,13 @@ TEST(TestDecodeFujitsuAC, RealLongARDB1Example) {
irsend.makeDecodeResult();
EXPECT_TRUE(irrecv.decode(&irsend.capture));
ASSERT_EQ(FUJITSU_AC, irsend.capture.decode_type);
ASSERT_EQ(FUJITSU_AC_BITS - 8, irsend.capture.bits);
uint8_t expected1[FUJITSU_AC_STATE_LENGTH - 1] = {
ASSERT_EQ(kFujitsuAcBits - 8, irsend.capture.bits);
uint8_t expected1[kFujitsuAcStateLength - 1] = {
0x14, 0x63, 0x00, 0x10, 0x10, 0xFC, 0x08, 0x30,
0x21, 0x01, 0x04, 0x00, 0x00, 0x00, 0xAA};
EXPECT_TRUE(ArraysMatch(expected1, irsend.capture.state));
fujitsu.setRaw(irsend.capture.state, irsend.capture.bits / 8);
EXPECT_EQ(FUJITSU_AC_STATE_LENGTH - 1, fujitsu.getStateLength());
EXPECT_EQ(kFujitsuAcStateLength - 1, fujitsu.getStateLength());
EXPECT_EQ("Power: On, Mode: 1 (COOL), Temp: 18C, Fan: 4 (QUIET), "
"Swing: Off, Command: N/A", fujitsu.toString());
@@ -470,13 +470,13 @@ TEST(TestDecodeFujitsuAC, RealLongARDB1Example) {
irsend.makeDecodeResult();
EXPECT_TRUE(irrecv.decode(&irsend.capture));
ASSERT_EQ(FUJITSU_AC, irsend.capture.decode_type);
ASSERT_EQ(FUJITSU_AC_BITS - 8, irsend.capture.bits);
uint8_t expected2[FUJITSU_AC_STATE_LENGTH - 1] = {
ASSERT_EQ(kFujitsuAcBits - 8, irsend.capture.bits);
uint8_t expected2[kFujitsuAcStateLength - 1] = {
0x14, 0x63, 0x00, 0x10, 0x10, 0xFC, 0x08, 0x30,
0x30, 0x01, 0x00, 0x00, 0x00, 0x00, 0x9F};
EXPECT_TRUE(ArraysMatch(expected2, irsend.capture.state));
fujitsu.setRaw(irsend.capture.state, irsend.capture.bits / 8);
EXPECT_EQ(FUJITSU_AC_STATE_LENGTH - 1, fujitsu.getStateLength());
EXPECT_EQ(kFujitsuAcStateLength - 1, fujitsu.getStateLength());
EXPECT_EQ("Power: On, Mode: 1 (COOL), Temp: 19C, Fan: 0 (AUTO), "
"Swing: Off, Command: N/A", fujitsu.toString());
}
@@ -515,10 +515,10 @@ TEST(TestDecodeFujitsuAC, Issue414) {
irsend.makeDecodeResult();
EXPECT_TRUE(irrecv.decode(&irsend.capture));
ASSERT_EQ(FUJITSU_AC, irsend.capture.decode_type);
ASSERT_EQ(FUJITSU_AC_BITS, irsend.capture.bits);
ASSERT_EQ(kFujitsuAcBits, irsend.capture.bits);
EXPECT_TRUE(ArraysMatch(state, irsend.capture.state));
fujitsu.setRaw(irsend.capture.state, irsend.capture.bits / 8);
EXPECT_EQ(FUJITSU_AC_STATE_LENGTH, fujitsu.getStateLength());
EXPECT_EQ(kFujitsuAcStateLength, fujitsu.getStateLength());
EXPECT_EQ("Power: On, Mode: 4 (HEAT), Temp: 24C, Fan: 0 (AUTO), "
"Swing: Off, Command: N/A", fujitsu.toString());
@@ -528,7 +528,7 @@ TEST(TestDecodeFujitsuAC, Issue414) {
irsend.makeDecodeResult();
EXPECT_TRUE(irrecv.decode(&irsend.capture));
ASSERT_EQ(FUJITSU_AC, irsend.capture.decode_type);
ASSERT_EQ(FUJITSU_AC_BITS, irsend.capture.bits);
ASSERT_EQ(kFujitsuAcBits, irsend.capture.bits);
EXPECT_TRUE(ArraysMatch(state, irsend.capture.state));
EXPECT_EQ(
"m3324s1574"

14
test/ir_GICable_test.cpp
View File

@@ -38,14 +38,14 @@ TEST(TestSendGICable, SendWithRepeats) {
IRsendTest irsend(0);
irsend.begin();
// Send a command with 0 repeats.
irsend.sendGICable(0x8807, GICABLE_BITS, 0);
irsend.sendGICable(0x8807, kGicableBits, 0);
EXPECT_EQ(
"m9000s4400"
"m550s4400m550s2200m550s2200m550s2200m550s4400m550s2200m550s2200m550s2200"
"m550s2200m550s2200m550s2200m550s2200m550s2200m550s4400m550s4400m550s4400"
"m550s30650", irsend.outputStr());
// Send a command with 1 repeat.
irsend.sendGICable(0x8807, GICABLE_BITS, 1);
irsend.sendGICable(0x8807, kGicableBits, 1);
EXPECT_EQ(
"m9000s4400"
"m550s4400m550s2200m550s2200m550s2200m550s4400m550s2200m550s2200m550s2200"
@@ -53,7 +53,7 @@ TEST(TestSendGICable, SendWithRepeats) {
"m550s30650"
"m9000s2200m550s87850", irsend.outputStr());
// Send a command with 3 repeats.
irsend.sendGICable(0x8807, GICABLE_BITS, 3);
irsend.sendGICable(0x8807, kGicableBits, 3);
EXPECT_EQ(
"m9000s4400"
"m550s4400m550s2200m550s2200m550s2200m550s4400m550s2200m550s2200m550s2200"
@@ -77,7 +77,7 @@ TEST(TestDecodeGICable, SyntheticDecode) {
irsend.makeDecodeResult();
EXPECT_TRUE(irrecv.decode(&irsend.capture));
EXPECT_EQ(GICABLE, irsend.capture.decode_type);
EXPECT_EQ(GICABLE_BITS, irsend.capture.bits);
EXPECT_EQ(kGicableBits, irsend.capture.bits);
EXPECT_EQ(0x8807, irsend.capture.value);
EXPECT_EQ(0x0, irsend.capture.address);
EXPECT_EQ(0x0, irsend.capture.command);
@@ -100,7 +100,7 @@ TEST(TestDecodeGICable, RealExampleDecodeOK) {
irsend.makeDecodeResult();
EXPECT_TRUE(irrecv.decode(&irsend.capture));
EXPECT_EQ(GICABLE, irsend.capture.decode_type);
EXPECT_EQ(GICABLE_BITS, irsend.capture.bits);
EXPECT_EQ(kGicableBits, irsend.capture.bits);
EXPECT_EQ(0x8807, irsend.capture.value);
EXPECT_EQ(0x0, irsend.capture.address);
EXPECT_EQ(0x0, irsend.capture.command);
@@ -122,7 +122,7 @@ TEST(TestDecodeGICable, RealExampleDecodeLEFT) {
irsend.makeDecodeResult();
EXPECT_TRUE(irrecv.decode(&irsend.capture));
EXPECT_EQ(GICABLE, irsend.capture.decode_type);
EXPECT_EQ(GICABLE_BITS, irsend.capture.bits);
EXPECT_EQ(kGicableBits, irsend.capture.bits);
EXPECT_EQ(0x6C0E, irsend.capture.value);
EXPECT_EQ(0x0, irsend.capture.address);
EXPECT_EQ(0x0, irsend.capture.command);
@@ -145,7 +145,7 @@ TEST(TestDecodeGICable, RealExampleDecodeZEROKey) {
irsend.makeDecodeResult();
EXPECT_TRUE(irrecv.decode(&irsend.capture));
EXPECT_EQ(GICABLE, irsend.capture.decode_type);
EXPECT_EQ(GICABLE_BITS, irsend.capture.bits);
EXPECT_EQ(kGicableBits, irsend.capture.bits);
EXPECT_EQ(0x0, irsend.capture.value);
EXPECT_EQ(0x0, irsend.capture.address);
EXPECT_EQ(0x0, irsend.capture.command);

4
test/ir_GlobalCache_test.cpp
View File

@@ -24,7 +24,7 @@ TEST(TestSendGlobalCache, NonRepeatingCode) {
irsend.makeDecodeResult();
EXPECT_TRUE(irrecv.decodeNEC(&irsend.capture));
EXPECT_EQ(NEC, irsend.capture.decode_type);
EXPECT_EQ(NEC_BITS, irsend.capture.bits);
EXPECT_EQ(kNECBits, irsend.capture.bits);
EXPECT_EQ(0x20DF827D, irsend.capture.value);
EXPECT_EQ(0x4, irsend.capture.address);
EXPECT_EQ(0x41, irsend.capture.command);
@@ -54,7 +54,7 @@ TEST(TestSendGlobalCache, RepeatCode) {
irsend.makeDecodeResult();
EXPECT_TRUE(irrecv.decodeNEC(&irsend.capture));
EXPECT_EQ(NEC, irsend.capture.decode_type);
EXPECT_EQ(NEC_BITS, irsend.capture.bits);
EXPECT_EQ(kNECBits, irsend.capture.bits);
EXPECT_EQ(0xC1A28877, irsend.capture.value);
EXPECT_EQ(0x4583, irsend.capture.address);
EXPECT_EQ(0x11, irsend.capture.command);

152
test/ir_Gree_test.cpp
View File

@@ -15,7 +15,7 @@ TEST(TestSendGreeChars, SendData) {
IRsendTest irsend(4);
irsend.begin();
uint8_t gree_code[GREE_STATE_LENGTH] = {
uint8_t gree_code[kGreeStateLength] = {
0x12, 0x34, 0x56, 0x78, 0x90, 0xAB, 0xCD, 0xEF};
irsend.reset();
irsend.sendGree(gree_code);
@@ -61,11 +61,11 @@ TEST(TestSendGreeChars, SendWithRepeats) {
irsend.begin();
irsend.reset();
uint8_t gree_code[GREE_STATE_LENGTH] = {
uint8_t gree_code[kGreeStateLength] = {
0x12, 0x34, 0x56, 0x78, 0x90, 0xAB, 0xCD, 0xEF};
irsend.reset();
irsend.sendGree(gree_code, GREE_STATE_LENGTH, 1);
irsend.sendGree(gree_code, kGreeStateLength, 1);
EXPECT_EQ(
"m9000s4000"
"m620s540m620s1600m620s540m620s540m620s1600m620s540m620s540m620s540"
@@ -98,7 +98,7 @@ TEST(TestSendGreeUint64, SendWithRepeats) {
irsend.begin();
irsend.reset();
irsend.sendGree(0x1234567890ABCDEF, GREE_BITS, 1);
irsend.sendGree(0x1234567890ABCDEF, kGreeBits, 1);
EXPECT_EQ(
"m9000s4000"
"m620s540m620s1600m620s540m620s540m620s1600m620s540m620s540m620s540"
@@ -131,16 +131,16 @@ TEST(TestSendGreeChars, SendUnexpectedSizes) {
IRsendTest irsend(4);
irsend.begin();
uint8_t gree_short_code[GREE_STATE_LENGTH - 1] = {
uint8_t gree_short_code[kGreeStateLength - 1] = {
0x12, 0x34, 0x56, 0x78, 0x90, 0xAB, 0xCD};
uint8_t gree_long_code[GREE_STATE_LENGTH + 1] = {
uint8_t gree_long_code[kGreeStateLength + 1] = {
0x12, 0x34, 0x56, 0x78, 0x90, 0xAB, 0xCD, 0xEF, 0x12};
irsend.reset();
irsend.sendGree(gree_short_code, GREE_STATE_LENGTH - 1);
irsend.sendGree(gree_short_code, kGreeStateLength - 1);
ASSERT_EQ("", irsend.outputStr());
irsend.reset();
irsend.sendGree(gree_long_code, GREE_STATE_LENGTH + 1);
irsend.sendGree(gree_long_code, kGreeStateLength + 1);
ASSERT_EQ(
"m9000s4000"
"m620s540m620s1600m620s540m620s540m620s1600m620s540m620s540m620s540"
@@ -162,11 +162,11 @@ TEST(TestSendGreeUint64, SendUnexpectedSizes) {
irsend.begin();
irsend.reset();
irsend.sendGree(0x1234567890ABCDEF, GREE_BITS - 1);
irsend.sendGree(0x1234567890ABCDEF, kGreeBits - 1);
ASSERT_EQ("", irsend.outputStr());
irsend.reset();
irsend.sendGree(0x1234567890ABCDEF, GREE_BITS + 1);
irsend.sendGree(0x1234567890ABCDEF, kGreeBits + 1);
ASSERT_EQ("", irsend.outputStr());
}
@@ -174,7 +174,7 @@ TEST(TestSendGree, CompareUint64ToCharResults) {
IRsendTest irsend_chars(4);
IRsendTest irsend_uint64(0);
uint8_t gree_code[GREE_STATE_LENGTH] = {
uint8_t gree_code[kGreeStateLength] = {
0x12, 0x34, 0x56, 0x78, 0x90, 0xAB, 0xCD, 0xEF};
irsend_chars.begin();
@@ -186,7 +186,7 @@ TEST(TestSendGree, CompareUint64ToCharResults) {
irsend_uint64.sendGree(0x1234567890ABCDEF);
ASSERT_EQ(irsend_chars.outputStr(), irsend_uint64.outputStr());
uint8_t gree_zero_code[GREE_STATE_LENGTH] = {
uint8_t gree_zero_code[kGreeStateLength] = {
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
irsend_chars.reset();
irsend_uint64.reset();
@@ -218,25 +218,25 @@ TEST(TestGreeClass, Temperature) {
IRGreeAC irgree(0);
irgree.begin();
irgree.setMode(GREE_COOL);
irgree.setMode(kGreeCool);
irgree.setTemp(0);
EXPECT_EQ(GREE_MIN_TEMP, irgree.getTemp());
EXPECT_EQ(kGreeMinTemp, irgree.getTemp());
irgree.setTemp(255);
EXPECT_EQ(GREE_MAX_TEMP, irgree.getTemp());
EXPECT_EQ(kGreeMaxTemp, irgree.getTemp());
irgree.setTemp(GREE_MIN_TEMP);
EXPECT_EQ(GREE_MIN_TEMP, irgree.getTemp());
irgree.setTemp(kGreeMinTemp);
EXPECT_EQ(kGreeMinTemp, irgree.getTemp());
irgree.setTemp(GREE_MAX_TEMP);
EXPECT_EQ(GREE_MAX_TEMP, irgree.getTemp());
irgree.setTemp(kGreeMaxTemp);
EXPECT_EQ(kGreeMaxTemp, irgree.getTemp());
irgree.setTemp(GREE_MIN_TEMP - 1);
EXPECT_EQ(GREE_MIN_TEMP, irgree.getTemp());
irgree.setTemp(kGreeMinTemp - 1);
EXPECT_EQ(kGreeMinTemp, irgree.getTemp());
irgree.setTemp(GREE_MAX_TEMP + 1);
EXPECT_EQ(GREE_MAX_TEMP, irgree.getTemp());
irgree.setTemp(kGreeMaxTemp + 1);
EXPECT_EQ(kGreeMaxTemp, irgree.getTemp());
irgree.setTemp(17);
EXPECT_EQ(17, irgree.getTemp());
@@ -256,34 +256,34 @@ TEST(TestGreeClass, OperatingMode) {
irgree.begin();
irgree.setTemp(17);
irgree.setMode(GREE_AUTO); // Auto should lock the temp to 25C.
EXPECT_EQ(GREE_AUTO, irgree.getMode());
irgree.setMode(kGreeAuto); // Auto should lock the temp to 25C.
EXPECT_EQ(kGreeAuto, irgree.getMode());
EXPECT_EQ(25, irgree.getTemp());
irgree.setTemp(17);
EXPECT_EQ(25, irgree.getTemp());
irgree.setMode(GREE_COOL);
EXPECT_EQ(GREE_COOL, irgree.getMode());
irgree.setMode(kGreeCool);
EXPECT_EQ(kGreeCool, irgree.getMode());
irgree.setMode(GREE_HEAT);
EXPECT_EQ(GREE_HEAT, irgree.getMode());
irgree.setMode(kGreeHeat);
EXPECT_EQ(kGreeHeat, irgree.getMode());
ASSERT_NE(GREE_FAN_MAX, 1);
irgree.setFan(GREE_FAN_MAX);
irgree.setMode(GREE_DRY); // Dry should lock the fan to speed 1.
EXPECT_EQ(GREE_DRY, irgree.getMode());
ASSERT_NE(kGreeFanMax, 1);
irgree.setFan(kGreeFanMax);
irgree.setMode(kGreeDry); // Dry should lock the fan to speed 1.
EXPECT_EQ(kGreeDry, irgree.getMode());
EXPECT_EQ(1, irgree.getFan());
irgree.setFan(GREE_FAN_MAX);
irgree.setFan(kGreeFanMax);
EXPECT_EQ(1, irgree.getFan());
irgree.setMode(GREE_FAN);
EXPECT_EQ(GREE_FAN, irgree.getMode());
irgree.setMode(kGreeFan);
EXPECT_EQ(kGreeFan, irgree.getMode());
irgree.setMode(GREE_HEAT + 1);
EXPECT_EQ(GREE_AUTO, irgree.getMode());
irgree.setMode(kGreeHeat + 1);
EXPECT_EQ(kGreeAuto, irgree.getMode());
irgree.setMode(255);
EXPECT_EQ(GREE_AUTO, irgree.getMode());
EXPECT_EQ(kGreeAuto, irgree.getMode());
}
TEST(TestGreeClass, Light) {
@@ -350,16 +350,16 @@ TEST(TestGreeClass, FanSpeed) {
EXPECT_EQ(0, irgree.getFan());
irgree.setFan(255);
EXPECT_EQ(GREE_FAN_MAX, irgree.getFan());
EXPECT_EQ(kGreeFanMax, irgree.getFan());
irgree.setFan(GREE_FAN_MAX);
EXPECT_EQ(GREE_FAN_MAX, irgree.getFan());
irgree.setFan(kGreeFanMax);
EXPECT_EQ(kGreeFanMax, irgree.getFan());
irgree.setFan(GREE_FAN_MAX + 1);
EXPECT_EQ(GREE_FAN_MAX, irgree.getFan());
irgree.setFan(kGreeFanMax + 1);
EXPECT_EQ(kGreeFanMax, irgree.getFan());
irgree.setFan(GREE_FAN_MAX - 1);
EXPECT_EQ(GREE_FAN_MAX - 1, irgree.getFan());
irgree.setFan(kGreeFanMax - 1);
EXPECT_EQ(kGreeFanMax - 1, irgree.getFan());
irgree.setFan(1);
EXPECT_EQ(1, irgree.getFan());
@@ -375,48 +375,48 @@ TEST(TestGreeClass, VerticalSwing) {
IRGreeAC irgree(0);
irgree.begin();
EXPECT_FALSE(irgree.getSwingVerticalAuto());
EXPECT_EQ(GREE_SWING_LAST_POS, irgree.getSwingVerticalPosition());
EXPECT_EQ(kGreeSwingLastPos, irgree.getSwingVerticalPosition());
irgree.setSwingVertical(true, GREE_SWING_AUTO);
irgree.setSwingVertical(true, kGreeSwingAuto);
EXPECT_TRUE(irgree.getSwingVerticalAuto());
EXPECT_EQ(GREE_SWING_AUTO, irgree.getSwingVerticalPosition());
EXPECT_EQ(kGreeSwingAuto, irgree.getSwingVerticalPosition());
irgree.setSwingVertical(false, GREE_SWING_MIDDLE);
irgree.setSwingVertical(false, kGreeSwingMiddle);
EXPECT_FALSE(irgree.getSwingVerticalAuto());
EXPECT_EQ(GREE_SWING_MIDDLE, irgree.getSwingVerticalPosition());
EXPECT_EQ(kGreeSwingMiddle, irgree.getSwingVerticalPosition());
irgree.setSwingVertical(true, GREE_SWING_DOWN_AUTO);
irgree.setSwingVertical(true, kGreeSwingDownAuto);
EXPECT_TRUE(irgree.getSwingVerticalAuto());
EXPECT_EQ(GREE_SWING_DOWN_AUTO, irgree.getSwingVerticalPosition());
EXPECT_EQ(kGreeSwingDownAuto, irgree.getSwingVerticalPosition());
// Out of bounds.
irgree.setSwingVertical(false, 255);
EXPECT_FALSE(irgree.getSwingVerticalAuto());
EXPECT_EQ(GREE_SWING_LAST_POS, irgree.getSwingVerticalPosition());
irgree.setSwingVertical(false, GREE_SWING_AUTO);
EXPECT_EQ(kGreeSwingLastPos, irgree.getSwingVerticalPosition());
irgree.setSwingVertical(false, kGreeSwingAuto);
EXPECT_FALSE(irgree.getSwingVerticalAuto());
EXPECT_EQ(GREE_SWING_LAST_POS, irgree.getSwingVerticalPosition());
EXPECT_EQ(kGreeSwingLastPos, irgree.getSwingVerticalPosition());
irgree.setSwingVertical(true, 255);
EXPECT_TRUE(irgree.getSwingVerticalAuto());
EXPECT_EQ(GREE_SWING_AUTO, irgree.getSwingVerticalPosition());
irgree.setSwingVertical(true, GREE_SWING_DOWN);
EXPECT_EQ(kGreeSwingAuto, irgree.getSwingVerticalPosition());
irgree.setSwingVertical(true, kGreeSwingDown);
EXPECT_TRUE(irgree.getSwingVerticalAuto());
EXPECT_EQ(GREE_SWING_AUTO, irgree.getSwingVerticalPosition());
EXPECT_EQ(kGreeSwingAuto, irgree.getSwingVerticalPosition());
}
TEST(TestGreeClass, SetAndGetRaw) {
IRGreeAC irgree(0);
uint8_t initialState[GREE_STATE_LENGTH] = {
uint8_t initialState[kGreeStateLength] = {
0x00, 0x09, 0x20, 0x50, 0x00, 0x20, 0x00, 0x50};
uint8_t expectedState[GREE_STATE_LENGTH] = {
uint8_t expectedState[kGreeStateLength] = {
0xA9, 0x05, 0xD0, 0x50, 0x00, 0x20, 0x00, 0xA0};
EXPECT_STATE_EQ(initialState, irgree.getRaw(), GREE_BITS);
EXPECT_STATE_EQ(initialState, irgree.getRaw(), kGreeBits);
// toggle the power state.
irgree.setPower(!irgree.getPower());
irgree.setMode(GREE_COOL);
irgree.setMode(kGreeCool);
irgree.setTemp(21);
irgree.setFan(2);
irgree.setLight(false);
@@ -424,7 +424,7 @@ TEST(TestGreeClass, SetAndGetRaw) {
irgree.setSleep(true);
irgree.setXFan(true);
EXPECT_EQ(GREE_COOL, irgree.getMode());
EXPECT_EQ(kGreeCool, irgree.getMode());
EXPECT_EQ(21, irgree.getTemp());
EXPECT_EQ(2, irgree.getFan());
EXPECT_FALSE(irgree.getLight());
@@ -432,9 +432,9 @@ TEST(TestGreeClass, SetAndGetRaw) {
EXPECT_TRUE(irgree.getSleep());
EXPECT_TRUE(irgree.getXFan());
EXPECT_STATE_EQ(expectedState, irgree.getRaw(), GREE_BITS);
EXPECT_STATE_EQ(expectedState, irgree.getRaw(), kGreeBits);
irgree.setRaw(initialState);
EXPECT_STATE_EQ(initialState, irgree.getRaw(), GREE_BITS);
EXPECT_STATE_EQ(initialState, irgree.getRaw(), kGreeBits);
}
TEST(TestGreeClass, HumanReadable) {
@@ -445,14 +445,14 @@ TEST(TestGreeClass, HumanReadable) {
"Swing Vertical Pos: 0 (Last Pos)",
irgree.toString());
irgree.on();
irgree.setMode(GREE_COOL);
irgree.setTemp(GREE_MIN_TEMP);
irgree.setFan(GREE_FAN_MAX);
irgree.setMode(kGreeCool);
irgree.setTemp(kGreeMinTemp);
irgree.setFan(kGreeFanMax);
irgree.setXFan(true);
irgree.setSleep(true);
irgree.setLight(false);
irgree.setTurbo(true);
irgree.setSwingVertical(true, GREE_SWING_AUTO);
irgree.setSwingVertical(true, kGreeSwingAuto);
EXPECT_EQ("Power: On, Mode: 1 (COOL), Temp: 16C, Fan: 3 (MAX), Turbo: On, "
"XFan: On, Light: Off, Sleep: On, Swing Vertical Mode: Auto, "
"Swing Vertical Pos: 1 (Auto)",
@@ -467,7 +467,7 @@ TEST(TestDecodeGree, NormalSynthetic) {
IRrecv irrecv(4);
irsend.begin();
uint8_t gree_code[GREE_STATE_LENGTH] = {
uint8_t gree_code[kGreeStateLength] = {
0x00, 0x09, 0x20, 0x50, 0x00, 0x20, 0x00, 0x50};
irsend.reset();
@@ -475,8 +475,8 @@ TEST(TestDecodeGree, NormalSynthetic) {
irsend.makeDecodeResult();
EXPECT_TRUE(irrecv.decode(&irsend.capture));
EXPECT_EQ(GREE, irsend.capture.decode_type);
ASSERT_EQ(GREE_BITS, irsend.capture.bits);
EXPECT_STATE_EQ(gree_code, irsend.capture.state, GREE_BITS);
ASSERT_EQ(kGreeBits, irsend.capture.bits);
EXPECT_STATE_EQ(gree_code, irsend.capture.state, kGreeBits);
}
// Decode a synthetic Gree message.
@@ -486,7 +486,7 @@ TEST(TestDecodeGree, NormalRealExample) {
IRGreeAC irgree(4);
irsend.begin();
uint8_t gree_code[GREE_STATE_LENGTH] = {
uint8_t gree_code[kGreeStateLength] = {
0x19, 0x0A, 0x60, 0x50, 0x02, 0x23, 0x00, 0xF0};
// Ref: https://github.com/markszabo/IRremoteESP8266/issues/386
@@ -507,8 +507,8 @@ TEST(TestDecodeGree, NormalRealExample) {
irsend.makeDecodeResult();
EXPECT_TRUE(irrecv.decode(&irsend.capture));
EXPECT_EQ(GREE, irsend.capture.decode_type);
ASSERT_EQ(GREE_BITS, irsend.capture.bits);
EXPECT_STATE_EQ(gree_code, irsend.capture.state, GREE_BITS);
ASSERT_EQ(kGreeBits, irsend.capture.bits);
EXPECT_STATE_EQ(gree_code, irsend.capture.state, kGreeBits);
irgree.setRaw(irsend.capture.state);
EXPECT_EQ("Power: On, Mode: 1 (COOL), Temp: 26C, Fan: 1, Turbo: Off, "
"XFan: Off, Light: On, Sleep: Off, Swing Vertical Mode: Manual, "

532
test/ir_Haier_test.cpp
View File

@@ -13,7 +13,7 @@
TEST(TestSendHaierAC, SendDataOnly) {
IRsendTest irsend(0);
irsend.begin();
uint8_t haier_zero[HAIER_AC_STATE_LENGTH] = {
uint8_t haier_zero[kHaierACStateLength] = {
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
irsend.reset();
@@ -31,7 +31,7 @@ TEST(TestSendHaierAC, SendDataOnly) {
"m520s650m520s650m520s650m520s650m520s650m520s650m520s650m520s650"
"m520s150000", irsend.outputStr());
uint8_t haier_test[HAIER_AC_STATE_LENGTH] = {
uint8_t haier_test[kHaierACStateLength] = {
0xA5, 0x01, 0x20, 0x01, 0x00, 0xC0, 0x20, 0x00, 0xA7};
irsend.reset();
irsend.sendHaierAC(haier_test);
@@ -55,10 +55,10 @@ TEST(TestSendHaierAC, SendWithRepeats) {
irsend.begin();
irsend.reset();
uint8_t haier_test[HAIER_AC_STATE_LENGTH] = {
uint8_t haier_test[kHaierACStateLength] = {
0xA5, 0x01, 0x20, 0x01, 0x00, 0xC0, 0x20, 0x00, 0xA7};
irsend.reset();
irsend.sendHaierAC(haier_test, HAIER_AC_STATE_LENGTH, 2); // two repeats.
irsend.sendHaierAC(haier_test, kHaierACStateLength, 2); // two repeats.
EXPECT_EQ(
"m3000s3000m3000s4300"
"m520s1650m520s650m520s1650m520s650m520s650m520s1650m520s650m520s1650"
@@ -101,156 +101,156 @@ TEST(TestHaierACClass, Command) {
IRHaierAC haier(0);
haier.begin();
haier.setCommand(HAIER_AC_CMD_OFF);
EXPECT_EQ(HAIER_AC_CMD_OFF, haier.getCommand());
haier.setCommand(HAIER_AC_CMD_ON);
EXPECT_EQ(HAIER_AC_CMD_ON, haier.getCommand());
haier.setCommand(HAIER_AC_CMD_MODE);
EXPECT_EQ(HAIER_AC_CMD_MODE, haier.getCommand());
haier.setCommand(HAIER_AC_CMD_FAN);
EXPECT_EQ(HAIER_AC_CMD_FAN, haier.getCommand());
haier.setCommand(HAIER_AC_CMD_TEMP_UP);
EXPECT_EQ(HAIER_AC_CMD_TEMP_UP, haier.getCommand());
haier.setCommand(HAIER_AC_CMD_TEMP_DOWN);
EXPECT_EQ(HAIER_AC_CMD_TEMP_DOWN, haier.getCommand());
haier.setCommand(HAIER_AC_CMD_SLEEP);
EXPECT_EQ(HAIER_AC_CMD_SLEEP, haier.getCommand());
haier.setCommand(HAIER_AC_CMD_TIMER_SET);
EXPECT_EQ(HAIER_AC_CMD_TIMER_SET, haier.getCommand());
haier.setCommand(HAIER_AC_CMD_TIMER_CANCEL);
EXPECT_EQ(HAIER_AC_CMD_TIMER_CANCEL, haier.getCommand());
haier.setCommand(HAIER_AC_CMD_HEALTH);
EXPECT_EQ(HAIER_AC_CMD_HEALTH, haier.getCommand());
haier.setCommand(HAIER_AC_CMD_SWING);
EXPECT_EQ(HAIER_AC_CMD_SWING, haier.getCommand());
haier.setCommand(HAIER_AC_CMD_ON);
EXPECT_EQ(HAIER_AC_CMD_ON, haier.getCommand());
haier.setCommand(kHaierAcCmdOff);
EXPECT_EQ(kHaierAcCmdOff, haier.getCommand());
haier.setCommand(kHaierAcCmdOn);
EXPECT_EQ(kHaierAcCmdOn, haier.getCommand());
haier.setCommand(kHaierAcCmdMode);
EXPECT_EQ(kHaierAcCmdMode, haier.getCommand());
haier.setCommand(kHaierAcCmdFan);
EXPECT_EQ(kHaierAcCmdFan, haier.getCommand());
haier.setCommand(kHaierAcCmdTempUp);
EXPECT_EQ(kHaierAcCmdTempUp, haier.getCommand());
haier.setCommand(kHaierAcCmdTempDown);
EXPECT_EQ(kHaierAcCmdTempDown, haier.getCommand());
haier.setCommand(kHaierAcCmdSleep);
EXPECT_EQ(kHaierAcCmdSleep, haier.getCommand());
haier.setCommand(kHaierAcCmdTimerSet);
EXPECT_EQ(kHaierAcCmdTimerSet, haier.getCommand());
haier.setCommand(kHaierAcCmdTimerCancel);
EXPECT_EQ(kHaierAcCmdTimerCancel, haier.getCommand());
haier.setCommand(kHaierAcCmdHealth);
EXPECT_EQ(kHaierAcCmdHealth, haier.getCommand());
haier.setCommand(kHaierAcCmdSwing);
EXPECT_EQ(kHaierAcCmdSwing, haier.getCommand());
haier.setCommand(kHaierAcCmdOn);
EXPECT_EQ(kHaierAcCmdOn, haier.getCommand());
// Test unexpected values.
haier.setCommand(0b00001110);
EXPECT_EQ(HAIER_AC_CMD_OFF, haier.getCommand());
EXPECT_EQ(kHaierAcCmdOff, haier.getCommand());
haier.setCommand(0b00001111);
EXPECT_EQ(HAIER_AC_CMD_OFF, haier.getCommand());
EXPECT_EQ(kHaierAcCmdOff, haier.getCommand());
haier.setCommand(0b00000100);
EXPECT_EQ(HAIER_AC_CMD_OFF, haier.getCommand());
EXPECT_EQ(kHaierAcCmdOff, haier.getCommand());
}
TEST(TestHaierACClass, OperatingMode) {
IRHaierAC haier(0);
haier.begin();
haier.setMode(HAIER_AC_AUTO);
EXPECT_EQ(HAIER_AC_AUTO, haier.getMode());
haier.setMode(kHaierAcAuto);
EXPECT_EQ(kHaierAcAuto, haier.getMode());
haier.setMode(HAIER_AC_COOL);
EXPECT_EQ(HAIER_AC_COOL, haier.getMode());
haier.setMode(kHaierAcCool);
EXPECT_EQ(kHaierAcCool, haier.getMode());
haier.setMode(HAIER_AC_HEAT);
EXPECT_EQ(HAIER_AC_HEAT, haier.getMode());
haier.setMode(kHaierAcHeat);
EXPECT_EQ(kHaierAcHeat, haier.getMode());
haier.setMode(HAIER_AC_FAN);
EXPECT_EQ(HAIER_AC_FAN, haier.getMode());
haier.setMode(kHaierAcFan);
EXPECT_EQ(kHaierAcFan, haier.getMode());
haier.setMode(HAIER_AC_DRY);
EXPECT_EQ(HAIER_AC_DRY, haier.getMode());
haier.setMode(kHaierAcDry);
EXPECT_EQ(kHaierAcDry, haier.getMode());
haier.setMode(HAIER_AC_AUTO - 1);
EXPECT_EQ(HAIER_AC_AUTO, haier.getMode());
haier.setMode(kHaierAcAuto - 1);
EXPECT_EQ(kHaierAcAuto, haier.getMode());
haier.setMode(HAIER_AC_COOL);
EXPECT_EQ(HAIER_AC_COOL, haier.getMode());
haier.setMode(kHaierAcCool);
EXPECT_EQ(kHaierAcCool, haier.getMode());
haier.setMode(HAIER_AC_FAN + 1);
EXPECT_EQ(HAIER_AC_AUTO, haier.getMode());
haier.setMode(kHaierAcFan + 1);
EXPECT_EQ(kHaierAcAuto, haier.getMode());
haier.setMode(255);
EXPECT_EQ(HAIER_AC_AUTO, haier.getMode());
EXPECT_EQ(kHaierAcAuto, haier.getMode());
}
TEST(TestHaierACClass, Temperature) {
IRHaierAC haier(0);
haier.begin();
haier.setTemp(HAIER_AC_MIN_TEMP);
EXPECT_EQ(HAIER_AC_MIN_TEMP, haier.getTemp());
haier.setTemp(kHaierAcMinTemp);
EXPECT_EQ(kHaierAcMinTemp, haier.getTemp());
haier.setCommand(HAIER_AC_CMD_ON);
haier.setTemp(HAIER_AC_MIN_TEMP + 1);
EXPECT_EQ(HAIER_AC_MIN_TEMP + 1, haier.getTemp());
EXPECT_EQ(HAIER_AC_CMD_TEMP_UP, haier.getCommand());
haier.setCommand(kHaierAcCmdOn);
haier.setTemp(kHaierAcMinTemp + 1);
EXPECT_EQ(kHaierAcMinTemp + 1, haier.getTemp());
EXPECT_EQ(kHaierAcCmdTempUp, haier.getCommand());
haier.setTemp(HAIER_AC_MAX_TEMP);
EXPECT_EQ(HAIER_AC_MAX_TEMP, haier.getTemp());
EXPECT_EQ(HAIER_AC_CMD_TEMP_UP, haier.getCommand());
haier.setTemp(kHaierAcMaxTemp);
EXPECT_EQ(kHaierAcMaxTemp, haier.getTemp());
EXPECT_EQ(kHaierAcCmdTempUp, haier.getCommand());
haier.setTemp(HAIER_AC_MIN_TEMP - 1);
EXPECT_EQ(HAIER_AC_MIN_TEMP, haier.getTemp());
EXPECT_EQ(HAIER_AC_CMD_TEMP_DOWN, haier.getCommand());
haier.setTemp(kHaierAcMinTemp - 1);
EXPECT_EQ(kHaierAcMinTemp, haier.getTemp());
EXPECT_EQ(kHaierAcCmdTempDown, haier.getCommand());
haier.setTemp(HAIER_AC_MAX_TEMP + 1);
EXPECT_EQ(HAIER_AC_MAX_TEMP, haier.getTemp());
EXPECT_EQ(HAIER_AC_CMD_TEMP_UP, haier.getCommand());
haier.setTemp(kHaierAcMaxTemp + 1);
EXPECT_EQ(kHaierAcMaxTemp, haier.getTemp());
EXPECT_EQ(kHaierAcCmdTempUp, haier.getCommand());
haier.setTemp(23);
EXPECT_EQ(23, haier.getTemp());
EXPECT_EQ(HAIER_AC_CMD_TEMP_DOWN, haier.getCommand());
haier.setCommand(HAIER_AC_CMD_ON);
EXPECT_EQ(kHaierAcCmdTempDown, haier.getCommand());
haier.setCommand(kHaierAcCmdOn);
haier.setTemp(23);
EXPECT_EQ(23, haier.getTemp());
EXPECT_EQ(HAIER_AC_CMD_ON, haier.getCommand());
EXPECT_EQ(kHaierAcCmdOn, haier.getCommand());
haier.setTemp(0);
EXPECT_EQ(HAIER_AC_MIN_TEMP, haier.getTemp());
EXPECT_EQ(HAIER_AC_CMD_TEMP_DOWN, haier.getCommand());
EXPECT_EQ(kHaierAcMinTemp, haier.getTemp());
EXPECT_EQ(kHaierAcCmdTempDown, haier.getCommand());
haier.setTemp(255);
EXPECT_EQ(HAIER_AC_MAX_TEMP, haier.getTemp());
EXPECT_EQ(HAIER_AC_CMD_TEMP_UP, haier.getCommand());
EXPECT_EQ(kHaierAcMaxTemp, haier.getTemp());
EXPECT_EQ(kHaierAcCmdTempUp, haier.getCommand());
}
TEST(TestHaierACClass, FanSpeed) {
IRHaierAC haier(0);
haier.begin();
haier.setFan(HAIER_AC_FAN_LOW);
haier.setCommand(HAIER_AC_CMD_ON);
haier.setFan(kHaierAcFanLow);
haier.setCommand(kHaierAcCmdOn);
haier.setFan(HAIER_AC_FAN_AUTO);
EXPECT_EQ(HAIER_AC_FAN_AUTO, haier.getFan());
EXPECT_EQ(HAIER_AC_CMD_FAN, haier.getCommand());
haier.setFan(kHaierAcFanAuto);
EXPECT_EQ(kHaierAcFanAuto, haier.getFan());
EXPECT_EQ(kHaierAcCmdFan, haier.getCommand());
haier.setFan(HAIER_AC_FAN_LOW);
EXPECT_EQ(HAIER_AC_FAN_LOW, haier.getFan());
haier.setFan(HAIER_AC_FAN_MED);
EXPECT_EQ(HAIER_AC_FAN_MED, haier.getFan());
haier.setFan(HAIER_AC_FAN_HIGH);
EXPECT_EQ(HAIER_AC_FAN_HIGH, haier.getFan());
haier.setFan(kHaierAcFanLow);
EXPECT_EQ(kHaierAcFanLow, haier.getFan());
haier.setFan(kHaierAcFanMed);
EXPECT_EQ(kHaierAcFanMed, haier.getFan());
haier.setFan(kHaierAcFanHigh);
EXPECT_EQ(kHaierAcFanHigh, haier.getFan());
haier.setCommand(HAIER_AC_CMD_ON);
haier.setFan(HAIER_AC_FAN_HIGH);
EXPECT_EQ(HAIER_AC_FAN_HIGH, haier.getFan());
EXPECT_EQ(HAIER_AC_CMD_ON, haier.getCommand());
haier.setCommand(kHaierAcCmdOn);
haier.setFan(kHaierAcFanHigh);
EXPECT_EQ(kHaierAcFanHigh, haier.getFan());
EXPECT_EQ(kHaierAcCmdOn, haier.getCommand());
}
TEST(TestHaierACClass, Swing) {
IRHaierAC haier(0);
haier.begin();
haier.setFan(HAIER_AC_FAN_LOW);
haier.setCommand(HAIER_AC_CMD_ON);
haier.setFan(kHaierAcFanLow);
haier.setCommand(kHaierAcCmdOn);
haier.setSwing(HAIER_AC_SWING_OFF);
EXPECT_EQ(HAIER_AC_SWING_OFF, haier.getSwing());
haier.setSwing(kHaierAcSwingOff);
EXPECT_EQ(kHaierAcSwingOff, haier.getSwing());
haier.setSwing(HAIER_AC_SWING_UP);
EXPECT_EQ(HAIER_AC_SWING_UP, haier.getSwing());
EXPECT_EQ(HAIER_AC_CMD_SWING, haier.getCommand());
haier.setSwing(kHaierAcSwingUp);
EXPECT_EQ(kHaierAcSwingUp, haier.getSwing());
EXPECT_EQ(kHaierAcCmdSwing, haier.getCommand());
haier.setSwing(HAIER_AC_SWING_DOWN);
EXPECT_EQ(HAIER_AC_SWING_DOWN, haier.getSwing());
EXPECT_EQ(HAIER_AC_CMD_SWING, haier.getCommand());
haier.setSwing(kHaierAcSwingDown);
EXPECT_EQ(kHaierAcSwingDown, haier.getSwing());
EXPECT_EQ(kHaierAcCmdSwing, haier.getCommand());
haier.setSwing(HAIER_AC_SWING_CHG);
EXPECT_EQ(HAIER_AC_SWING_CHG, haier.getSwing());
EXPECT_EQ(HAIER_AC_CMD_SWING, haier.getCommand());
haier.setSwing(kHaierAcSwingChg);
EXPECT_EQ(kHaierAcSwingChg, haier.getSwing());
EXPECT_EQ(kHaierAcCmdSwing, haier.getCommand());
}
TEST(TestHaierACClass, CurrentTime) {
@@ -271,70 +271,70 @@ TEST(TestHaierACClass, CurrentTime) {
EXPECT_EQ(1114, haier.getCurrTime());
haier.setCurrTime(23 * 60 + 59); // 23:59
EXPECT_EQ(HAIER_AC_MAX_TIME, haier.getCurrTime()); // 23:59
EXPECT_EQ(kHaierAcMaxTime, haier.getCurrTime()); // 23:59
haier.setCurrTime(23 * 60 + 59 + 1); // 24:00
EXPECT_EQ(HAIER_AC_MAX_TIME, haier.getCurrTime()); // 23:59
EXPECT_EQ(kHaierAcMaxTime, haier.getCurrTime()); // 23:59
haier.setCurrTime(UINT16_MAX);
EXPECT_EQ(HAIER_AC_MAX_TIME, haier.getCurrTime()); // 23:59
EXPECT_EQ(kHaierAcMaxTime, haier.getCurrTime()); // 23:59
}
TEST(TestHaierACClass, Timers) {
IRHaierAC haier(0);
haier.begin();
haier.setCommand(HAIER_AC_CMD_ON);
haier.setCommand(kHaierAcCmdOn);
// Off by default.
EXPECT_GT(0, haier.getOnTimer());
EXPECT_GT(0, haier.getOffTimer());
EXPECT_EQ(HAIER_AC_CMD_ON, haier.getCommand());
EXPECT_EQ(kHaierAcCmdOn, haier.getCommand());
// On Timer.
haier.setOnTimer(6 * 60); // 6am
EXPECT_EQ(6 * 60, haier.getOnTimer()); // 6am
EXPECT_GT(0, haier.getOffTimer());
EXPECT_EQ(HAIER_AC_CMD_TIMER_SET, haier.getCommand());
EXPECT_EQ(kHaierAcCmdTimerSet, haier.getCommand());
haier.setCommand(HAIER_AC_CMD_ON);
haier.setCommand(kHaierAcCmdOn);
EXPECT_EQ(6 * 60, haier.getOnTimer()); // 6am
EXPECT_GT(0, haier.getOffTimer());
EXPECT_EQ(HAIER_AC_CMD_ON, haier.getCommand());
EXPECT_EQ(kHaierAcCmdOn, haier.getCommand());
haier.cancelTimers();
EXPECT_GT(0, haier.getOnTimer());
EXPECT_GT(0, haier.getOffTimer());
EXPECT_EQ(HAIER_AC_CMD_TIMER_CANCEL, haier.getCommand());
EXPECT_EQ(kHaierAcCmdTimerCancel, haier.getCommand());
// Off Timer.
haier.setOffTimer(18 * 60 + 30); // 6:30pm
EXPECT_GT(0, haier.getOnTimer());
EXPECT_EQ(18 * 60 + 30, haier.getOffTimer()); // 6:30pm
EXPECT_EQ(HAIER_AC_CMD_TIMER_SET, haier.getCommand());
EXPECT_EQ(kHaierAcCmdTimerSet, haier.getCommand());
haier.setCommand(HAIER_AC_CMD_ON);
haier.setCommand(kHaierAcCmdOn);
EXPECT_GT(0, haier.getOnTimer());
EXPECT_EQ(18 * 60 + 30, haier.getOffTimer()); // 6:30pm
EXPECT_EQ(HAIER_AC_CMD_ON, haier.getCommand());
EXPECT_EQ(kHaierAcCmdOn, haier.getCommand());
haier.cancelTimers();
EXPECT_GT(0, haier.getOnTimer());
EXPECT_GT(0, haier.getOffTimer());
EXPECT_EQ(HAIER_AC_CMD_TIMER_CANCEL, haier.getCommand());
EXPECT_EQ(kHaierAcCmdTimerCancel, haier.getCommand());
// Both Timers.
haier.setOnTimer(6 * 60); // 6am
EXPECT_EQ(HAIER_AC_CMD_TIMER_SET, haier.getCommand());
EXPECT_EQ(kHaierAcCmdTimerSet, haier.getCommand());
haier.setOffTimer(18 * 60 + 30); // 6:30pm
EXPECT_EQ(HAIER_AC_CMD_TIMER_SET, haier.getCommand());
EXPECT_EQ(kHaierAcCmdTimerSet, haier.getCommand());
EXPECT_EQ(6 * 60, haier.getOnTimer()); // 6am
EXPECT_EQ(18 * 60 + 30, haier.getOffTimer()); // 6:30pm
haier.cancelTimers();
EXPECT_GT(0, haier.getOnTimer());
EXPECT_GT(0, haier.getOffTimer());
EXPECT_EQ(HAIER_AC_CMD_TIMER_CANCEL, haier.getCommand());
EXPECT_EQ(kHaierAcCmdTimerCancel, haier.getCommand());
}
TEST(TestHaierACClass, TimeToString) {
@@ -357,14 +357,14 @@ TEST(TestHaierACClass, MessageConstuction) {
"Swing: 0 (Off), Sleep: Off, Health: Off, "
"Current Time: 00:00, On Timer: Off, Off Timer: Off",
haier.toString());
haier.setMode(HAIER_AC_COOL);
haier.setMode(kHaierAcCool);
haier.setTemp(21);
haier.setFan(HAIER_AC_FAN_HIGH);
haier.setFan(kHaierAcFanHigh);
EXPECT_EQ("Command: 3 (Fan), Mode: 1 (COOL), Temp: 21C, Fan: 3 (MAX), "
"Swing: 0 (Off), Sleep: Off, Health: Off, "
"Current Time: 00:00, On Timer: Off, Off Timer: Off",
haier.toString());
haier.setSwing(HAIER_AC_SWING_CHG);
haier.setSwing(kHaierAcSwingChg);
haier.setHealth(true);
haier.setSleep(true);
haier.setCurrTime(615); // 10:15am
@@ -374,7 +374,7 @@ TEST(TestHaierACClass, MessageConstuction) {
haier.toString());
haier.setOnTimer(800); // 1:20pm
haier.setOffTimer(1125); // 6:45pm
haier.setCommand(HAIER_AC_CMD_ON);
haier.setCommand(kHaierAcCmdOn);
EXPECT_EQ("Command: 1 (On), Mode: 2 (DRY), Temp: 21C, Fan: 2, "
"Swing: 3 (Chg), Sleep: On, Health: On, "
@@ -382,7 +382,7 @@ TEST(TestHaierACClass, MessageConstuction) {
haier.toString());
// Now change a few already set things.
haier.setMode(HAIER_AC_HEAT);
haier.setMode(kHaierAcHeat);
EXPECT_EQ("Command: 2 (Mode), Mode: 3 (HEAT), Temp: 21C, Fan: 2, "
"Swing: 3 (Chg), Sleep: On, Health: On, "
"Current Time: 10:15, On Timer: 13:52, Off Timer: 18:45",
@@ -394,15 +394,15 @@ TEST(TestHaierACClass, MessageConstuction) {
"Current Time: 10:15, On Timer: 13:52, Off Timer: 18:45",
haier.toString());
uint8_t expectedState[HAIER_AC_STATE_LENGTH] = {
uint8_t expectedState[kHaierACStateLength] = {
0xA5, 0x96, 0xEA, 0xCF, 0x32, 0x2D, 0x0D, 0x74, 0xD4};
EXPECT_STATE_EQ(expectedState, haier.getRaw(), HAIER_AC_BITS);
EXPECT_STATE_EQ(expectedState, haier.getRaw(), kHaierACBits);
// Check that the checksum is valid.
EXPECT_TRUE(IRHaierAC::validChecksum(haier.getRaw()));
// Now load up some random data.
uint8_t randomState[HAIER_AC_STATE_LENGTH] = {
uint8_t randomState[kHaierACStateLength] = {
0x52, 0x49, 0x50, 0x20, 0x54, 0x61, 0x6C, 0x69, 0x61};
EXPECT_FALSE(IRHaierAC::validChecksum(randomState));
haier.setRaw(randomState);
@@ -420,95 +420,95 @@ TEST(TestHaierACYRW02Class, Button) {
IRHaierACYRW02 haier(0);
haier.begin();
haier.setButton(HAIER_AC_YRW02_BUTTON_POWER);
EXPECT_EQ(HAIER_AC_YRW02_BUTTON_POWER, haier.getButton());
haier.setButton(HAIER_AC_YRW02_BUTTON_MODE);
EXPECT_EQ(HAIER_AC_YRW02_BUTTON_MODE, haier.getButton());
haier.setButton(HAIER_AC_YRW02_BUTTON_SLEEP);
EXPECT_EQ(HAIER_AC_YRW02_BUTTON_SLEEP, haier.getButton());
haier.setButton(HAIER_AC_YRW02_BUTTON_FAN);
haier.setButton(kHaierAcYrw02ButtonPower);
EXPECT_EQ(kHaierAcYrw02ButtonPower, haier.getButton());
haier.setButton(kHaierAcYrw02ButtonMode);
EXPECT_EQ(kHaierAcYrw02ButtonMode, haier.getButton());
haier.setButton(kHaierAcYrw02ButtonSleep);
EXPECT_EQ(kHaierAcYrw02ButtonSleep, haier.getButton());
haier.setButton(kHaierAcYrw02ButtonFan);
// Test unexpected values.
haier.setButton(0xFF);
EXPECT_EQ(HAIER_AC_YRW02_BUTTON_FAN, haier.getButton());
EXPECT_EQ(kHaierAcYrw02ButtonFan, haier.getButton());
haier.setButton(0x10);
EXPECT_EQ(HAIER_AC_YRW02_BUTTON_FAN, haier.getButton());
EXPECT_EQ(kHaierAcYrw02ButtonFan, haier.getButton());
}
TEST(TestHaierACYRW02Class, OperatingMode) {
IRHaierACYRW02 haier(0);
haier.begin();
haier.setButton(HAIER_AC_YRW02_BUTTON_POWER);
haier.setMode(HAIER_AC_YRW02_AUTO);
EXPECT_EQ(HAIER_AC_YRW02_AUTO, haier.getMode());
EXPECT_EQ(HAIER_AC_YRW02_BUTTON_MODE, haier.getButton());
haier.setButton(kHaierAcYrw02ButtonPower);
haier.setMode(kHaierAcYrw02Auto);
EXPECT_EQ(kHaierAcYrw02Auto, haier.getMode());
EXPECT_EQ(kHaierAcYrw02ButtonMode, haier.getButton());
haier.setMode(HAIER_AC_YRW02_COOL);
EXPECT_EQ(HAIER_AC_YRW02_COOL, haier.getMode());
haier.setMode(kHaierAcYrw02Cool);
EXPECT_EQ(kHaierAcYrw02Cool, haier.getMode());
haier.setMode(HAIER_AC_YRW02_HEAT);
EXPECT_EQ(HAIER_AC_YRW02_HEAT, haier.getMode());
haier.setMode(kHaierAcYrw02Heat);
EXPECT_EQ(kHaierAcYrw02Heat, haier.getMode());
haier.setMode(HAIER_AC_YRW02_FAN);
EXPECT_EQ(HAIER_AC_YRW02_FAN, haier.getMode());
haier.setMode(kHaierAcYrw02Fan);
EXPECT_EQ(kHaierAcYrw02Fan, haier.getMode());
haier.setMode(HAIER_AC_YRW02_DRY);
EXPECT_EQ(HAIER_AC_YRW02_DRY, haier.getMode());
haier.setMode(kHaierAcYrw02Dry);
EXPECT_EQ(kHaierAcYrw02Dry, haier.getMode());
haier.setMode(HAIER_AC_YRW02_AUTO - 1);
EXPECT_EQ(HAIER_AC_YRW02_AUTO, haier.getMode());
haier.setMode(kHaierAcYrw02Auto - 1);
EXPECT_EQ(kHaierAcYrw02Auto, haier.getMode());
haier.setMode(HAIER_AC_YRW02_COOL);
EXPECT_EQ(HAIER_AC_YRW02_COOL, haier.getMode());
haier.setMode(kHaierAcYrw02Cool);
EXPECT_EQ(kHaierAcYrw02Cool, haier.getMode());
haier.setMode(HAIER_AC_YRW02_FAN + 1);
EXPECT_EQ(HAIER_AC_YRW02_AUTO, haier.getMode());
haier.setMode(kHaierAcYrw02Fan + 1);
EXPECT_EQ(kHaierAcYrw02Auto, haier.getMode());
haier.setMode(255);
EXPECT_EQ(HAIER_AC_YRW02_AUTO, haier.getMode());
EXPECT_EQ(kHaierAcYrw02Auto, haier.getMode());
}
TEST(TestHaierACYRW02Class, Temperature) {
IRHaierACYRW02 haier(0);
haier.begin();
haier.setTemp(HAIER_AC_MIN_TEMP);
EXPECT_EQ(HAIER_AC_MIN_TEMP, haier.getTemp());
haier.setTemp(kHaierAcMinTemp);
EXPECT_EQ(kHaierAcMinTemp, haier.getTemp());
haier.setButton(HAIER_AC_YRW02_BUTTON_POWER);
haier.setTemp(HAIER_AC_MIN_TEMP + 1);
EXPECT_EQ(HAIER_AC_MIN_TEMP + 1, haier.getTemp());
EXPECT_EQ(HAIER_AC_YRW02_BUTTON_TEMP_UP, haier.getButton());
haier.setButton(kHaierAcYrw02ButtonPower);
haier.setTemp(kHaierAcMinTemp + 1);
EXPECT_EQ(kHaierAcMinTemp + 1, haier.getTemp());
EXPECT_EQ(kHaierAcYrw02ButtonTempUp, haier.getButton());
haier.setTemp(HAIER_AC_MAX_TEMP);
EXPECT_EQ(HAIER_AC_MAX_TEMP, haier.getTemp());
EXPECT_EQ(HAIER_AC_YRW02_BUTTON_TEMP_UP, haier.getButton());
haier.setTemp(kHaierAcMaxTemp);
EXPECT_EQ(kHaierAcMaxTemp, haier.getTemp());
EXPECT_EQ(kHaierAcYrw02ButtonTempUp, haier.getButton());
haier.setTemp(HAIER_AC_MIN_TEMP - 1);
EXPECT_EQ(HAIER_AC_MIN_TEMP, haier.getTemp());
EXPECT_EQ(HAIER_AC_YRW02_BUTTON_TEMP_DOWN, haier.getButton());
haier.setTemp(kHaierAcMinTemp - 1);
EXPECT_EQ(kHaierAcMinTemp, haier.getTemp());
EXPECT_EQ(kHaierAcYrw02ButtonTempDown, haier.getButton());
haier.setTemp(HAIER_AC_MAX_TEMP + 1);
EXPECT_EQ(HAIER_AC_MAX_TEMP, haier.getTemp());
EXPECT_EQ(HAIER_AC_YRW02_BUTTON_TEMP_UP, haier.getButton());
haier.setTemp(kHaierAcMaxTemp + 1);
EXPECT_EQ(kHaierAcMaxTemp, haier.getTemp());
EXPECT_EQ(kHaierAcYrw02ButtonTempUp, haier.getButton());
haier.setTemp(23);
EXPECT_EQ(23, haier.getTemp());
EXPECT_EQ(HAIER_AC_YRW02_BUTTON_TEMP_DOWN, haier.getButton());
haier.setButton(HAIER_AC_YRW02_BUTTON_POWER);
EXPECT_EQ(kHaierAcYrw02ButtonTempDown, haier.getButton());
haier.setButton(kHaierAcYrw02ButtonPower);
haier.setTemp(23);
EXPECT_EQ(23, haier.getTemp());
EXPECT_EQ(HAIER_AC_YRW02_BUTTON_POWER, haier.getButton());
EXPECT_EQ(kHaierAcYrw02ButtonPower, haier.getButton());
haier.setTemp(0);
EXPECT_EQ(HAIER_AC_MIN_TEMP, haier.getTemp());
EXPECT_EQ(HAIER_AC_YRW02_BUTTON_TEMP_DOWN, haier.getButton());
EXPECT_EQ(kHaierAcMinTemp, haier.getTemp());
EXPECT_EQ(kHaierAcYrw02ButtonTempDown, haier.getButton());
haier.setTemp(255);
EXPECT_EQ(HAIER_AC_MAX_TEMP, haier.getTemp());
EXPECT_EQ(HAIER_AC_YRW02_BUTTON_TEMP_UP, haier.getButton());
EXPECT_EQ(kHaierAcMaxTemp, haier.getTemp());
EXPECT_EQ(kHaierAcYrw02ButtonTempUp, haier.getButton());
}
TEST(TestHaierACYRW02Class, HealthMode) {
@@ -517,16 +517,16 @@ TEST(TestHaierACYRW02Class, HealthMode) {
haier.setHealth(true);
EXPECT_TRUE(haier.getHealth());
EXPECT_EQ(HAIER_AC_YRW02_BUTTON_HEALTH, haier.getButton());
EXPECT_EQ(kHaierAcYrw02ButtonHealth, haier.getButton());
haier.setButton(HAIER_AC_YRW02_BUTTON_TEMP_UP);
haier.setButton(kHaierAcYrw02ButtonTempUp);
haier.setHealth(false);
EXPECT_FALSE(haier.getHealth());
EXPECT_EQ(HAIER_AC_YRW02_BUTTON_HEALTH, haier.getButton());
EXPECT_EQ(kHaierAcYrw02ButtonHealth, haier.getButton());
haier.setHealth(true);
EXPECT_TRUE(haier.getHealth());
EXPECT_EQ(HAIER_AC_YRW02_BUTTON_HEALTH, haier.getButton());
EXPECT_EQ(kHaierAcYrw02ButtonHealth, haier.getButton());
}
TEST(TestHaierACYRW02Class, Power) {
@@ -535,16 +535,16 @@ TEST(TestHaierACYRW02Class, Power) {
haier.setPower(true);
EXPECT_TRUE(haier.getPower());
EXPECT_EQ(HAIER_AC_YRW02_BUTTON_POWER, haier.getButton());
EXPECT_EQ(kHaierAcYrw02ButtonPower, haier.getButton());
haier.setButton(HAIER_AC_YRW02_BUTTON_TEMP_UP);
haier.setButton(kHaierAcYrw02ButtonTempUp);
haier.setPower(false);
EXPECT_FALSE(haier.getPower());
EXPECT_EQ(HAIER_AC_YRW02_BUTTON_POWER, haier.getButton());
EXPECT_EQ(kHaierAcYrw02ButtonPower, haier.getButton());
haier.setPower(true);
EXPECT_TRUE(haier.getPower());
EXPECT_EQ(HAIER_AC_YRW02_BUTTON_POWER, haier.getButton());
EXPECT_EQ(kHaierAcYrw02ButtonPower, haier.getButton());
haier.off();
EXPECT_FALSE(haier.getPower());
@@ -558,16 +558,16 @@ TEST(TestHaierACYRW02Class, SleepMode) {
haier.setSleep(true);
EXPECT_TRUE(haier.getSleep());
EXPECT_EQ(HAIER_AC_YRW02_BUTTON_SLEEP, haier.getButton());
EXPECT_EQ(kHaierAcYrw02ButtonSleep, haier.getButton());
haier.setButton(HAIER_AC_YRW02_BUTTON_TEMP_UP);
haier.setButton(kHaierAcYrw02ButtonTempUp);
haier.setSleep(false);
EXPECT_FALSE(haier.getSleep());
EXPECT_EQ(HAIER_AC_YRW02_BUTTON_SLEEP, haier.getButton());
EXPECT_EQ(kHaierAcYrw02ButtonSleep, haier.getButton());
haier.setSleep(true);
EXPECT_TRUE(haier.getSleep());
EXPECT_EQ(HAIER_AC_YRW02_BUTTON_SLEEP, haier.getButton());
EXPECT_EQ(kHaierAcYrw02ButtonSleep, haier.getButton());
}
@@ -575,97 +575,97 @@ TEST(TestHaierACYRW02Class, TurboMode) {
IRHaierACYRW02 haier(0);
haier.begin();
haier.setTurbo(HAIER_AC_YRW02_TURBO_OFF);
EXPECT_EQ(HAIER_AC_YRW02_TURBO_OFF, haier.getTurbo());
EXPECT_EQ(HAIER_AC_YRW02_BUTTON_TURBO, haier.getButton());
haier.setTurbo(kHaierAcYrw02TurboOff);
EXPECT_EQ(kHaierAcYrw02TurboOff, haier.getTurbo());
EXPECT_EQ(kHaierAcYrw02ButtonTurbo, haier.getButton());
haier.setButton(HAIER_AC_YRW02_BUTTON_TEMP_UP);
haier.setButton(kHaierAcYrw02ButtonTempUp);
haier.setTurbo(HAIER_AC_YRW02_TURBO_LOW);
EXPECT_EQ(HAIER_AC_YRW02_TURBO_LOW, haier.getTurbo());
EXPECT_EQ(HAIER_AC_YRW02_BUTTON_TURBO, haier.getButton());
haier.setTurbo(kHaierAcYrw02TurboLow);
EXPECT_EQ(kHaierAcYrw02TurboLow, haier.getTurbo());
EXPECT_EQ(kHaierAcYrw02ButtonTurbo, haier.getButton());
haier.setTurbo(HAIER_AC_YRW02_TURBO_HIGH);
EXPECT_EQ(HAIER_AC_YRW02_TURBO_HIGH, haier.getTurbo());
EXPECT_EQ(HAIER_AC_YRW02_BUTTON_TURBO, haier.getButton());
haier.setTurbo(kHaierAcYrw02TurboHigh);
EXPECT_EQ(kHaierAcYrw02TurboHigh, haier.getTurbo());
EXPECT_EQ(kHaierAcYrw02ButtonTurbo, haier.getButton());
haier.setTurbo(HAIER_AC_YRW02_TURBO_OFF);
EXPECT_EQ(HAIER_AC_YRW02_TURBO_OFF, haier.getTurbo());
EXPECT_EQ(HAIER_AC_YRW02_BUTTON_TURBO, haier.getButton());
haier.setTurbo(kHaierAcYrw02TurboOff);
EXPECT_EQ(kHaierAcYrw02TurboOff, haier.getTurbo());
EXPECT_EQ(kHaierAcYrw02ButtonTurbo, haier.getButton());
}
TEST(TestHaierACYRW02Class, Fan) {
IRHaierACYRW02 haier(0);
haier.begin();
haier.setFan(HAIER_AC_YRW02_FAN_AUTO);
EXPECT_EQ(HAIER_AC_YRW02_FAN_AUTO, haier.getFan());
EXPECT_EQ(HAIER_AC_YRW02_BUTTON_FAN, haier.getButton());
haier.setFan(kHaierAcYrw02FanAuto);
EXPECT_EQ(kHaierAcYrw02FanAuto, haier.getFan());
EXPECT_EQ(kHaierAcYrw02ButtonFan, haier.getButton());
haier.setButton(HAIER_AC_YRW02_BUTTON_TEMP_UP);
haier.setButton(kHaierAcYrw02ButtonTempUp);
haier.setFan(HAIER_AC_YRW02_FAN_LOW);
EXPECT_EQ(HAIER_AC_YRW02_FAN_LOW, haier.getFan());
EXPECT_EQ(HAIER_AC_YRW02_BUTTON_FAN, haier.getButton());
haier.setFan(kHaierAcYrw02FanLow);
EXPECT_EQ(kHaierAcYrw02FanLow, haier.getFan());
EXPECT_EQ(kHaierAcYrw02ButtonFan, haier.getButton());
haier.setFan(HAIER_AC_YRW02_FAN_HIGH);
EXPECT_EQ(HAIER_AC_YRW02_FAN_HIGH, haier.getFan());
EXPECT_EQ(HAIER_AC_YRW02_BUTTON_FAN, haier.getButton());
haier.setFan(kHaierAcYrw02FanHigh);
EXPECT_EQ(kHaierAcYrw02FanHigh, haier.getFan());
EXPECT_EQ(kHaierAcYrw02ButtonFan, haier.getButton());
haier.setFan(HAIER_AC_YRW02_FAN_MED);
EXPECT_EQ(HAIER_AC_YRW02_FAN_MED, haier.getFan());
EXPECT_EQ(HAIER_AC_YRW02_BUTTON_FAN, haier.getButton());
haier.setFan(kHaierAcYrw02FanMed);
EXPECT_EQ(kHaierAcYrw02FanMed, haier.getFan());
EXPECT_EQ(kHaierAcYrw02ButtonFan, haier.getButton());
// Test unexpected values.
haier.setButton(HAIER_AC_YRW02_BUTTON_TEMP_UP);
haier.setButton(kHaierAcYrw02ButtonTempUp);
haier.setFan(0x00);
EXPECT_EQ(HAIER_AC_YRW02_FAN_MED, haier.getFan());
EXPECT_EQ(HAIER_AC_YRW02_BUTTON_TEMP_UP, haier.getButton());
EXPECT_EQ(kHaierAcYrw02FanMed, haier.getFan());
EXPECT_EQ(kHaierAcYrw02ButtonTempUp, haier.getButton());
}
TEST(TestHaierACYRW02Class, Swing) {
IRHaierACYRW02 haier(0);
haier.begin();
haier.setSwing(HAIER_AC_YRW02_SWING_OFF);
EXPECT_EQ(HAIER_AC_YRW02_SWING_OFF, haier.getSwing());
EXPECT_EQ(HAIER_AC_YRW02_BUTTON_SWING, haier.getButton());
haier.setSwing(kHaierAcYrw02SwingOff);
EXPECT_EQ(kHaierAcYrw02SwingOff, haier.getSwing());
EXPECT_EQ(kHaierAcYrw02ButtonSwing, haier.getButton());
haier.setButton(HAIER_AC_YRW02_BUTTON_TEMP_UP);
haier.setButton(kHaierAcYrw02ButtonTempUp);
haier.setSwing(HAIER_AC_YRW02_SWING_AUTO);
EXPECT_EQ(HAIER_AC_YRW02_SWING_AUTO, haier.getSwing());
EXPECT_EQ(HAIER_AC_YRW02_BUTTON_SWING, haier.getButton());
haier.setSwing(kHaierAcYrw02SwingAuto);
EXPECT_EQ(kHaierAcYrw02SwingAuto, haier.getSwing());
EXPECT_EQ(kHaierAcYrw02ButtonSwing, haier.getButton());
haier.setSwing(HAIER_AC_YRW02_SWING_TOP);
EXPECT_EQ(HAIER_AC_YRW02_SWING_TOP, haier.getSwing());
EXPECT_EQ(HAIER_AC_YRW02_BUTTON_SWING, haier.getButton());
haier.setSwing(kHaierAcYrw02SwingTop);
EXPECT_EQ(kHaierAcYrw02SwingTop, haier.getSwing());
EXPECT_EQ(kHaierAcYrw02ButtonSwing, haier.getButton());
haier.setSwing(HAIER_AC_YRW02_SWING_DOWN);
EXPECT_EQ(HAIER_AC_YRW02_SWING_DOWN, haier.getSwing());
EXPECT_EQ(HAIER_AC_YRW02_BUTTON_SWING, haier.getButton());
haier.setSwing(kHaierAcYrw02SwingDown);
EXPECT_EQ(kHaierAcYrw02SwingDown, haier.getSwing());
EXPECT_EQ(kHaierAcYrw02ButtonSwing, haier.getButton());
// Test unexpected values.
haier.setButton(HAIER_AC_YRW02_BUTTON_TEMP_UP);
haier.setButton(kHaierAcYrw02ButtonTempUp);
haier.setSwing(0xFF);
EXPECT_EQ(HAIER_AC_YRW02_SWING_DOWN, haier.getSwing());
EXPECT_EQ(HAIER_AC_YRW02_BUTTON_TEMP_UP, haier.getButton());
EXPECT_EQ(kHaierAcYrw02SwingDown, haier.getSwing());
EXPECT_EQ(kHaierAcYrw02ButtonTempUp, haier.getButton());
// Test the mode-dependant positions.
haier.setMode(HAIER_AC_YRW02_AUTO);
haier.setSwing(HAIER_AC_YRW02_SWING_MIDDLE);
EXPECT_EQ(HAIER_AC_YRW02_SWING_MIDDLE, haier.getSwing());
EXPECT_EQ(HAIER_AC_YRW02_BUTTON_SWING, haier.getButton());
haier.setMode(HAIER_AC_YRW02_HEAT);
haier.setSwing(HAIER_AC_YRW02_SWING_MIDDLE);
EXPECT_EQ(HAIER_AC_YRW02_SWING_BOTTOM, haier.getSwing());
haier.setSwing(HAIER_AC_YRW02_SWING_AUTO);
EXPECT_EQ(HAIER_AC_YRW02_SWING_AUTO, haier.getSwing());
haier.setSwing(HAIER_AC_YRW02_SWING_BOTTOM);
EXPECT_EQ(HAIER_AC_YRW02_SWING_BOTTOM, haier.getSwing());
haier.setMode(HAIER_AC_YRW02_COOL);
haier.setSwing(HAIER_AC_YRW02_SWING_BOTTOM);
EXPECT_EQ(HAIER_AC_YRW02_SWING_MIDDLE, haier.getSwing());
haier.setMode(kHaierAcYrw02Auto);
haier.setSwing(kHaierAcYrw02SwingMiddle);
EXPECT_EQ(kHaierAcYrw02SwingMiddle, haier.getSwing());
EXPECT_EQ(kHaierAcYrw02ButtonSwing, haier.getButton());
haier.setMode(kHaierAcYrw02Heat);
haier.setSwing(kHaierAcYrw02SwingMiddle);
EXPECT_EQ(kHaierAcYrw02SwingBottom, haier.getSwing());
haier.setSwing(kHaierAcYrw02SwingAuto);
EXPECT_EQ(kHaierAcYrw02SwingAuto, haier.getSwing());
haier.setSwing(kHaierAcYrw02SwingBottom);
EXPECT_EQ(kHaierAcYrw02SwingBottom, haier.getSwing());
haier.setMode(kHaierAcYrw02Cool);
haier.setSwing(kHaierAcYrw02SwingBottom);
EXPECT_EQ(kHaierAcYrw02SwingMiddle, haier.getSwing());
}
TEST(TestHaierACYRW02Class, MessageConstuction) {
@@ -675,18 +675,18 @@ TEST(TestHaierACYRW02Class, MessageConstuction) {
" Fan: 10 (Auto), Turbo: 0 (Off), Swing: 0 (Off), Sleep: Off,"
" Health: On",
haier.toString());
haier.setMode(HAIER_AC_YRW02_COOL);
haier.setMode(kHaierAcYrw02Cool);
haier.setTemp(21);
haier.setFan(HAIER_AC_YRW02_FAN_HIGH);
haier.setFan(kHaierAcYrw02FanHigh);
EXPECT_EQ("Power: On, Button: 4 (Fan), Mode: 2 (Cool), Temp: 21C,"
" Fan: 2 (High), Turbo: 0 (Off), Swing: 0 (Off), Sleep: Off,"
" Health: On",
haier.toString());
haier.setSwing(HAIER_AC_YRW02_SWING_MIDDLE);
haier.setSwing(kHaierAcYrw02SwingMiddle);
haier.setHealth(false);
haier.setSleep(true);
haier.setTurbo(HAIER_AC_YRW02_TURBO_HIGH);
haier.setTurbo(kHaierAcYrw02TurboHigh);
EXPECT_EQ("Power: On, Button: 8 (Turbo), Mode: 2 (Cool), Temp: 21C,"
" Fan: 2 (High), Turbo: 1 (High), Swing: 2 (Middle),"
" Sleep: On, Health: Off",
@@ -695,7 +695,7 @@ TEST(TestHaierACYRW02Class, MessageConstuction) {
// Decode "real" state messages.
TEST(TestHaierACYRW02Class, RealStates) {
uint8_t expectedState1[HAIER_AC_YRW02_STATE_LENGTH] = {
uint8_t expectedState1[kHaierACYRW02StateLength] = {
0xA6, 0xE1, 0x00, 0x00, 0x40, 0x20, 0x00,
0x80, 0x00, 0x00, 0x00, 0x00, 0x07, 0x6E};
@@ -706,7 +706,7 @@ TEST(TestHaierACYRW02Class, RealStates) {
" Health: Off",
haier.toString());
uint8_t expectedState2[HAIER_AC_YRW02_STATE_LENGTH] = {
uint8_t expectedState2[kHaierACYRW02StateLength] = {
0xA6, 0xE0, 0x00, 0x00, 0x00, 0x20, 0x00,
0x80, 0x00, 0x00, 0x00, 0x00, 0x05, 0x75};
haier.setRaw(expectedState2);
@@ -715,7 +715,7 @@ TEST(TestHaierACYRW02Class, RealStates) {
" Health: Off",
haier.toString());
uint8_t expectedState3[HAIER_AC_YRW02_STATE_LENGTH] = {
uint8_t expectedState3[kHaierACYRW02StateLength] = {
0xA6, 0x02, 0x00, 0x02, 0x40, 0x20, 0x00,
0x20, 0x00, 0x00, 0x00, 0x00, 0x01, 0x2B};
haier.setRaw(expectedState3);
@@ -725,7 +725,7 @@ TEST(TestHaierACYRW02Class, RealStates) {
haier.toString());
// cool 25, health, fan auto, swing auto, sleep on
uint8_t expectedState4[HAIER_AC_YRW02_STATE_LENGTH] = {
uint8_t expectedState4[kHaierACYRW02StateLength] = {
0xA6, 0x9C, 0x00, 0x02, 0x40, 0xA8, 0x00,
0x20, 0x80, 0x00, 0x00, 0x00, 0x0B, 0xD7};
haier.setRaw(expectedState4);
@@ -735,7 +735,7 @@ TEST(TestHaierACYRW02Class, RealStates) {
haier.toString());
// cool 25, health, fan 3, swing auto, sleep on
uint8_t expectedState5[HAIER_AC_YRW02_STATE_LENGTH] = {
uint8_t expectedState5[kHaierACYRW02StateLength] = {
0xA6, 0x9C, 0x00, 0x02, 0x40, 0x27, 0x36,
0x20, 0x80, 0x00, 0x00, 0x00, 0x04, 0x85};
haier.setRaw(expectedState5);
@@ -754,16 +754,16 @@ TEST(TestDecodeHaierAC, NormalDecodeWithStrict) {
IRrecv irrecv(0);
irsend.begin();
uint8_t expectedState[HAIER_AC_STATE_LENGTH] = {
uint8_t expectedState[kHaierACStateLength] = {
0xA5, 0x01, 0x20, 0x01, 0x00, 0xC0, 0x20, 0x00, 0xA7};
// With the specific decoder.
irsend.reset();
irsend.sendHaierAC(expectedState);
irsend.makeDecodeResult();
ASSERT_TRUE(irrecv.decodeHaierAC(&irsend.capture, HAIER_AC_BITS, true));
ASSERT_TRUE(irrecv.decodeHaierAC(&irsend.capture, kHaierACBits, true));
EXPECT_EQ(HAIER_AC, irsend.capture.decode_type);
EXPECT_EQ(HAIER_AC_BITS, irsend.capture.bits);
EXPECT_EQ(kHaierACBits, irsend.capture.bits);
EXPECT_FALSE(irsend.capture.repeat);
EXPECT_STATE_EQ(expectedState, irsend.capture.state, irsend.capture.bits);
@@ -773,7 +773,7 @@ TEST(TestDecodeHaierAC, NormalDecodeWithStrict) {
irsend.makeDecodeResult();
ASSERT_TRUE(irrecv.decode(&irsend.capture));
EXPECT_EQ(HAIER_AC, irsend.capture.decode_type);
EXPECT_EQ(HAIER_AC_BITS, irsend.capture.bits);
EXPECT_EQ(kHaierACBits, irsend.capture.bits);
EXPECT_FALSE(irsend.capture.repeat);
EXPECT_STATE_EQ(expectedState, irsend.capture.state, irsend.capture.bits);
}
@@ -797,14 +797,14 @@ TEST(TestDecodeHaierAC, RealExample1) {
714, 550, 582, 552, 582, 578, 568, 552, 712, 552, 582, 550, 582, 550,
582, 550, 712, 552, 582, 550, 582, 552, 582, 578, 722, 552, 1704, 550,
582, 550, 1706, 550, 736, 550, 582, 550, 1706, 550, 1704, 552, 1704, 578};
uint8_t expectedState[HAIER_AC_STATE_LENGTH] = {
uint8_t expectedState[kHaierACStateLength] = {
0xA5, 0x01, 0x20, 0x01, 0x00, 0xC0, 0x20, 0x00, 0xA7};
irsend.sendRaw(rawData, 149, 38000);
irsend.makeDecodeResult();
ASSERT_TRUE(irrecv.decode(&irsend.capture));
ASSERT_EQ(HAIER_AC, irsend.capture.decode_type);
EXPECT_EQ(HAIER_AC_BITS, irsend.capture.bits);
EXPECT_EQ(kHaierACBits, irsend.capture.bits);
EXPECT_FALSE(irsend.capture.repeat);
EXPECT_STATE_EQ(expectedState, irsend.capture.state, irsend.capture.bits);
@@ -835,14 +835,14 @@ TEST(TestDecodeHaierAC, RealExample2) {
550, 582, 550, 582, 580, 568, 552, 712, 550, 584, 550, 582, 550, 584, 550,
712, 550, 582, 550, 582, 550, 582, 578, 722, 550, 582, 552, 580, 552, 582,
550, 738, 550, 1706, 550, 1704, 552, 582, 550, 582, 578};
uint8_t expectedState[HAIER_AC_STATE_LENGTH] = {
uint8_t expectedState[kHaierACStateLength] = {
0xA5, 0x66, 0x20, 0x01, 0x00, 0xC0, 0x20, 0x00, 0x0C};
irsend.sendRaw(rawData, 149, 38000);
irsend.makeDecodeResult();
ASSERT_TRUE(irrecv.decode(&irsend.capture));
ASSERT_EQ(HAIER_AC, irsend.capture.decode_type);
EXPECT_EQ(HAIER_AC_BITS, irsend.capture.bits);
EXPECT_EQ(kHaierACBits, irsend.capture.bits);
EXPECT_FALSE(irsend.capture.repeat);
EXPECT_STATE_EQ(expectedState, irsend.capture.state, irsend.capture.bits);
@@ -873,14 +873,14 @@ TEST(TestDecodeHaierAC, RealExample3) {
714, 550, 582, 550, 582, 578, 568, 552, 712, 552, 582, 550, 582, 550, 582,
550, 712, 550, 584, 550, 582, 552, 582, 578, 722, 552, 1704, 550, 582,
550, 1706, 550, 1862, 550, 1706, 550, 582, 550, 1704, 552, 582, 578};
uint8_t expectedState[HAIER_AC_STATE_LENGTH] = {
uint8_t expectedState[kHaierACStateLength] = {
0xA5, 0xEC, 0x20, 0x09, 0x20, 0xC0, 0x20, 0x00, 0xBA};
irsend.sendRaw(rawData, 149, 38000);
irsend.makeDecodeResult();
ASSERT_TRUE(irrecv.decode(&irsend.capture));
ASSERT_EQ(HAIER_AC, irsend.capture.decode_type);
EXPECT_EQ(HAIER_AC_BITS, irsend.capture.bits);
EXPECT_EQ(kHaierACBits, irsend.capture.bits);
EXPECT_FALSE(irsend.capture.repeat);
EXPECT_STATE_EQ(expectedState, irsend.capture.state, irsend.capture.bits);
@@ -898,7 +898,7 @@ TEST(TestDecodeHaierAC_YRW02, NormalDecode) {
IRrecv irrecv(0);
irsend.begin();
uint8_t expectedState[HAIER_AC_YRW02_STATE_LENGTH] = {
uint8_t expectedState[kHaierACYRW02StateLength] = {
0xA6, 0x12, 0x00, 0x02, 0x40, 0x20, 0x00,
0x20, 0x00, 0x00, 0x00, 0x00, 0x05, 0x3F};
@@ -907,7 +907,7 @@ TEST(TestDecodeHaierAC_YRW02, NormalDecode) {
irsend.makeDecodeResult();
ASSERT_TRUE(irrecv.decode(&irsend.capture));
EXPECT_EQ(HAIER_AC_YRW02, irsend.capture.decode_type);
EXPECT_EQ(HAIER_AC_YRW02_BITS, irsend.capture.bits);
EXPECT_EQ(kHaierACYRW02Bits, irsend.capture.bits);
EXPECT_FALSE(irsend.capture.repeat);
EXPECT_STATE_EQ(expectedState, irsend.capture.state, irsend.capture.bits);
}
@@ -937,7 +937,7 @@ TEST(TestDecodeHaierAC_YRW02, RealExample) {
540, 564, 522, 486, 590, 590, 538, 560, 524, 488, 588, 588, 1598, 514,
608, 564, 1600, 548, 536, 586, 538, 568, 1594, 590, 1618, 578, 1606, 606,
1582, 590, 1596, 590, 1616, 580};
uint8_t expectedState[HAIER_AC_YRW02_STATE_LENGTH] = {
uint8_t expectedState[kHaierACYRW02StateLength] = {
0xA6, 0x12, 0x00, 0x02, 0x40, 0x20, 0x00,
0x20, 0x00, 0x00, 0x00, 0x00, 0x05, 0x3F};
@@ -945,7 +945,7 @@ TEST(TestDecodeHaierAC_YRW02, RealExample) {
irsend.makeDecodeResult();
ASSERT_TRUE(irrecv.decode(&irsend.capture));
ASSERT_EQ(HAIER_AC_YRW02, irsend.capture.decode_type);
EXPECT_EQ(HAIER_AC_YRW02_BITS, irsend.capture.bits);
EXPECT_EQ(kHaierACYRW02Bits, irsend.capture.bits);
EXPECT_FALSE(irsend.capture.repeat);
EXPECT_STATE_EQ(expectedState, irsend.capture.state, irsend.capture.bits);

54
test/ir_Hitachi_test.cpp
View File

@@ -14,7 +14,7 @@ TEST(TestSendHitachiAC, SendData) {
IRsendTest irsend(0);
irsend.begin();
uint8_t hitachi_code[HITACHI_AC_STATE_LENGTH] = {
uint8_t hitachi_code[kHitachiAcStateLength] = {
0x80, 0x08, 0x0C, 0x02, 0xFD, 0x80, 0x7F, 0x88, 0x48, 0x80, 0x20, 0x04,
0x00, 0x80, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x80, 0x00, 0x00, 0xAC};
@@ -58,13 +58,13 @@ TEST(TestSendHitachiAC, SendWithRepeats) {
IRsendTest irsend(0);
irsend.begin();
uint8_t hitachi_code[HITACHI_AC_STATE_LENGTH] = {
uint8_t hitachi_code[kHitachiAcStateLength] = {
0x80, 0x08, 0x0C, 0x02, 0xFD, 0x80, 0x7F, 0x88, 0x48, 0x80, 0x20, 0x04,
0x00, 0x80, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x80, 0x00, 0x00, 0xAC};
irsend.reset();
irsend.sendHitachiAC(hitachi_code, HITACHI_AC_STATE_LENGTH, 1);
irsend.sendHitachiAC(hitachi_code, kHitachiAcStateLength, 1);
EXPECT_EQ(
"m3300s1700"
"m400s1250m400s500m400s500m400s500m400s500m400s500m400s500m400s500"
@@ -133,20 +133,20 @@ TEST(TestSendHitachiAC, SendUnexpectedSizes) {
IRsendTest irsend(0);
irsend.begin();
uint8_t hitachi_short_code[HITACHI_AC_STATE_LENGTH - 1] = {
uint8_t hitachi_short_code[kHitachiAcStateLength - 1] = {
0x80, 0x08, 0x0C, 0x02, 0xFD, 0x80, 0x7F, 0x88, 0x48, 0x80, 0x20, 0x04,
0x00, 0x80, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x80, 0x00, 0x00};
uint8_t hitachi_long_code[HITACHI_AC_STATE_LENGTH + 1] = {
uint8_t hitachi_long_code[kHitachiAcStateLength + 1] = {
0x80, 0x08, 0x0C, 0x02, 0xFD, 0x80, 0x7F, 0x88, 0x48, 0x80, 0x20, 0x04,
0x00, 0x80, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x80, 0x00, 0x00, 0xAC, 0xFF};
irsend.reset();
irsend.sendHitachiAC(hitachi_short_code, HITACHI_AC_STATE_LENGTH - 1);
irsend.sendHitachiAC(hitachi_short_code, kHitachiAcStateLength - 1);
ASSERT_EQ("", irsend.outputStr());
irsend.reset();
irsend.sendHitachiAC(hitachi_long_code, HITACHI_AC_STATE_LENGTH + 1);
irsend.sendHitachiAC(hitachi_long_code, kHitachiAcStateLength + 1);
ASSERT_EQ(
"m3300s1700"
"m400s1250m400s500m400s500m400s500m400s500m400s500m400s500m400s500"
@@ -189,7 +189,7 @@ TEST(TestDecodeHitachiAC, NormalSynthetic) {
IRrecv irrecv(0);
irsend.begin();
uint8_t hitachi_code[HITACHI_AC_STATE_LENGTH] = {
uint8_t hitachi_code[kHitachiAcStateLength] = {
0x80, 0x08, 0x0C, 0x02, 0xFD, 0x80, 0x7F, 0x88, 0x48, 0x80, 0x20, 0x04,
0x00, 0x80, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x80, 0x00, 0x00, 0xAC};
@@ -199,8 +199,8 @@ TEST(TestDecodeHitachiAC, NormalSynthetic) {
irsend.makeDecodeResult();
EXPECT_TRUE(irrecv.decode(&irsend.capture));
EXPECT_EQ(HITACHI_AC, irsend.capture.decode_type);
ASSERT_EQ(HITACHI_AC_BITS, irsend.capture.bits);
EXPECT_STATE_EQ(hitachi_code, irsend.capture.state, HITACHI_AC_BITS);
ASSERT_EQ(kHitachiAcBits, irsend.capture.bits);
EXPECT_STATE_EQ(hitachi_code, irsend.capture.state, kHitachiAcBits);
}
// Decode a 'real' HitachiAC message.
@@ -209,7 +209,7 @@ TEST(TestDecodeHitachiAC, NormalRealExample1) {
IRrecv irrecv(0);
irsend.begin();
uint8_t hitachi_code[HITACHI_AC_STATE_LENGTH] = {
uint8_t hitachi_code[kHitachiAcStateLength] = {
0x80, 0x08, 0x0C, 0x02, 0xFD, 0x80, 0x7F, 0x88, 0x48, 0x80, 0x20, 0x04,
0x00, 0x80, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x80, 0x00, 0x00, 0xAC};
@@ -255,8 +255,8 @@ TEST(TestDecodeHitachiAC, NormalRealExample1) {
irsend.makeDecodeResult();
EXPECT_TRUE(irrecv.decodeHitachiAC(&irsend.capture));
EXPECT_EQ(HITACHI_AC, irsend.capture.decode_type);
ASSERT_EQ(HITACHI_AC_BITS, irsend.capture.bits);
EXPECT_STATE_EQ(hitachi_code, irsend.capture.state, HITACHI_AC_BITS);
ASSERT_EQ(kHitachiAcBits, irsend.capture.bits);
EXPECT_STATE_EQ(hitachi_code, irsend.capture.state, kHitachiAcBits);
}
// Decode another 'real' HitachiAC message.
@@ -265,7 +265,7 @@ TEST(TestDecodeHitachiAC, NormalRealExample2) {
IRrecv irrecv(0);
irsend.begin();
uint8_t hitachi_code[HITACHI_AC_STATE_LENGTH] = {
uint8_t hitachi_code[kHitachiAcStateLength] = {
0x80, 0x08, 0x0C, 0x02, 0xFD, 0x80, 0x7F, 0x88, 0x48, 0x10, 0xC0, 0x02,
0x00, 0xA0, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x80, 0x00, 0x00, 0xD0};
@@ -311,8 +311,8 @@ TEST(TestDecodeHitachiAC, NormalRealExample2) {
irsend.makeDecodeResult();
EXPECT_TRUE(irrecv.decode(&irsend.capture));
EXPECT_EQ(HITACHI_AC, irsend.capture.decode_type);
ASSERT_EQ(HITACHI_AC_BITS, irsend.capture.bits);
EXPECT_STATE_EQ(hitachi_code, irsend.capture.state, HITACHI_AC_BITS);
ASSERT_EQ(kHitachiAcBits, irsend.capture.bits);
EXPECT_STATE_EQ(hitachi_code, irsend.capture.state, kHitachiAcBits);
}
// Tests for sendHitachiAC1().
@@ -322,7 +322,7 @@ TEST(TestSendHitachiAC1, SendData) {
IRsendTest irsend(0);
irsend.begin();
uint8_t hitachi_code[HITACHI_AC1_STATE_LENGTH] = {
uint8_t hitachi_code[kHitachiAc1StateLength] = {
0xB2, 0xAE, 0x4D, 0x51, 0xF0, 0x61, 0x84, 0x00, 0x00, 0x00, 0x00, 0x30,
0xB8};
irsend.reset();
@@ -351,7 +351,7 @@ TEST(TestDecodeHitachiAC1, NormalRealExample) {
IRrecv irrecv(0);
irsend.begin();
uint8_t hitachi_code[HITACHI_AC1_STATE_LENGTH] = {
uint8_t hitachi_code[kHitachiAc1StateLength] = {
0xB2, 0xAE, 0x4D, 0x51, 0xF0, 0x61, 0x84, 0x00, 0x00, 0x00, 0x00, 0x10,
0x98};
@@ -378,8 +378,8 @@ TEST(TestDecodeHitachiAC1, NormalRealExample) {
irsend.makeDecodeResult();
EXPECT_TRUE(irrecv.decode(&irsend.capture));
EXPECT_EQ(HITACHI_AC1, irsend.capture.decode_type);
ASSERT_EQ(HITACHI_AC1_BITS, irsend.capture.bits);
EXPECT_STATE_EQ(hitachi_code, irsend.capture.state, HITACHI_AC1_BITS);
ASSERT_EQ(kHitachiAc1Bits, irsend.capture.bits);
EXPECT_STATE_EQ(hitachi_code, irsend.capture.state, kHitachiAc1Bits);
}
@@ -390,7 +390,7 @@ TEST(TestSendHitachiAC2, SendData) {
IRsendTest irsend(0);
irsend.begin();
uint8_t hitachi_code[HITACHI_AC2_STATE_LENGTH] = {
uint8_t hitachi_code[kHitachiAc2StateLength] = {
0x80, 0x08, 0x00, 0x02, 0xFD, 0xFF, 0x00, 0x33, 0xCC, 0x49, 0xB6, 0x22,
0xDD, 0x01, 0xFE, 0x00, 0xFF, 0x00, 0xFF, 0x00, 0xFF, 0x00, 0xFF, 0x00,
0xFF, 0xCA, 0x35, 0x8F, 0x70, 0x00, 0xFF, 0x00, 0xFF, 0x01, 0xFE, 0xC0,
@@ -464,7 +464,7 @@ TEST(TestDecodeHitachiAC2, NormalSyntheticExample) {
irsend.begin();
// ON - 32c cool (fan auto)
uint8_t hitachi_code[HITACHI_AC2_STATE_LENGTH] = {
uint8_t hitachi_code[kHitachiAc2StateLength] = {
0x80, 0x08, 0x00, 0x02, 0xFD, 0xFF, 0x00, 0x33, 0xCC, 0x49, 0xB6, 0x22,
0xDD, 0x01, 0xFE, 0x00, 0xFF, 0x00, 0xFF, 0x00, 0xFF, 0x00, 0xFF, 0x00,
0xFF, 0xCA, 0x35, 0x8F, 0x70, 0x00, 0xFF, 0x00, 0xFF, 0x01, 0xFE, 0xC0,
@@ -476,8 +476,8 @@ TEST(TestDecodeHitachiAC2, NormalSyntheticExample) {
irsend.makeDecodeResult();
EXPECT_TRUE(irrecv.decode(&irsend.capture));
EXPECT_EQ(HITACHI_AC2, irsend.capture.decode_type);
ASSERT_EQ(HITACHI_AC2_BITS, irsend.capture.bits);
EXPECT_STATE_EQ(hitachi_code, irsend.capture.state, HITACHI_AC2_BITS);
ASSERT_EQ(kHitachiAc2Bits, irsend.capture.bits);
EXPECT_STATE_EQ(hitachi_code, irsend.capture.state, kHitachiAc2Bits);
}
// Decode a 'real' HitachiAC2 message.
@@ -486,7 +486,7 @@ TEST(TestDecodeHitachiAC2, NormalRealExample) {
IRrecv irrecv(0);
irsend.begin();
uint8_t hitachi_code[HITACHI_AC2_STATE_LENGTH] = {
uint8_t hitachi_code[kHitachiAc2StateLength] = {
0x80, 0x08, 0x00, 0x02, 0xFD, 0xFF, 0x00, 0x33, 0xCC, 0x49, 0xB6, 0x22,
0xDD, 0x01, 0xFE, 0x00, 0xFF, 0x00, 0xFF, 0x00, 0xFF, 0x00, 0xFF, 0x00,
0xFF, 0xCA, 0x35, 0x8F, 0x70, 0x00, 0xFF, 0x00, 0xFF, 0x01, 0xFE, 0xC0,
@@ -572,6 +572,6 @@ TEST(TestDecodeHitachiAC2, NormalRealExample) {
irsend.makeDecodeResult();
EXPECT_TRUE(irrecv.decode(&irsend.capture));
EXPECT_EQ(HITACHI_AC2, irsend.capture.decode_type);
ASSERT_EQ(HITACHI_AC2_BITS, irsend.capture.bits);
EXPECT_STATE_EQ(hitachi_code, irsend.capture.state, HITACHI_AC2_BITS);
ASSERT_EQ(kHitachiAc2Bits, irsend.capture.bits);
EXPECT_STATE_EQ(hitachi_code, irsend.capture.state, kHitachiAc2Bits);
}

46
test/ir_JVC_test.cpp
View File

@@ -26,7 +26,7 @@ TEST(TestSendJVC, SendWithRepeats) {
irsend.begin();
irsend.reset();
irsend.sendJVC(0xC2B8, JVC_BITS, 1); // 1 repeat.
irsend.sendJVC(0xC2B8, kJvcBits, 1); // 1 repeat.
EXPECT_EQ(
"m8400s4200"
"m525s1725m525s1725m525s525m525s525m525s525m525s525m525s1725m525s525"
@@ -35,7 +35,7 @@ TEST(TestSendJVC, SendWithRepeats) {
"m525s1725m525s1725m525s525m525s525m525s525m525s525m525s1725m525s525"
"m525s1725m525s525m525s1725m525s1725m525s1725m525s525m525s525m525s525"
"m525s34275", irsend.outputStr());
irsend.sendJVC(0xC2B8, JVC_BITS, 2); // 2 repeats.
irsend.sendJVC(0xC2B8, kJvcBits, 2); // 2 repeats.
EXPECT_EQ(
"m8400s4200"
"m525s1725m525s1725m525s525m525s525m525s525m525s525m525s1725m525s525"
@@ -100,9 +100,9 @@ TEST(TestDecodeJVC, NormalDecodeWithStrict) {
irsend.reset();
irsend.sendJVC(0xC2B8);
irsend.makeDecodeResult();
ASSERT_TRUE(irrecv.decodeJVC(&irsend.capture, JVC_BITS, true));
ASSERT_TRUE(irrecv.decodeJVC(&irsend.capture, kJvcBits, true));
EXPECT_EQ(JVC, irsend.capture.decode_type);
EXPECT_EQ(JVC_BITS, irsend.capture.bits);
EXPECT_EQ(kJvcBits, irsend.capture.bits);
EXPECT_EQ(0xC2B8, irsend.capture.value);
EXPECT_EQ(0x43, irsend.capture.address);
EXPECT_EQ(0x1D, irsend.capture.command);
@@ -112,9 +112,9 @@ TEST(TestDecodeJVC, NormalDecodeWithStrict) {
irsend.reset();
irsend.sendJVC(irsend.encodeJVC(0x07, 0x99));
irsend.makeDecodeResult();
ASSERT_TRUE(irrecv.decodeJVC(&irsend.capture, JVC_BITS, true));
ASSERT_TRUE(irrecv.decodeJVC(&irsend.capture, kJvcBits, true));
EXPECT_EQ(JVC, irsend.capture.decode_type);
EXPECT_EQ(JVC_BITS, irsend.capture.bits);
EXPECT_EQ(kJvcBits, irsend.capture.bits);
EXPECT_EQ(0xE099, irsend.capture.value);
EXPECT_EQ(0x07, irsend.capture.address);
EXPECT_EQ(0x99, irsend.capture.command);
@@ -124,9 +124,9 @@ TEST(TestDecodeJVC, NormalDecodeWithStrict) {
irsend.reset();
irsend.sendJVC(irsend.encodeJVC(0x1, 0x1));
irsend.makeDecodeResult();
ASSERT_TRUE(irrecv.decodeJVC(&irsend.capture, JVC_BITS, true));
ASSERT_TRUE(irrecv.decodeJVC(&irsend.capture, kJvcBits, true));
EXPECT_EQ(JVC, irsend.capture.decode_type);
EXPECT_EQ(JVC_BITS, irsend.capture.bits);
EXPECT_EQ(kJvcBits, irsend.capture.bits);
EXPECT_EQ(0x8080, irsend.capture.value);
EXPECT_EQ(0x1, irsend.capture.address);
EXPECT_EQ(0x1, irsend.capture.command);
@@ -141,27 +141,27 @@ TEST(TestDecodeJVC, NormalDecodeWithRepeatAndStrict) {
// Normal JVC 16-bit message with 2 repeats.
irsend.reset();
irsend.sendJVC(0xC2B8, JVC_BITS, 2);
irsend.sendJVC(0xC2B8, kJvcBits, 2);
irsend.makeDecodeResult();
ASSERT_TRUE(irrecv.decodeJVC(&irsend.capture, JVC_BITS, true));
ASSERT_TRUE(irrecv.decodeJVC(&irsend.capture, kJvcBits, true));
EXPECT_EQ(JVC, irsend.capture.decode_type);
EXPECT_EQ(JVC_BITS, irsend.capture.bits);
EXPECT_EQ(kJvcBits, irsend.capture.bits);
EXPECT_EQ(0xC2B8, irsend.capture.value);
EXPECT_EQ(0x43, irsend.capture.address);
EXPECT_EQ(0x1D, irsend.capture.command);
EXPECT_FALSE(irsend.capture.repeat);
irsend.makeDecodeResult(2 * JVC_BITS + 4);
ASSERT_TRUE(irrecv.decodeJVC(&irsend.capture, JVC_BITS, true));
irsend.makeDecodeResult(2 * kJvcBits + 4);
ASSERT_TRUE(irrecv.decodeJVC(&irsend.capture, kJvcBits, true));
EXPECT_EQ(JVC, irsend.capture.decode_type);
EXPECT_EQ(JVC_BITS, irsend.capture.bits);
EXPECT_EQ(kJvcBits, irsend.capture.bits);
EXPECT_EQ(0xC2B8, irsend.capture.value);
EXPECT_TRUE(irsend.capture.repeat);
irsend.makeDecodeResult(2 * JVC_BITS + 4 + 2 * JVC_BITS + 2);
ASSERT_TRUE(irrecv.decodeJVC(&irsend.capture, JVC_BITS, true));
irsend.makeDecodeResult(2 * kJvcBits + 4 + 2 * kJvcBits + 2);
ASSERT_TRUE(irrecv.decodeJVC(&irsend.capture, kJvcBits, true));
EXPECT_EQ(JVC, irsend.capture.decode_type);
EXPECT_EQ(JVC_BITS, irsend.capture.bits);
EXPECT_EQ(kJvcBits, irsend.capture.bits);
EXPECT_EQ(0xC2B8, irsend.capture.value);
EXPECT_TRUE(irsend.capture.repeat);
@@ -176,7 +176,7 @@ TEST(TestDecodeJVC, NormalDecodeWithRepeatAndStrict) {
ASSERT_TRUE(irrecv.decodeJVC(&irsend.capture));
EXPECT_EQ(JVC, irsend.capture.decode_type);
EXPECT_EQ(JVC_BITS, irsend.capture.bits);
EXPECT_EQ(kJvcBits, irsend.capture.bits);
EXPECT_EQ(0xC2B8, irsend.capture.value);
EXPECT_EQ(0x43, irsend.capture.address);
EXPECT_EQ(0x1D, irsend.capture.command);
@@ -193,7 +193,7 @@ TEST(TestDecodeJVC, DecodeWithNonStrictValues) {
irsend.sendJVC(0x0, 8); // Illegal value JVC 8-bit message.
irsend.makeDecodeResult();
// Should fail with strict on.
ASSERT_FALSE(irrecv.decodeJVC(&irsend.capture, JVC_BITS, true));
ASSERT_FALSE(irrecv.decodeJVC(&irsend.capture, kJvcBits, true));
// Should pass if strict off.
ASSERT_TRUE(irrecv.decodeJVC(&irsend.capture, 8, false));
EXPECT_EQ(JVC, irsend.capture.decode_type);
@@ -206,7 +206,7 @@ TEST(TestDecodeJVC, DecodeWithNonStrictValues) {
irsend.sendJVC(0x12345678, 32); // Illegal value JVC 32-bit message.
irsend.makeDecodeResult();
// Should not pass with strict when we ask for less bits than we got.
ASSERT_FALSE(irrecv.decodeJVC(&irsend.capture, JVC_BITS, true));
ASSERT_FALSE(irrecv.decodeJVC(&irsend.capture, kJvcBits, true));
irsend.makeDecodeResult();
// Should fail with strict when we ask for the wrong bit size.
@@ -225,7 +225,7 @@ TEST(TestDecodeJVC, DecodeWithNonStrictValues) {
irsend.makeDecodeResult();
// Shouldn't pass if strict off and the wrong expected bits.
ASSERT_FALSE(irrecv.decodeJVC(&irsend.capture, JVC_BITS, false));
ASSERT_FALSE(irrecv.decodeJVC(&irsend.capture, kJvcBits, false));
// Re-decode with correct bit size.
ASSERT_FALSE(irrecv.decodeJVC(&irsend.capture, 36, true));
@@ -273,7 +273,7 @@ TEST(TestDecodeJVC, DecodeGlobalCacheExample) {
ASSERT_TRUE(irrecv.decodeJVC(&irsend.capture));
EXPECT_EQ(JVC, irsend.capture.decode_type);
EXPECT_EQ(JVC_BITS, irsend.capture.bits);
EXPECT_EQ(kJvcBits, irsend.capture.bits);
EXPECT_EQ(0xC2B8, irsend.capture.value);
EXPECT_EQ(0x43, irsend.capture.address);
EXPECT_EQ(0x1D, irsend.capture.command);
@@ -295,5 +295,5 @@ TEST(TestDecodeJVC, FailToDecodeNonJVCExample) {
irsend.makeDecodeResult();
ASSERT_FALSE(irrecv.decodeJVC(&irsend.capture));
ASSERT_FALSE(irrecv.decodeJVC(&irsend.capture, JVC_BITS, false));
ASSERT_FALSE(irrecv.decodeJVC(&irsend.capture, kJvcBits, false));
}

96
test/ir_Kelvinator_test.cpp
View File

@@ -15,7 +15,7 @@ TEST(TestSendKelvinator, SendDataOnly) {
IRsendTest irsend(4);
irsend.begin();
uint8_t kelv_code[KELVINATOR_STATE_LENGTH] = {
uint8_t kelv_code[kKelvinatorStateLength] = {
0x19, 0x0B, 0x80, 0x50, 0x00, 0x00, 0x00, 0xE0,
0x19, 0x0B, 0x80, 0x70, 0x00, 0x00, 0x10, 0xf0};
irsend.reset();
@@ -53,12 +53,12 @@ TEST(TestSendKelvinator, SendWithRepeats) {
irsend.begin();
irsend.reset();
uint8_t kelv_code[KELVINATOR_STATE_LENGTH] = {
uint8_t kelv_code[kKelvinatorStateLength] = {
0x19, 0x0B, 0x80, 0x50, 0x00, 0x00, 0x00, 0xE0,
0x19, 0x0B, 0x80, 0x70, 0x00, 0x00, 0x10, 0xf0};
irsend.reset();
irsend.sendKelvinator(kelv_code, KELVINATOR_STATE_LENGTH, 1);
irsend.sendKelvinator(kelv_code, kKelvinatorStateLength, 1);
EXPECT_EQ(
"m9010s4505"
"m680s1530m680s510m680s510m680s1530m680s1530m680s510m680s510m680s510"
@@ -180,22 +180,22 @@ TEST(TestKelvinatorClass, Temperature) {
irkelv.begin();
irkelv.setTemp(0);
EXPECT_EQ(KELVINATOR_MIN_TEMP, irkelv.getTemp());
EXPECT_EQ(kKelvinatorMinTemp, irkelv.getTemp());
irkelv.setTemp(255);
EXPECT_EQ(KELVINATOR_MAX_TEMP, irkelv.getTemp());
EXPECT_EQ(kKelvinatorMaxTemp, irkelv.getTemp());
irkelv.setTemp(KELVINATOR_MIN_TEMP);
EXPECT_EQ(KELVINATOR_MIN_TEMP, irkelv.getTemp());
irkelv.setTemp(kKelvinatorMinTemp);
EXPECT_EQ(kKelvinatorMinTemp, irkelv.getTemp());
irkelv.setTemp(KELVINATOR_MAX_TEMP);
EXPECT_EQ(KELVINATOR_MAX_TEMP, irkelv.getTemp());
irkelv.setTemp(kKelvinatorMaxTemp);
EXPECT_EQ(kKelvinatorMaxTemp, irkelv.getTemp());
irkelv.setTemp(KELVINATOR_MIN_TEMP - 1);
EXPECT_EQ(KELVINATOR_MIN_TEMP, irkelv.getTemp());
irkelv.setTemp(kKelvinatorMinTemp - 1);
EXPECT_EQ(kKelvinatorMinTemp, irkelv.getTemp());
irkelv.setTemp(KELVINATOR_MAX_TEMP + 1);
EXPECT_EQ(KELVINATOR_MAX_TEMP, irkelv.getTemp());
irkelv.setTemp(kKelvinatorMaxTemp + 1);
EXPECT_EQ(kKelvinatorMaxTemp, irkelv.getTemp());
irkelv.setTemp(17);
EXPECT_EQ(17, irkelv.getTemp());
@@ -215,29 +215,29 @@ TEST(TestKelvinatorClass, OperatingMode) {
irkelv.begin();
irkelv.setTemp(24);
irkelv.setMode(KELVINATOR_AUTO);
EXPECT_EQ(KELVINATOR_AUTO, irkelv.getMode());
EXPECT_EQ(KELVINATOR_AUTO_TEMP, irkelv.getTemp());
irkelv.setMode(kKelvinatorAuto);
EXPECT_EQ(kKelvinatorAuto, irkelv.getMode());
EXPECT_EQ(kKelvinatorAutoTemp, irkelv.getTemp());
irkelv.setMode(KELVINATOR_COOL);
EXPECT_EQ(KELVINATOR_COOL, irkelv.getMode());
irkelv.setMode(kKelvinatorCool);
EXPECT_EQ(kKelvinatorCool, irkelv.getMode());
irkelv.setMode(KELVINATOR_HEAT);
EXPECT_EQ(KELVINATOR_HEAT, irkelv.getMode());
irkelv.setMode(kKelvinatorHeat);
EXPECT_EQ(kKelvinatorHeat, irkelv.getMode());
irkelv.setTemp(24);
irkelv.setMode(KELVINATOR_DRY);
EXPECT_EQ(KELVINATOR_DRY, irkelv.getMode());
EXPECT_EQ(KELVINATOR_AUTO_TEMP, irkelv.getTemp());
irkelv.setMode(kKelvinatorDry);
EXPECT_EQ(kKelvinatorDry, irkelv.getMode());
EXPECT_EQ(kKelvinatorAutoTemp, irkelv.getTemp());
irkelv.setMode(KELVINATOR_FAN);
EXPECT_EQ(KELVINATOR_FAN, irkelv.getMode());
irkelv.setMode(kKelvinatorFan);
EXPECT_EQ(kKelvinatorFan, irkelv.getMode());
irkelv.setMode(KELVINATOR_HEAT + 1);
EXPECT_EQ(KELVINATOR_AUTO, irkelv.getMode());
irkelv.setMode(kKelvinatorHeat + 1);
EXPECT_EQ(kKelvinatorAuto, irkelv.getMode());
irkelv.setMode(255);
EXPECT_EQ(KELVINATOR_AUTO, irkelv.getMode());
EXPECT_EQ(kKelvinatorAuto, irkelv.getMode());
}
TEST(TestKelvinatorClass, VaneSwing) {
@@ -352,16 +352,16 @@ TEST(TestKelvinatorClass, FanSpeed) {
EXPECT_EQ(0, irkelv.getFan());
irkelv.setFan(255);
EXPECT_EQ(KELVINATOR_FAN_MAX, irkelv.getFan());
EXPECT_EQ(kKelvinatorFanMax, irkelv.getFan());
irkelv.setFan(KELVINATOR_FAN_MAX);
EXPECT_EQ(KELVINATOR_FAN_MAX, irkelv.getFan());
irkelv.setFan(kKelvinatorFanMax);
EXPECT_EQ(kKelvinatorFanMax, irkelv.getFan());
irkelv.setFan(KELVINATOR_FAN_MAX + 1);
EXPECT_EQ(KELVINATOR_FAN_MAX, irkelv.getFan());
irkelv.setFan(kKelvinatorFanMax + 1);
EXPECT_EQ(kKelvinatorFanMax, irkelv.getFan());
irkelv.setFan(KELVINATOR_FAN_MAX - 1);
EXPECT_EQ(KELVINATOR_FAN_MAX - 1, irkelv.getFan());
irkelv.setFan(kKelvinatorFanMax - 1);
EXPECT_EQ(kKelvinatorFanMax - 1, irkelv.getFan());
irkelv.setFan(1);
EXPECT_EQ(1, irkelv.getFan());
@@ -374,7 +374,7 @@ TEST(TestKelvinatorClass, FanSpeed) {
}
TEST(TestKelvinatorClass, Checksums) {
uint8_t kelv_code[KELVINATOR_STATE_LENGTH] = {
uint8_t kelv_code[kKelvinatorStateLength] = {
0x19, 0x0B, 0x80, 0x50, 0x00, 0x00, 0x00, 0xE0,
0x19, 0x0B, 0x80, 0x70, 0x00, 0x00, 0x10, 0xf0};
@@ -396,21 +396,21 @@ TEST(TestKelvinatorClass, Checksums) {
TEST(TestKelvinatorClass, SetAndGetRaw) {
IRKelvinatorAC irkelv(0);
uint8_t initialState[KELVINATOR_STATE_LENGTH] = {
uint8_t initialState[kKelvinatorStateLength] = {
0x00, 0x00, 0x00, 0x50, 0x00, 0x00, 0x00, 0xA0,
0x00, 0x00, 0x00, 0x70, 0x00, 0x00, 0x00, 0xA0};
uint8_t expectedState[KELVINATOR_STATE_LENGTH] = {
uint8_t expectedState[kKelvinatorStateLength] = {
0x08, 0x05, 0x20, 0x50, 0x00, 0x00, 0x00, 0x70,
0x08, 0x05, 0x20, 0x70, 0x00, 0x00, 0x00, 0x70};
EXPECT_STATE_EQ(initialState, irkelv.getRaw(), KELVINATOR_BITS);
EXPECT_STATE_EQ(initialState, irkelv.getRaw(), kKelvinatorBits);
// toggle the power state.
irkelv.setPower(!irkelv.getPower());
irkelv.setTemp(21);
irkelv.setLight(true);
EXPECT_STATE_EQ(expectedState, irkelv.getRaw(), KELVINATOR_BITS);
EXPECT_STATE_EQ(expectedState, irkelv.getRaw(), kKelvinatorBits);
irkelv.setRaw(initialState);
EXPECT_STATE_EQ(initialState, irkelv.getRaw(), KELVINATOR_BITS);
EXPECT_STATE_EQ(initialState, irkelv.getRaw(), kKelvinatorBits);
}
TEST(TestKelvinatorClass, HumanReadable) {
@@ -421,9 +421,9 @@ TEST(TestKelvinatorClass, HumanReadable) {
"Swing (Horizontal): Off, Swing (Vertical): Off",
irkelv.toString());
irkelv.on();
irkelv.setMode(KELVINATOR_COOL);
irkelv.setMode(kKelvinatorCool);
irkelv.setTemp(25);
irkelv.setFan(KELVINATOR_FAN_MAX);
irkelv.setFan(kKelvinatorFanMax);
irkelv.setXFan(true);
irkelv.setIonFilter(true);
irkelv.setLight(true);
@@ -441,7 +441,7 @@ TEST(TestKelvinatorClass, MessageConstuction) {
irsend.begin();
irkelv.setFan(1);
irkelv.setMode(KELVINATOR_COOL);
irkelv.setMode(kKelvinatorCool);
irkelv.setTemp(27);
irkelv.setSwingVertical(false);
irkelv.setSwingHorizontal(true);
@@ -454,7 +454,7 @@ TEST(TestKelvinatorClass, MessageConstuction) {
// Check everything for kicks.
EXPECT_EQ(1, irkelv.getFan());
EXPECT_EQ(KELVINATOR_COOL, irkelv.getMode());
EXPECT_EQ(kKelvinatorCool, irkelv.getMode());
EXPECT_EQ(27, irkelv.getTemp());
EXPECT_FALSE(irkelv.getSwingVertical());
EXPECT_TRUE(irkelv.getSwingHorizontal());
@@ -500,7 +500,7 @@ TEST(TestDecodeKelvinator, NormalSynthetic) {
IRrecv irrecv(4);
irsend.begin();
uint8_t kelv_code[KELVINATOR_STATE_LENGTH] = {
uint8_t kelv_code[kKelvinatorStateLength] = {
0x19, 0x0B, 0x80, 0x50, 0x00, 0x00, 0x00, 0xE0,
0x19, 0x0B, 0x80, 0x70, 0x00, 0x00, 0x10, 0xf0};
irsend.reset();
@@ -508,6 +508,6 @@ TEST(TestDecodeKelvinator, NormalSynthetic) {
irsend.makeDecodeResult();
EXPECT_TRUE(irrecv.decode(&irsend.capture));
EXPECT_EQ(KELVINATOR, irsend.capture.decode_type);
ASSERT_EQ(KELVINATOR_BITS, irsend.capture.bits);
EXPECT_STATE_EQ(kelv_code, irsend.capture.state, KELVINATOR_BITS);
ASSERT_EQ(kKelvinatorBits, irsend.capture.bits);
EXPECT_STATE_EQ(kelv_code, irsend.capture.state, kKelvinatorBits);
}

84
test/ir_LG_test.cpp
View File

@@ -38,7 +38,7 @@ TEST(TestSendLG, SendDataOnly) {
"m550s50300", irsend.outputStr());
irsend.reset();
irsend.sendLG(0xB4B4AE51, LG32_BITS);
irsend.sendLG(0xB4B4AE51, kLg32Bits);
EXPECT_EQ(
"m4480s4480"
"m560s1680m560s560m560s1680m560s1680m560s560m560s1680m560s560m560s560"
@@ -55,7 +55,7 @@ TEST(TestSendLG, SendWithRepeats) {
irsend.begin();
irsend.reset();
irsend.sendLG(0x4B4AE51, LG_BITS, 1);
irsend.sendLG(0x4B4AE51, kLgBits, 1);
EXPECT_EQ(
"m8500s4250"
"m550s550m550s1600m550s550m550s550"
@@ -66,7 +66,7 @@ TEST(TestSendLG, SendWithRepeats) {
"m8500s2250m550s96750", irsend.outputStr());
irsend.reset();
irsend.sendLG(0xB4B4AE51, LG32_BITS, 1);
irsend.sendLG(0xB4B4AE51, kLg32Bits, 1);
EXPECT_EQ(
"m4480s4480"
"m560s1680m560s560m560s1680m560s1680m560s560m560s1680m560s560m560s560"
@@ -132,11 +132,11 @@ TEST(TestDecodeLG, NormalDecodeWithStrict) {
// Normal LG 28-bit message.
irsend.reset();
irsend.sendLG(0x4B4AE51, LG_BITS);
irsend.sendLG(0x4B4AE51, kLgBits);
irsend.makeDecodeResult();
ASSERT_TRUE(irrecv.decodeLG(&irsend.capture, LG_BITS, true));
ASSERT_TRUE(irrecv.decodeLG(&irsend.capture, kLgBits, true));
EXPECT_EQ(LG, irsend.capture.decode_type);
EXPECT_EQ(LG_BITS, irsend.capture.bits);
EXPECT_EQ(kLgBits, irsend.capture.bits);
EXPECT_EQ(0x4B4AE51, irsend.capture.value);
EXPECT_EQ(0x4B, irsend.capture.address);
EXPECT_EQ(0x4AE5, irsend.capture.command);
@@ -144,11 +144,11 @@ TEST(TestDecodeLG, NormalDecodeWithStrict) {
// Normal LG 32-bit message.
irsend.reset();
irsend.sendLG(0xB4B4AE51, LG32_BITS);
irsend.sendLG(0xB4B4AE51, kLg32Bits);
irsend.makeDecodeResult();
ASSERT_TRUE(irrecv.decodeLG(&irsend.capture, LG32_BITS, false));
ASSERT_TRUE(irrecv.decodeLG(&irsend.capture, kLg32Bits, false));
EXPECT_EQ(LG, irsend.capture.decode_type);
EXPECT_EQ(LG32_BITS, irsend.capture.bits);
EXPECT_EQ(kLg32Bits, irsend.capture.bits);
EXPECT_EQ(0xB4B4AE51, irsend.capture.value);
EXPECT_EQ(0xB4B, irsend.capture.address);
EXPECT_EQ(0x4AE5, irsend.capture.command);
@@ -158,9 +158,9 @@ TEST(TestDecodeLG, NormalDecodeWithStrict) {
irsend.reset();
irsend.sendLG(irsend.encodeLG(0x07, 0x99));
irsend.makeDecodeResult();
ASSERT_TRUE(irrecv.decodeLG(&irsend.capture, LG_BITS, true));
ASSERT_TRUE(irrecv.decodeLG(&irsend.capture, kLgBits, true));
EXPECT_EQ(LG, irsend.capture.decode_type);
EXPECT_EQ(LG_BITS, irsend.capture.bits);
EXPECT_EQ(kLgBits, irsend.capture.bits);
EXPECT_EQ(0x700992, irsend.capture.value);
EXPECT_EQ(0x07, irsend.capture.address);
EXPECT_EQ(0x99, irsend.capture.command);
@@ -168,11 +168,11 @@ TEST(TestDecodeLG, NormalDecodeWithStrict) {
// Synthesised Normal LG 32-bit message.
irsend.reset();
irsend.sendLG(irsend.encodeLG(0x800, 0x8000), LG32_BITS);
irsend.sendLG(irsend.encodeLG(0x800, 0x8000), kLg32Bits);
irsend.makeDecodeResult();
ASSERT_TRUE(irrecv.decodeLG(&irsend.capture, LG32_BITS, true));
ASSERT_TRUE(irrecv.decodeLG(&irsend.capture, kLg32Bits, true));
EXPECT_EQ(LG, irsend.capture.decode_type);
EXPECT_EQ(LG32_BITS, irsend.capture.bits);
EXPECT_EQ(kLg32Bits, irsend.capture.bits);
EXPECT_EQ(0x80080008, irsend.capture.value);
EXPECT_EQ(0x800, irsend.capture.address);
EXPECT_EQ(0x8000, irsend.capture.command);
@@ -187,11 +187,11 @@ TEST(TestDecodeLG, NormalDecodeWithRepeatAndStrict) {
// Normal LG 28-bit message with 2 repeats.
irsend.reset();
irsend.sendLG(irsend.encodeLG(0x07, 0x99), LG_BITS, 2);
irsend.sendLG(irsend.encodeLG(0x07, 0x99), kLgBits, 2);
irsend.makeDecodeResult();
ASSERT_TRUE(irrecv.decodeLG(&irsend.capture, LG_BITS, true));
ASSERT_TRUE(irrecv.decodeLG(&irsend.capture, kLgBits, true));
EXPECT_EQ(LG, irsend.capture.decode_type);
EXPECT_EQ(LG_BITS, irsend.capture.bits);
EXPECT_EQ(kLgBits, irsend.capture.bits);
EXPECT_EQ(0x700992, irsend.capture.value);
EXPECT_EQ(0x07, irsend.capture.address);
EXPECT_EQ(0x99, irsend.capture.command);
@@ -199,11 +199,11 @@ TEST(TestDecodeLG, NormalDecodeWithRepeatAndStrict) {
// Normal LG 32-bit message with 2 repeats.
irsend.reset();
irsend.sendLG(irsend.encodeLG(0x07, 0x99), LG32_BITS, 2);
irsend.sendLG(irsend.encodeLG(0x07, 0x99), kLg32Bits, 2);
irsend.makeDecodeResult();
ASSERT_TRUE(irrecv.decodeLG(&irsend.capture, LG32_BITS, true));
ASSERT_TRUE(irrecv.decodeLG(&irsend.capture, kLg32Bits, true));
EXPECT_EQ(LG, irsend.capture.decode_type);
EXPECT_EQ(LG32_BITS, irsend.capture.bits);
EXPECT_EQ(kLg32Bits, irsend.capture.bits);
EXPECT_EQ(0x700992, irsend.capture.value);
EXPECT_EQ(0x07, irsend.capture.address);
EXPECT_EQ(0x99, irsend.capture.command);
@@ -221,30 +221,30 @@ TEST(TestDecodeLG, DecodeWithNonStrictValues) {
irsend.reset();
irsend.sendLG(0x1);
irsend.makeDecodeResult();
ASSERT_FALSE(irrecv.decodeLG(&irsend.capture, LG_BITS, true));
ASSERT_FALSE(irrecv.decodeLG(&irsend.capture, LG32_BITS, true));
ASSERT_FALSE(irrecv.decodeLG(&irsend.capture, LG32_BITS, false));
ASSERT_TRUE(irrecv.decodeLG(&irsend.capture, LG_BITS, false));
ASSERT_FALSE(irrecv.decodeLG(&irsend.capture, kLgBits, true));
ASSERT_FALSE(irrecv.decodeLG(&irsend.capture, kLg32Bits, true));
ASSERT_FALSE(irrecv.decodeLG(&irsend.capture, kLg32Bits, false));
ASSERT_TRUE(irrecv.decodeLG(&irsend.capture, kLgBits, false));
// Illegal LG 32-bit message value.
irsend.reset();
irsend.sendLG(0x1111111, LG32_BITS);
irsend.sendLG(0x1111111, kLg32Bits);
irsend.makeDecodeResult();
ASSERT_FALSE(irrecv.decodeLG(&irsend.capture, LG32_BITS, true));
ASSERT_FALSE(irrecv.decodeLG(&irsend.capture, LG_BITS, true));
ASSERT_FALSE(irrecv.decodeLG(&irsend.capture, kLg32Bits, true));
ASSERT_FALSE(irrecv.decodeLG(&irsend.capture, kLgBits, true));
ASSERT_TRUE(irrecv.decodeLG(&irsend.capture, LG32_BITS, false));
ASSERT_TRUE(irrecv.decodeLG(&irsend.capture, kLg32Bits, false));
EXPECT_EQ(LG, irsend.capture.decode_type);
EXPECT_EQ(LG32_BITS, irsend.capture.bits);
EXPECT_EQ(kLg32Bits, irsend.capture.bits);
EXPECT_EQ(0x1111111, irsend.capture.value);
EXPECT_EQ(0x11, irsend.capture.address);
EXPECT_EQ(0x1111, irsend.capture.command);
EXPECT_FALSE(irsend.capture.repeat);
irsend.reset();
irsend.sendLG(0x1111111, LG32_BITS);
irsend.sendLG(0x1111111, kLg32Bits);
irsend.makeDecodeResult();
ASSERT_FALSE(irrecv.decodeLG(&irsend.capture, LG_BITS, false));
ASSERT_FALSE(irrecv.decodeLG(&irsend.capture, kLgBits, false));
}
// Decode unsupported LG message sizes.
@@ -259,10 +259,10 @@ TEST(TestDecodeLG, DecodeWithNonStrictSizes) {
irsend.sendLG(irsend.encodeLG(0x07, 0x99), 16);
irsend.makeDecodeResult();
// Should fail when unexpected against different bit sizes.
ASSERT_FALSE(irrecv.decodeLG(&irsend.capture, LG_BITS, true));
ASSERT_FALSE(irrecv.decodeLG(&irsend.capture, LG32_BITS, true));
ASSERT_FALSE(irrecv.decodeLG(&irsend.capture, LG_BITS, false));
ASSERT_FALSE(irrecv.decodeLG(&irsend.capture, LG32_BITS, false));
ASSERT_FALSE(irrecv.decodeLG(&irsend.capture, kLgBits, true));
ASSERT_FALSE(irrecv.decodeLG(&irsend.capture, kLg32Bits, true));
ASSERT_FALSE(irrecv.decodeLG(&irsend.capture, kLgBits, false));
ASSERT_FALSE(irrecv.decodeLG(&irsend.capture, kLg32Bits, false));
// Should pass if strict off.
ASSERT_TRUE(irrecv.decodeLG(&irsend.capture, 16, false));
@@ -277,10 +277,10 @@ TEST(TestDecodeLG, DecodeWithNonStrictSizes) {
irsend.sendLG(0x123456789, 36); // Illegal value LG 36-bit message.
irsend.makeDecodeResult();
// Should fail when unexpected against different bit sizes.
ASSERT_FALSE(irrecv.decodeLG(&irsend.capture, LG_BITS, true));
ASSERT_FALSE(irrecv.decodeLG(&irsend.capture, LG_BITS, false));
ASSERT_FALSE(irrecv.decodeLG(&irsend.capture, LG32_BITS, true));
ASSERT_FALSE(irrecv.decodeLG(&irsend.capture, LG32_BITS, false));
ASSERT_FALSE(irrecv.decodeLG(&irsend.capture, kLgBits, true));
ASSERT_FALSE(irrecv.decodeLG(&irsend.capture, kLgBits, false));
ASSERT_FALSE(irrecv.decodeLG(&irsend.capture, kLg32Bits, true));
ASSERT_FALSE(irrecv.decodeLG(&irsend.capture, kLg32Bits, false));
ASSERT_TRUE(irrecv.decodeLG(&irsend.capture, 36, false));
EXPECT_EQ(LG, irsend.capture.decode_type);
@@ -330,9 +330,9 @@ TEST(TestDecodeLG, DecodeGlobalCacheExample) {
irsend.sendGC(gc_test, 75);
irsend.makeDecodeResult();
ASSERT_TRUE(irrecv.decodeLG(&irsend.capture, LG32_BITS, true));
ASSERT_TRUE(irrecv.decodeLG(&irsend.capture, kLg32Bits, true));
EXPECT_EQ(LG, irsend.capture.decode_type);
EXPECT_EQ(LG32_BITS, irsend.capture.bits);
EXPECT_EQ(kLg32Bits, irsend.capture.bits);
EXPECT_EQ(0xB4B4AE51, irsend.capture.value);
EXPECT_EQ(0xB4B, irsend.capture.address);
EXPECT_EQ(0x4AE5, irsend.capture.command);
@@ -354,5 +354,5 @@ TEST(TestDecodeLG, FailToDecodeNonLGExample) {
irsend.makeDecodeResult();
ASSERT_FALSE(irrecv.decodeLG(&irsend.capture));
ASSERT_FALSE(irrecv.decodeLG(&irsend.capture, LG_BITS, false));
ASSERT_FALSE(irrecv.decodeLG(&irsend.capture, kLgBits, false));
}

Some files were not shown because too many files have changed in this diff Show More