Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

NECext Support, Fix Protocols #635

Merged
merged 7 commits into from
Dec 31, 2024
Merged

NECext Support, Fix Protocols #635

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
6b9455a
fix(custom_ir.cpp): fix Samsung protocol
Lamnxzp Dec 30, 2024
bbdb636
fix(custom_ir.cpp): some adjustments
Lamnxzp Dec 30, 2024
799e1a3
feat(custom_ir.cpp): NECext protocol
Lamnxzp Dec 30, 2024
59de01b
chore(custom_ir.cpp): update comment
Lamnxzp Dec 30, 2024
3848ec6
fix(custom_ir.cpp): some adjustments
Lamnxzp Dec 30, 2024
fc6eba5
docs(README.md): removed NEC42 (not supported)
Lamnxzp Dec 30, 2024
533dd70
chore: clean up unnecessary logging
Lamnxzp Dec 30, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,7 @@ Also, [read our FAQ](https://github.com/pr3y/Bruce/wiki/FAQ)

- [x] TV-B-Gone
- [x] IR Receiver
- [x] [Custom IR (NEC, NEC42, NECExt, SIRC, SIRC15, SIRC20, Samsung32, RC5, RC5X, RC6)](https://github.com/pr3y/Bruce/wiki/IR#replay-payloads-like-flipper)
- [x] [Custom IR (NEC, NECext, SIRC, SIRC15, SIRC20, Samsung32, RC5, RC5X, RC6)](https://github.com/pr3y/Bruce/wiki/IR#replay-payloads-like-flipper)
- [x] Config
- [X] Ir TX Pin
- [X] Ir RX Pin
Expand Down
86 changes: 56 additions & 30 deletions src/modules/ir/custom_ir.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -168,17 +168,20 @@ bool txIrFile(FS *fs, String filepath) {
bits.trim();
Serial.println("bits: "+bits);
} else if (line.indexOf("#") != -1) { // TODO: also detect EOF
if (protocol.startsWith("NEC")) {
// https://developer.flipper.net/flipperzero/doxygen/infrared_file_format.html
if (protocol=="NEC") {
sendNECCommand(address, command);
} else if (protocol.startsWith("RC5")) {
} else if (protocol=="NECext") {
sendNECextCommand(address, command);
} else if (protocol=="RC5"||protocol=="RC5X") {
sendRC5Command(address, command);
} else if (protocol.startsWith("RC6")) {
} else if (protocol=="RC6") {
sendRC6Command(address, command);
} else if (protocol.startsWith("Samsung")) {
} else if (protocol=="Samsung32") {
sendSamsungCommand(address, command);
} else if (protocol.startsWith("SIRC")) {
sendSonyCommand(address, command);
} else if (protocol.startsWith("Panasonic")) {
} else if (protocol=="Kaseikyo"||protocol=="Panasonic") {
sendPanasonicCommand(address, command);
} else if (protocol!="" && value!="") {
sendDecodedCommand(protocol, value, bits);
Expand Down Expand Up @@ -247,12 +250,15 @@ void otherIRcodes() {

if(fs == NULL) { // recent menu was selected
if(selected_code.filepath!="") { // a code was selected, switch on code type
// https://developer.flipper.net/flipperzero/doxygen/infrared_file_format.html
if(selected_code.type=="raw") sendRawCommand(selected_code.frequency, selected_code.data);
else if(selected_code.protocol.startsWith("NEC")) sendNECCommand(selected_code.address, selected_code.command);
else if(selected_code.protocol=="RC5") sendRC5Command(selected_code.address, selected_code.command);
else if(selected_code.protocol=="NEC") sendNECCommand(selected_code.address, selected_code.command);
else if(selected_code.protocol=="NECext") sendNECextCommand(selected_code.address, selected_code.command);
else if(selected_code.protocol=="RC5"||selected_code.protocol=="RC5X") sendRC5Command(selected_code.address, selected_code.command);
else if(selected_code.protocol=="RC6") sendRC6Command(selected_code.address, selected_code.command);
else if(selected_code.protocol.startsWith("Samsung")) sendSamsungCommand(selected_code.address, selected_code.command);
else if(selected_code.protocol=="Samsung32") sendSamsungCommand(selected_code.address, selected_code.command);
else if(selected_code.protocol.startsWith("SIRC")) sendSonyCommand(selected_code.address, selected_code.command);
else if(selected_code.protocol=="Kaseikyo"||selected_code.protocol=="Panasonic") sendPanasonicCommand(selected_code.address, selected_code.command);
else if(selected_code.protocol!="") sendDecodedCommand(selected_code.protocol, selected_code.data);
}
return;
Expand Down Expand Up @@ -323,13 +329,15 @@ void otherIRcodes() {
options = { };
bool exit = false;
for(int i=0; i<=total_codes; i++) {
// https://developer.flipper.net/flipperzero/doxygen/infrared_file_format.html
if(codes[i].type=="raw") options.push_back({ codes[i].name.c_str(), [=](){ sendRawCommand(codes[i].frequency, codes[i].data); addToRecentCodes(codes[i]); }});
else if(codes[i].protocol.startsWith("NEC")) options.push_back({ codes[i].name.c_str(), [=](){ sendNECCommand(codes[i].address, codes[i].command); addToRecentCodes(codes[i]); }});
else if(codes[i].protocol.startsWith("RC5")) options.push_back({ codes[i].name.c_str(), [=](){ sendRC5Command(codes[i].address, codes[i].command); addToRecentCodes(codes[i]); }});
else if(codes[i].protocol.startsWith("RC6")) options.push_back({ codes[i].name.c_str(), [=](){ sendRC6Command(codes[i].address, codes[i].command); addToRecentCodes(codes[i]); }});
else if(codes[i].protocol.startsWith("Samsung")) options.push_back({ codes[i].name.c_str(), [=](){ sendSamsungCommand(codes[i].address, codes[i].command); addToRecentCodes(codes[i]); }});
else if(codes[i].protocol=="NEC") options.push_back({ codes[i].name.c_str(), [=](){ sendNECCommand(codes[i].address, codes[i].command); addToRecentCodes(codes[i]); }});
else if(codes[i].protocol=="NECext") options.push_back({ codes[i].name.c_str(), [=](){ sendNECextCommand(codes[i].address, codes[i].command); addToRecentCodes(codes[i]); }});
else if(codes[i].protocol=="RC5"||codes[i].protocol=="RC5X") options.push_back({ codes[i].name.c_str(), [=](){ sendRC5Command(codes[i].address, codes[i].command); addToRecentCodes(codes[i]); }});
else if(codes[i].protocol=="RC6") options.push_back({ codes[i].name.c_str(), [=](){ sendRC6Command(codes[i].address, codes[i].command); addToRecentCodes(codes[i]); }});
else if(codes[i].protocol=="Samsung32") options.push_back({ codes[i].name.c_str(), [=](){ sendSamsungCommand(codes[i].address, codes[i].command); addToRecentCodes(codes[i]); }});
else if(codes[i].protocol.startsWith("SIRC")) options.push_back({ codes[i].name.c_str(), [=](){ sendSonyCommand(codes[i].address, codes[i].command); addToRecentCodes(codes[i]); }});
else if(codes[i].protocol=="Panasonic") options.push_back({ codes[i].name.c_str(), [=](){ sendPanasonicCommand(codes[i].address, codes[i].command); addToRecentCodes(codes[i]); }});
else if(codes[i].protocol=="Kaseikyo"||codes[i].protocol=="Panasonic") options.push_back({ codes[i].name.c_str(), [=](){ sendPanasonicCommand(codes[i].address, codes[i].command); addToRecentCodes(codes[i]); }});
else if(codes[i].protocol!="" && codes[i].data!="") options.push_back({ codes[i].name.c_str(), [=](){ sendDecodedCommand(codes[i].protocol, codes[i].data); addToRecentCodes(codes[i]); }});
}
options.push_back({ "Main Menu" , [&](){ exit=true; }});
Expand All @@ -346,24 +354,46 @@ void otherIRcodes() {
} // end of otherIRcodes


//IR commands
// IR commands
void sendNECCommand(String address, String command) {
IRsend irsend(bruceConfig.irTx); // Set the GPIO to be used to sending the message.
irsend.begin();
displaySomething("Sending..");
uint16_t addressValue = strtoul(address.substring(0,2).c_str(), nullptr, 16);
uint16_t commandValue = strtoul(command.substring(0,2).c_str(), nullptr, 16);
uint64_t data = irsend.encodeNEC(addressValue, commandValue);
irsend.sendNEC(data, 32);
Serial.println("Sent NEC Command");
digitalWrite(bruceConfig.irTx, LED_OFF);
}

void sendNECextCommand(String address, String command) {
IRsend irsend(bruceConfig.irTx); // Set the GPIO to be used to sending the message.
irsend.begin();
displaySomething("Sending..");

uint8_t first_zero_byte_pos = address.indexOf("00", 2);
if(first_zero_byte_pos!=-1) address = address.substring(0, first_zero_byte_pos);
first_zero_byte_pos = command.indexOf("00", 2);
if(first_zero_byte_pos!=-1) command = command.substring(0, first_zero_byte_pos);

address.replace(" ", "");
command.replace(" ", "");

uint16_t addressValue = strtoul(address.c_str(), nullptr, 16);
uint16_t commandValue = strtoul(command.c_str(), nullptr, 16);
uint64_t data = irsend.encodeNEC(addressValue, commandValue);
irsend.sendNEC(data, 32, 10);
Serial.println("Sent NEC Command");

// Invert Endianness
uint16_t newAddress = (addressValue >> 8) | (addressValue << 8);
uint16_t newCommand = (commandValue >> 8) | (commandValue << 8);

// NEC protocol bit order is LSB first
uint16_t lsbAddress = reverseBits(newAddress, 16);
uint16_t lsbCommand = reverseBits(newCommand, 16);

uint32_t data = ((uint32_t)lsbAddress << 16) | lsbCommand;
irsend.sendNEC(data, 32); // Sends MSB first
Serial.println("Sent NECext Command");
digitalWrite(bruceConfig.irTx, LED_OFF);
}

Expand All @@ -374,7 +404,7 @@ void sendRC5Command(String address, String command) {
uint8_t addressValue = strtoul(address.substring(0,2).c_str(), nullptr, 16);
uint8_t commandValue = strtoul(command.substring(0,2).c_str(), nullptr, 16);
uint16_t data = irsend.encodeRC5(addressValue, commandValue);
irsend.sendRC5(data, 13, 10);
irsend.sendRC5(data, 13);
Serial.println("Sent RC5 command");
digitalWrite(bruceConfig.irTx, LED_OFF);
}
Expand All @@ -385,10 +415,10 @@ void sendRC6Command(String address, String command) {
displaySomething("Sending..");
address.replace(" ", "");
command.replace(" ", "");
uint32_t addressValue = strtoul(address.c_str(), nullptr, 16);
uint32_t commandValue = strtoul(command.c_str(), nullptr, 16);
uint32_t addressValue = strtoul(address.substring(0,2).c_str(), nullptr, 16);
uint32_t commandValue = strtoul(command.substring(0,2).c_str(), nullptr, 16);
uint64_t data = irsend.encodeRC6(addressValue, commandValue);
irsend.sendRC6(data,20, 10);
irsend.sendRC6(data, 20);
Serial.println("Sent RC5 command");
digitalWrite(bruceConfig.irTx, LED_OFF);
}
Expand All @@ -397,15 +427,11 @@ void sendSamsungCommand(String address, String command) {
IRsend irsend(bruceConfig.irTx); // Set the GPIO to be used to sending the message.
irsend.begin();
displaySomething("Sending..");
//uint64_t data = ((uint64_t)strtoul(address.c_str(), nullptr, 16) << 32) | strtoul(command.c_str(), nullptr, 16);
address.replace(" ", "");
command.replace(" ", "");
uint32_t addressValue = strtoul(address.c_str(), nullptr, 16);
uint32_t commandValue = strtoul(command.c_str(), nullptr, 16);
uint8_t addressValue = strtoul(address.substring(0,2).c_str(), nullptr, 16);
uint8_t commandValue = strtoul(command.substring(0,2).c_str(), nullptr, 16);
uint64_t data = irsend.encodeSAMSUNG(addressValue, commandValue);
irsend.sendSAMSUNG(data, 32, 10);
//delay(20);
//irsend.sendSamsung36(data, 36, 10);

irsend.sendSAMSUNG(data, 32);
Serial.println("Sent Samsung Command");
digitalWrite(bruceConfig.irTx, LED_OFF);
}
Expand Down
1 change: 1 addition & 0 deletions src/modules/ir/custom_ir.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
// custom Ir
void sendRawCommand(uint16_t frequency, String rawData);
void sendNECCommand(String address, String command);
void sendNECextCommand(String address, String command);
void sendRC5Command(String address, String command);
void sendRC6Command(String address, String command);
void sendSamsungCommand(String address, String command);
Expand Down
Loading