Theaninova/Arduino-IRremote
1
0
Fork 0
mirror of https://github.com/Theaninova/Arduino-IRremote.git synced 2026-01-08 14:12:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed some syntax errors mentioned by @crash7 and also added Aiwa decoding to the changelog

Browse Source
This commit is contained in:
Rafi Khan
2015-03-09 15:47:31 -06:00
parent 74622ec776
commit 0096727887
3 changed files with 1 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
IRremote.cpp
View File

@@ -631,7 +631,6 @@ long IRrecv::decodeSony(decode_results *results) {
return DECODED; return DECODED;
} }
<<<<<<< HEAD
long IRrecv::decodeWhynter(decode_results *results) { long IRrecv::decodeWhynter(decode_results *results) {
long data = 0; long data = 0;

1
IRremote.h
View File

@@ -55,7 +55,6 @@ public:
#define WHYNTER 13 #define WHYNTER 13
#define Sharp 14 #define Sharp 14
#define AIWA_RC_T501 15 #define AIWA_RC_T501 15
>>>>>>> crash7-master
#define UNKNOWN -1 #define UNKNOWN -1
// Decoded value for NEC when a repeat code is received // Decoded value for NEC when a repeat code is received

1
changelog.md
View File

@@ -5,3 +5,4 @@ This project adheres to [Semantic Versioning](http://semver.org/).
## [1.0.1] - 2015-03-08 ## [1.0.1] - 2015-03-08
### Added ### Added
- Support for Sharp Decoding - Support for Sharp Decoding
- Support for Aiwa Decoding