Skip to content

Commit

Permalink
added recent submenu in customIR, added filtering by ext in loopSD (p…
Browse files Browse the repository at this point in the history 
…r3y#66)
  • Loading branch information
@eadmaster
eadmaster committed Jul 23, 2024
1 parent 8c659a6 commit 827015c
Show file tree
Hide file tree
Showing 4 changed files with 77 additions and 37 deletions.
87 changes: 64 additions & 23 deletions src/TV-B-Gone.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -205,10 +205,12 @@ struct Codes {
uint32_t frequency;
//float duty_cycle;
String data;
String filepath;
};

Codes codes[50];


void resetCodesArray() {
for (int i = 0; i < 25; i++) {
codes[i].name = "";
Expand All @@ -219,32 +221,73 @@ void resetCodesArray() {
codes[i].frequency = 0;
//codes[i].duty_cycle = 0.0;
codes[i].data = "";
codes[i].filepath = "";
}
}


Codes recent_ircodes[16];
int recent_ircodes_last_used = 0; // TODO: save/load in EEPROM

void addToRecentCodes(struct Codes ircode) {
// copy rfcode -> recent_ircodes[recent_ircodes_last_used]
recent_ircodes[recent_ircodes_last_used] = ircode;
recent_ircodes_last_used += 1;
if(recent_ircodes_last_used == 16) recent_ircodes_last_used = 0; // cycle
}

struct Codes selectRecentIrMenu() {
// show menu with filenames
options = { };
bool exit = false;
struct Codes selected_code;
for(int i=0; i<16; i++) {
if(recent_ircodes[i].filepath=="") continue; // not inited
// else
options.push_back({ recent_ircodes[i].filepath.c_str(), [i, &selected_code](){ selected_code = recent_ircodes[i]; }});
}
options.push_back({ "Main Menu" , [&](){ exit=true; }});
delay(200);
loopOptions(options);
return(selected_code);
}

void otherIRcodes() {
resetCodesArray();
int total_codes = 0;
String filepath;
File databaseFile;
FS *fs;
if(setupSdCard()) {
bool teste=false;
options = {
{"SD Card", [&]() { fs=&SD; }},
FS *fs = NULL;
struct Codes selected_code;
options = {
{"Recent", [&]() { selected_code = selectRecentIrMenu(); }},
{"LittleFS", [&]() { fs=&LittleFS; }},
};
delay(200);
loopOptions(options);
delay(200);

} else fs=&LittleFS;
};
if(setupSdCard()) options.push_back({"SD Card", [&]() { fs=&SD; }});

filepath = loopSD(*fs, true);
delay(200);
loopOptions(options);
delay(200);

if(fs == NULL) { // recent menu was selected
if(selected_code.filepath!="") { // a code was selected, switch on code type
if(selected_code.type=="raw") sendRawCommand(selected_code.frequency, selected_code.data);
else if(selected_code.protocol=="NECext") sendNECextCommand(selected_code.address, selected_code.command);
else if(selected_code.protocol=="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.startsWith("Samsung")) sendSamsungCommand(selected_code.address, selected_code.command);
else if(selected_code.protocol=="SIRC") sendSonyCommand(selected_code.address, selected_code.command);
}
return;
// no need to proceed, go back
}

filepath = loopSD(*fs, true, "IR");
databaseFile = fs->open(filepath, FILE_READ);
drawMainBorder();

pinMode(IrTx, OUTPUT);
//digitalWrite(IrTx, LED_ON);
//digitalWrite(IrTx, LED_OFF);

if (!databaseFile) {
Serial.println("Failed to open database file.");
Expand All @@ -262,7 +305,6 @@ void otherIRcodes() {
loopOptions(options);
delay(200);


String line;

// Mode to choose and send command by command limitted to 50 commands
Expand All @@ -272,7 +314,7 @@ void otherIRcodes() {
line = databaseFile.readStringUntil('\n');
txt=line.substring(line.indexOf(":") + 1);
txt.trim();
if(line.startsWith("name:")) codes[total_codes].name = txt;
if(line.startsWith("name:")) { codes[total_codes].name = txt; codes[total_codes].filepath = filepath.substring( 1 + filepath.lastIndexOf("/") ) + " " + txt;}
if(line.startsWith("type:")) codes[total_codes].type = txt;
if(line.startsWith("protocol:")) codes[total_codes].protocol = txt;
if(line.startsWith("address:")) codes[total_codes].address = txt;
Expand All @@ -284,17 +326,17 @@ void otherIRcodes() {
options = { };
bool exit = false;
for(int i=0; i<=total_codes; i++) {
if(codes[i].type=="raw") options.push_back({ codes[i].name.c_str(), [=](){ sendRawCommand(codes[i].frequency, codes[i].data); }});
if(codes[i].protocol=="NECext") options.push_back({ codes[i].name.c_str(), [=](){ sendNECextCommand(codes[i].address, codes[i].command); }});
if(codes[i].protocol=="NEC") options.push_back({ codes[i].name.c_str(), [=](){ sendNECCommand(codes[i].address, codes[i].command); }});
if(codes[i].protocol=="RC5") options.push_back({ codes[i].name.c_str(), [=](){ sendRC5Command(codes[i].address, codes[i].command); }});
if(codes[i].protocol.startsWith("Samsung")) options.push_back({ codes[i].name.c_str(), [=](){ sendSamsungCommand(codes[i].address, codes[i].command); }});
if(codes[i].protocol=="SIRC") options.push_back({ codes[i].name.c_str(), [=](){ sendSonyCommand(codes[i].address, codes[i].command); }});
if(codes[i].type=="raw") options.push_back({ codes[i].name.c_str(), [=](){ sendRawCommand(codes[i].frequency, codes[i].data); addToRecentCodes(codes[i]); }});
if(codes[i].protocol=="NECext") options.push_back({ codes[i].name.c_str(), [=](){ sendNECextCommand(codes[i].address, codes[i].command); addToRecentCodes(codes[i]); }});
if(codes[i].protocol=="NEC") options.push_back({ codes[i].name.c_str(), [=](){ sendNECCommand(codes[i].address, codes[i].command); addToRecentCodes(codes[i]); }});
if(codes[i].protocol=="RC5") options.push_back({ codes[i].name.c_str(), [=](){ sendRC5Command(codes[i].address, codes[i].command); addToRecentCodes(codes[i]); }});
if(codes[i].protocol.startsWith("Samsung")) options.push_back({ codes[i].name.c_str(), [=](){ sendSamsungCommand(codes[i].address, codes[i].command); addToRecentCodes(codes[i]); }});
if(codes[i].protocol=="SIRC") options.push_back({ codes[i].name.c_str(), [=](){ sendSonyCommand(codes[i].address, codes[i].command); addToRecentCodes(codes[i]); }});
}
options.push_back({ "Main Menu" , [&](){ exit=true; }});
databaseFile.close();

digitalWrite(IrTx, LED_OFF);
//digitalWrite(IrTx, LED_OFF);
while (1) {
delay(200);
loopOptions(options);
Expand All @@ -303,7 +345,6 @@ void otherIRcodes() {
}
}


else { // SPAM all codes of the file

int codes_sent=0;
Expand Down
13 changes: 6 additions & 7 deletions src/rf.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -355,7 +355,7 @@ void addToRecentCodes(struct RfCodes rfcode) {
if(recent_rfcodes_last_used == 16) recent_rfcodes_last_used = 0; // cycle
}

struct RfCodes selectRecentMenu() {
struct RfCodes selectRecentRfMenu() {
// show menu with filenames
options = { };
bool exit = false;
Expand All @@ -376,10 +376,10 @@ void otherRFcodes() {
FS *fs = NULL;
String filepath = "";
struct RfCodes selected_code;
options = {
{"Recent", [&]() { selected_code = selectRecentMenu(); }},
options = {
{"Recent", [&]() { selected_code = selectRecentRfMenu(); }},
{"LittleFS", [&]() { fs=&LittleFS; }},
};
};
if(setupSdCard()) options.push_back({"SD Card", [&]() { fs=&SD; }});

delay(200);
Expand All @@ -392,19 +392,18 @@ void otherRFcodes() {
// no need to proceed, go back
}

filepath = loopSD(*fs, true);
filepath = loopSD(*fs, true, "SUB");
databaseFile = fs->open(filepath, FILE_READ);
drawMainBorder();

selected_code.filepath = filepath.substring( 1 + filepath.lastIndexOf("/") );

if (!databaseFile) {
Serial.println("Failed to open database file.");
displayError("Fail to open file");
delay(2000);
return;
}
Serial.println("Opened sub file.");
selected_code.filepath = filepath.substring( 1 + filepath.lastIndexOf("/") );

// format specs: https://github.com/flipperdevices/flipperzero-firmware/blob/dev/documentation/file_formats/SubGhzFileFormats.md
String line;
Expand Down
10 changes: 5 additions & 5 deletions src/sd_functions.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -301,7 +301,7 @@ void sortList(String fileList[][3], int fileListCount) {
** Function name: sortList
** Description: sort files for name
***************************************************************************************/
void readFs(FS fs, String folder, String result[][3]) {
void readFs(FS fs, String folder, String result[][3], String allowed_ext) {

int allFilesCount = 0;
while(allFilesCount<MAXFILES) {
Expand Down Expand Up @@ -330,7 +330,7 @@ void readFs(FS fs, String folder, String result[][3]) {
result[allFilesCount][2] = "file";
allFilesCount++;
}
else {
else if(allowed_ext=="*" || ext==allowed_ext) {
result[allFilesCount][0] = fileName.substring(fileName.lastIndexOf("/") + 1);
result[allFilesCount][1] = file2.path();
result[allFilesCount][2] = "file";
Expand Down Expand Up @@ -372,7 +372,7 @@ void readFs(FS fs, String folder, String result[][3]) {
** Function: loopSD
** Where you choose what to do with your SD Files
**********************************************************************/
String loopSD(FS &fs, bool filePicker) {
String loopSD(FS &fs, bool filePicker, String allowed_ext) {
String result = "";
bool reload=false;
bool redraw = true;
Expand All @@ -385,7 +385,7 @@ String loopSD(FS &fs, bool filePicker) {
closeSdCard();
setupSdCard();

readFs(fs, Folder, fileList);
readFs(fs, Folder, fileList, allowed_ext);

for(int i=0; i<MAXFILES; i++) if(fileList[i][2]!="") maxFiles++; else break;
while(1){
Expand All @@ -395,7 +395,7 @@ String loopSD(FS &fs, bool filePicker) {
reset_screensaver_timer();
if(strcmp(PreFolder.c_str(),Folder.c_str()) != 0 || reload){
index=0;
readFs(fs, Folder, fileList);
readFs(fs, Folder, fileList, allowed_ext);
PreFolder = Folder;
maxFiles=0;
for(int i=0; i<MAXFILES; i++) if(fileList[i][2]!="") maxFiles++; else break;
Expand Down
4 changes: 2 additions & 2 deletions src/sd_functions.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,8 @@ bool createFolder(FS fs, String path);

String readLineFromFile(File myFile);

void readFs(FS fs, String folder, String result[][3]);
void readFs(FS fs, String folder, String result[][3], String allowed_ext = "*");

void sortList(String fileList[][3], int fileListCount);

String loopSD(FS &fs, bool filePicker = false);
String loopSD(FS &fs, bool filePicker = false, String allowed_ext = "*");

0 comments on commit 827015c

Please sign in to comment.