UI improvements

* allow changing OSD highlight color
* enable typing in profile number in respective menu
* add menu for fw file selection

Author: marqs

ip/osd_generator/inc/osd_generator_regs.h

@@ -36,8 +36,9 @@ typedef union {
         uint8_t y_offset:3;
         uint8_t x_size:2;
         uint8_t y_size:2;
-        uint8_t border_color:2;
-        uint32_t osd_rsv:15;
+        uint8_t border_color:3;
+        uint8_t highlight_color:3;
+        uint32_t osd_rsv:11;
     } __attribute__((packed, __may_alias__));
     uint32_t data;
 } osd_config_reg;

ip/osd_generator/osd_generator_hw.tcl

@@ -156,4 +156,4 @@ add_interface_port osd_if vclk vclk Input 1
 add_interface_port osd_if xpos xpos Input 12
 add_interface_port osd_if ypos ypos Input 11
 add_interface_port osd_if osd_enable osd_enable Output 1
-add_interface_port osd_if osd_color osd_color Output 2
+add_interface_port osd_if osd_color osd_color Output 3

ip/osd_generator/osd_generator_top.sv

@@ -35,18 +35,18 @@ module osd_generator_top (
     input [11:0] xpos,
     input [10:0] ypos,
     output reg osd_enable,
-    output reg [1:0] osd_color
+    output reg [2:0] osd_color
 );
 
 localparam CHAR_ROWS = 25;
 localparam CHAR_COLS = 20;
 localparam CHAR_SECTIONS = 2;
 localparam CHAR_SEC_SEPARATOR = 2;
 
-localparam BG_BLACK =   2'h0;
-localparam BG_BLUE =    2'h1;
-localparam BG_YELLOW =  2'h2;
-localparam BG_WHITE =   2'h3;
+localparam BG_BLACK =   3'h0;
+localparam BG_BLUE =    3'h1;
+localparam BG_YELLOW =  3'h6;
+localparam BG_WHITE =   3'h7;
 
 localparam OSD_CONFIG_REGNUM =          8'hfa;
 localparam OSD_ROW_LSEC_ENABLE_REGNUM = 8'hfb;
@@ -71,7 +71,8 @@ wire [2:0] x_offset = osd_config[7:5];
 wire [2:0] y_offset = osd_config[10:8];
 wire [1:0] x_size = osd_config[12:11];
 wire [1:0] y_size = osd_config[14:13];
-wire [1:0] border_color = osd_config[16:15];
+wire [2:0] border_color = osd_config[17:15];
+wire [2:0] highlight_color = osd_config[20:18];
 
 wire [11:0] xpos_scaled_w = (xpos >> x_size)-({3'h0, x_offset} << 3);
 wire [10:0] ypos_scaled_w = (ypos >> y_size)-({3'h0, y_offset} << 3);
@@ -147,7 +148,7 @@ always @(posedge vclk) begin
 
     if (osd_text_act_pp[6]) begin
         if (char_px) begin
-            osd_color <= config_reg[OSD_ROW_COLOR_REGNUM][char_row] ? BG_YELLOW : BG_WHITE;
+            osd_color <= config_reg[OSD_ROW_COLOR_REGNUM][char_row] ? highlight_color : BG_WHITE;
         end else begin
             osd_color <= BG_BLUE;
         end

rtl/ossc_pro.v

@@ -214,7 +214,7 @@ assign FAN_PWM_o = ~(sys_poweron & fan_pwm);
 wire [11:0] xpos_sc;
 wire [11:0] ypos_sc;
 wire osd_enable;
-wire [1:0] osd_color;
+wire [2:0] osd_color;
 wire [3:0] x_ctr_shmask, y_ctr_shmask;
 wire [10:0] shmask_data;
 
@@ -584,15 +584,7 @@ wire HSYNC_sc, VSYNC_sc, DE_sc;
 
 always @(posedge pclk_out) begin
     if (osd_enable) begin
-        if (osd_color == 2'h0) begin
-            {R_out, G_out, B_out} <= 24'h000000;
-        end else if (osd_color == 2'h1) begin
-            {R_out, G_out, B_out} <= 24'h0000ff;
-        end else if (osd_color == 2'h2) begin
-            {R_out, G_out, B_out} <= 24'hffff00;
-        end else begin
-            {R_out, G_out, B_out} <= 24'hffffff;
-        end
+        {R_out, G_out, B_out} <= {{8{osd_color[2]}}, {8{osd_color[1]}}, {8{osd_color[0]}}};
     end else begin
         {R_out, G_out, B_out} <= {R_sc, G_sc, B_sc};
     end

software/sys_controller/av_controller.c

@@ -94,6 +94,7 @@ const settings_t ts_default = {
     .default_avinput = 0,
     .osd_enable = 1,
     .osd_status_timeout = 1,
+    .osd_highlight_color = 4,
     .fan_pwm = 0,
     .led_pwm = 5,
 };
@@ -1184,6 +1185,9 @@ int load_scl_coeffs(char *dirname, char *filename) {
     char dirname_root[10];
     int i, p, n, pp_bits, lines=0;
 
+    if (!sd_det)
+        return -1;
+
     sniprintf(dirname_root, sizeof(dirname_root), "/%s", dirname);
     f_chdir(dirname_root);
 
@@ -1255,6 +1259,9 @@ int load_shmask(char *dirname, char *filename) {
     int v0=0,v1=0;
     int p;
 
+    if (!sd_det)
+        return -1;
+
     sniprintf(dirname_root, sizeof(dirname_root), "/%s", dirname);
     f_chdir(dirname_root);
 
@@ -1337,9 +1344,10 @@ void set_custom_edid_reload() {
 }
 
 void update_settings(int init_setup) {
-    if (init_setup || (ts.osd_enable != cs.osd_enable) || (ts.osd_status_timeout != cs.osd_status_timeout)) {
+    if (init_setup || (ts.osd_enable != cs.osd_enable) || (ts.osd_status_timeout != cs.osd_status_timeout) || (ts.osd_highlight_color != cs.osd_highlight_color)) {
         osd->osd_config.enable = !!ts.osd_enable;
         osd->osd_config.status_timeout = ts.osd_status_timeout;
+        osd->osd_config.highlight_color = 2+ts.osd_highlight_color;
         refresh_osd();
     }
     if (init_setup || (ts.fan_pwm != cs.fan_pwm) || (ts.led_pwm != cs.led_pwm)) {

software/sys_controller/inc/av_controller.h

@@ -107,6 +107,7 @@ typedef struct {
     avinput_t default_avinput;
     uint8_t osd_enable;
     uint8_t osd_status_timeout;
+    uint8_t osd_highlight_color;
 #ifndef DExx_FW
     uint8_t power_up_state;
     uint8_t fan_pwm;

software/sys_controller/inc/firmware.h

@@ -56,7 +56,7 @@ typedef struct {
     volatile rem_update_regs *regs;
 } rem_update_dev;
 
-int fw_update();
+int fw_update(char *dirname, char *filename);
 
 void fw_update_commit(fw_header *hdr);
 

software/sys_controller/inc/menu.h

@@ -32,7 +32,17 @@ typedef enum {
     PREV_PAGE,
     NEXT_PAGE,
     VAL_MINUS,
-    VAL_PLUS
+    VAL_PLUS,
+    MENU_BTN1,
+    MENU_BTN2,
+    MENU_BTN3,
+    MENU_BTN4,
+    MENU_BTN5,
+    MENU_BTN6,
+    MENU_BTN7,
+    MENU_BTN8,
+    MENU_BTN9,
+    MENU_BTN0,
 } menucode_id;
 
 typedef enum {
@@ -138,6 +148,7 @@ void cstm_rf_tune(menucode_id code, int setup_disp);
 void cstm_scl_alg_load(menucode_id code, int setup_disp);
 void cstm_shmask_load(menucode_id code, int setup_disp);
 void cstm_edid_load(menucode_id code, int setup_disp);
+void cstm_fw_update(menucode_id code, int setup_disp);
 void cstm_vm_stats(menucode_id code, int setup_disp);
 void cstm_listview(menucode_id code, int setup_disp);
 void enter_cstm(const menuitem_t *item, int detached_mode);

software/sys_controller/src/firmware.c

@@ -36,23 +36,28 @@ extern flash_ctrl_dev flashctrl_dev;
 extern uint8_t sd_det;
 extern char menu_row1[US2066_ROW_LEN+1], menu_row2[US2066_ROW_LEN+1];
 
-int fw_update() {
+int fw_update(char *dirname, char *filename) {
     FIL fw_file;
+    char dirname_root[10];
     fw_header hdr;
     int i, retval = 0;
     unsigned bytes_read, bytes_to_copy=0;
     uint32_t crcval;
     unsigned char *dram_tmp = (unsigned char*)DRAM_TMP_ADDR;
 
-    strlcpy(menu_row2, "Please wait...", US2066_ROW_LEN+1);
-    ui_disp_menu(1);
-
     if (!sd_det) {
         printf("SD card not detected\n");
         return -1;
     }
 
-    if (!file_open(&fw_file, "ossc_pro.bin")) {
+    sniprintf(dirname_root, sizeof(dirname_root), "/%s", dirname);
+    f_chdir(dirname_root);
+
+    if (!file_open(&fw_file, filename)) {
+        strlcpy(menu_row1, "Checking FW", US2066_ROW_LEN+1);
+        strlcpy(menu_row2, "Please wait...", US2066_ROW_LEN+1);
+        ui_disp_menu(1);
+
         if (f_read(&fw_file, &hdr, sizeof(hdr), &bytes_read) != F_OK) {
             printf("FW hdr read error\n");
             retval = -3;
@@ -130,11 +135,13 @@ int fw_update() {
         fw_update_commit(&hdr);
     } else {
         printf("FW file not found\n");
+        f_chdir("/");
         return -2;
     }
 
 close_file:
     file_close(&fw_file);
+    f_chdir("/");
     set_dram_refresh(0);
     return retval;
 }