mirror
/
RGBtoHDMI
kopia lustrzana https://github.com/hoglet67/RGBtoHDMI
1
0
Forkuj 0
Kod Zgłoszenia Projekty Wydania Wiki Aktywność

Add capture folders and fix a bug with restore config

pull/85/head
IanSB 2019-04-10 16:57:22 +01:00
rodzic 0bedba483b
commit ce0e4e71d3
5 zmienionych plików z 48 dodań i 34 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

72
src/filesystem.c
Wyświetl plik

@ -15,7 +15,11 @@
#include "tiny_png_out.h"
#endif
#define CAPTURE_BASE "capture"
#define CAPTURE_FILE_BASE "capture"
#define CAPTURE_BASE "/Captures"
#define PROFILE_BASE "/Profiles"
#define SAVED_PROFILE_BASE "/Saved_Profiles"
static FATFS fsObject;
static int capture_id = -1;
@ -131,7 +135,7 @@ static void free_png(uint8_t *png) {
#endif
static void initialize_capture_id() {
static void initialize_capture_id(char * path) {
FRESULT result;
DIR dir;
FILINFO fno;
@ -143,25 +147,25 @@ static void initialize_capture_id() {
}
// Open root directory
result = f_opendir(&dir, "/");
result = f_opendir(&dir, path);
if (result != FR_OK) {
log_warn("Failed to open root directory");
log_warn("Failed to open %s", path);
return;
}
// Iterate through files in root directory looking for existing capture files
int len = 0;
int baselen = strlen(CAPTURE_BASE);
int baselen = strlen(CAPTURE_FILE_BASE);
capture_id = -1;
do {
result = f_readdir(&dir, &fno);
if (result != FR_OK) {
log_warn("Failed to read root directory");
log_warn("Failed to read %s", path);
break;
}
len = strlen(fno.fname);
if (len > 0) {
if (strncasecmp(fno.fname, CAPTURE_BASE, baselen) == 0) {
if (strncasecmp(fno.fname, CAPTURE_FILE_BASE, baselen) == 0) {
int id = atoi(fno.fname + baselen);
if (id > capture_id) {
capture_id = id;
@ -175,7 +179,7 @@ static void initialize_capture_id() {
// Close root directory
result = f_closedir(&dir);
if (result != FR_OK) {
log_warn("Failed to close root directory");
log_warn("Failed to close %s", path);
}
}
@ -201,24 +205,36 @@ void close_filesystem() {
}
}
void capture_screenshot(capture_info_t *capinfo) {
void capture_screenshot(capture_info_t *capinfo, char *profile) {
FRESULT result;
char path[100];
char path[256];
char filepath[256];
FIL file;
uint8_t *png;
unsigned int png_len;
init_filesystem();
initialize_capture_id();
result = f_mkdir(CAPTURE_BASE);
if (result != FR_OK && result != FR_EXIST) {
log_warn("Failed to create dir %s (result = %d)",CAPTURE_BASE, result);
}
sprintf(path, "%s%d.png", CAPTURE_BASE, capture_id);
sprintf(path, "%s/%s", CAPTURE_BASE, profile);
result = f_mkdir(path);
if (result != FR_OK && result != FR_EXIST) {
log_warn("Failed to create dir %s (result = %d)", path, result);
}
log_info("Screen capture starting, file = %s", path);
initialize_capture_id(path);
result = f_open(&file, path, FA_CREATE_NEW | FA_WRITE);
sprintf(filepath, "%s/%s%d.png",path, CAPTURE_FILE_BASE, capture_id);
log_info("Screen capture starting, file = %s", filepath);
result = f_open(&file, filepath, FA_CREATE_NEW | FA_WRITE);
if (result != FR_OK) {
log_warn("Failed to create capture file %s (result = %d)", path, result);
log_warn("Failed to create capture file %s (result = %d)", filepath, result);
return;
}
capture_id++;
@ -235,9 +251,9 @@ void capture_screenshot(capture_info_t *capinfo) {
UINT num_written = 0;
result = f_write(&file, png, png_len, &num_written);
if (result != FR_OK) {
log_warn("Failed to write capture file %s (result = %d)", path, result);
log_warn("Failed to write capture file %s (result = %d)", filepath, result);
} else if (num_written != png_len) {
log_warn("Capture file %s incomplete (%d < %d bytes)", path, num_written, png_len);
log_warn("Capture file %s incomplete (%d < %d bytes)", filepath, num_written, png_len);
}
}
@ -245,7 +261,7 @@ void capture_screenshot(capture_info_t *capinfo) {
result = f_close(&file);
if (result != FR_OK) {
log_warn("Failed to close capture file %s (result = %d)", path, result);
log_warn("Failed to close capture file %s (result = %d)", filepath, result);
}
close_filesystem();
@ -274,9 +290,9 @@ unsigned int file_read_profile(char *profile_name, char *sub_profile_name, int u
result = f_open(&file, path, FA_READ);
if (result != FR_OK) {
if (sub_profile_name != NULL) {
sprintf(path, "/Profiles/%s/%s.txt", profile_name, sub_profile_name);
sprintf(path, "%s/%s/%s.txt", PROFILE_BASE, profile_name, sub_profile_name);
} else {
sprintf(path, "/Profiles/%s.txt", profile_name);
sprintf(path, "%s/%s.txt", PROFILE_BASE, profile_name);
}
result = f_open(&file, path, FA_READ);
if (result != FR_OK) {
@ -473,27 +489,25 @@ int file_save(char *dirpath, char *name, char *buffer, unsigned int buffer_size)
char path[256];
char comparison_path[256];
char comparison_buffer[MAX_BUFFER_SIZE];
char *root = "/Saved_Profiles";
char *comparison_root = "/Profiles";
init_filesystem();
result = f_mkdir(root);
result = f_mkdir(SAVED_PROFILE_BASE);
if (result != FR_OK && result != FR_EXIST) {
log_warn("Failed to create dir %s (result = %d)",root, result);
log_warn("Failed to create dir %s (result = %d)",SAVED_PROFILE_BASE, result);
}
if (dirpath != NULL) {
sprintf(path, "%s/%s", root, dirpath);
sprintf(path, "%s/%s", SAVED_PROFILE_BASE, dirpath);
result = f_mkdir(path);
if (result != FR_OK && result != FR_EXIST) {
log_warn("Failed to create dir %s (result = %d)", dirpath, result);
}
sprintf(path, "%s/%s/%s.txt", root, dirpath, name);
sprintf(comparison_path, "%s/%s/%s.txt", comparison_root, dirpath, name);
sprintf(path, "%s/%s/%s.txt", SAVED_PROFILE_BASE, dirpath, name);
sprintf(comparison_path, "%s/%s/%s.txt", PROFILE_BASE, dirpath, name);
} else {
sprintf(path, "%s/%s.txt", root, name);
sprintf(comparison_path, "%s/%s.txt", comparison_root, name);
sprintf(path, "%s/%s.txt", SAVED_PROFILE_BASE, name);
sprintf(comparison_path, "%s/%s.txt", PROFILE_BASE, name);
}
log_info("Loading comparison file %s", comparison_path);

2
src/filesystem.h
Wyświetl plik

@ -4,7 +4,7 @@
#include "defs.h"
void init_filesystem();
void capture_screenshot(capture_info_t *capinfo);
void capture_screenshot(capture_info_t *capinfo, char *profile);
void close_filesystem();

2
src/osd.c
Wyświetl plik

@ -1697,7 +1697,7 @@ int osd_key(int key) {
case CAPTURE:
// Capture screen shot
capture_screenshot(capinfo);
capture_screenshot(capinfo, profile_names[get_feature(F_PROFILE)]);
// Fire OSD_EXPIRED in 1 frames time
ret = 1;
// come back to IDLE

3
src/rgb_to_fb.S
Wyświetl plik

@ -573,7 +573,6 @@ noInBandData:
bicne r3, #BIT_FIELD_TYPE1_VALID //to update and you get an erroneous interlace changed exit
skip_osd_update:
#ifdef MULTI_BUFFER
// Update the last drawn buffer
mov r0, r3, lsr #OFFSET_CURR_BUFFER
@ -964,7 +963,7 @@ clear_loop:
and r7, r8
str r7, [r11], #4
bne clear_loop
pop {r4-r12, pc}
mov pc, lr
clearnot7:
subs r6, r6, #4
str r7, [r11], #4

3
src/rgb_to_hdmi.c
Wyświetl plik

@ -768,8 +768,9 @@ static int extra_flags() {
extra |= BIT_NO_H_SCROLL;
}
if (autoswitch != AUTOSWITCH_PC) {
if (autoswitch == AUTOSWITCH_MODE7 || sub_profiles_available(profile) == 0)
if (autoswitch == AUTOSWITCH_MODE7 || sub_profiles_available(profile) == 0) {
extra |= BIT_NO_AUTOSWITCH;
}
}
if (!mode7 && (capinfo->px_sampling == PS_NORMAL_E || capinfo->px_sampling == PS_HALF_E)) {
extra |= BIT_EVEN_SAMPLES;