yet another quick bugfix

borti4938 · Sep 29, 2023 · 09f4898 · 09f4898
1 parent 78bd34e
commit 09f4898
Show file tree

Hide file tree

Showing 15 changed files with 895 additions and 898 deletions.
diff --git a/nios/software/controller_app/mem_init/onchip_flash_0.hex b/nios/software/controller_app/mem_init/onchip_flash_0.hex
@@ -10,17 +10,17 @@
 :200100009807E0078002D00220037003C00310046004B00400055005A005F00540069006B0
 :20012000E00630078007D00720087008C00800000000051E0000053C0080075A00000A7815
 :2001400000400B8700800C9600000FB400000FB400000524000006480080075A00C009758F
-:2001600000400B8700C00C9900000FB400000FB4C0620100186301003C63010050630100CF
-:200180006463010070630100E4630100EC630100F4630100FC630100046401000C64010099
-:2001A000146401001C640100246401002C64010034640100046401000C640100146401003F
-:2001C0001C640100246401002C640100346401003C640100446401004C6401005464010037
-:2001E0005C640100646401006C640100746401007C640100846401008C6401009464010017
-:200200009C640100A4640100FC6401000C6501001C65010024650100DC6401002C65010022
-:20022000CC64010034650100C8660100D0660100D8660100E4660100F06601007C670100C8
-:20024000886701008069010088690100F06A0100F86A0100106D0100206D0100206E010079
-:200260002C6E0100D06E0100DC6E0100B06F0100C06F010068700100787001006071010075
-:2002800074710100947201009C720100B0730100BC730100D0730100FC73010014740100D1
-:2002A000207401002C7401003874010044740100357EF38DC2D661671211925A0914848FD0
+:2001600000400B8700C00C9900000FB400000FB4C8620100206301004463010058630100AF
+:200180006C63010078630100EC630100F4630100FC630100046401000C6401001464010058
+:2001A0001C640100246401002C640100346401003C6401000C640100146401001C640100FF
+:2001C000246401002C640100346401003C640100446401004C640100546401005C640100F7
+:2001E000646401006C640100746401007C640100846401008C640100946401009C640100D7
+:20020000A4640100AC6401000465010014650100246501002C650100E464010034650100E1
+:20022000D46401003C650100D0660100D8660100E0660100EC660100F86601008467010088
+:20024000906701008869010090690100F86A0100006B0100186D0100286D0100286E010038
+:20026000346E0100D86E0100E46E0100B86F0100C86F010070700100807001006871010035
+:200280007C7101009C720100A4720100B8730100C4730100D8730100047401001C74010090
+:2002A0002874010034740100407401004C740100357EF38DC2D661671211925A0914848FB0
 :2002C0002F3D925A0914848F2F3D7BB3BDD0681736294E260C0A0506040750270D0B050657
 :2002E000040750270D0B050604074F26260C050437B0446CE84074E8A84438780CC0B084E7
 :20030000146CA0A0240020A078101C14444020EC38230004708E38010D7C0CE8DC0A9C005C

diff --git a/nios/software/controller_app/mem_init/system_onchip_memory2_0.hex b/nios/software/controller_app/mem_init/system_onchip_memory2_0.hex
diff --git a/quartus/output_files/10m16sae144/n64adv2_10m16sae144.pof b/quartus/output_files/10m16sae144/n64adv2_10m16sae144.pof
diff --git a/quartus/output_files/10m16sae144/n64adv2_10m16sae144.sof b/quartus/output_files/10m16sae144/n64adv2_10m16sae144.sof
diff --git a/quartus/output_files/10m16sae144/n64adv2_10m16sae144_auto.rpd b/quartus/output_files/10m16sae144/n64adv2_10m16sae144_auto.rpd
diff --git a/quartus/output_files/10m16sae144/n64adv2_10m16sae144_cfm0_auto.rpd b/quartus/output_files/10m16sae144/n64adv2_10m16sae144_cfm0_auto.rpd
diff --git a/quartus/output_files/10m16sae144/n64adv2_10m16sae144_ufm_auto.rpd b/quartus/output_files/10m16sae144/n64adv2_10m16sae144_ufm_auto.rpd
diff --git a/quartus/output_files/10m25sae144dev/n64adv2_10m25sae144dev.pof b/quartus/output_files/10m25sae144dev/n64adv2_10m25sae144dev.pof
diff --git a/quartus/output_files/10m25sae144dev/n64adv2_10m25sae144dev.sof b/quartus/output_files/10m25sae144dev/n64adv2_10m25sae144dev.sof
diff --git a/quartus/output_files/10m25sae144dev/n64adv2_10m25sae144dev_auto.rpd b/quartus/output_files/10m25sae144dev/n64adv2_10m25sae144dev_auto.rpd
diff --git a/quartus/output_files/10m25sae144dev/n64adv2_10m25sae144dev_cfm0_auto.rpd b/quartus/output_files/10m25sae144dev/n64adv2_10m25sae144dev_cfm0_auto.rpd
diff --git a/quartus/output_files/10m25sae144dev/n64adv2_10m25sae144dev_ufm_auto.rpd b/quartus/output_files/10m25sae144dev/n64adv2_10m25sae144dev_ufm_auto.rpd
diff --git a/sw/main.c b/sw/main.c
@@ -403,7 +403,7 @@ int main()
     keep_vout_rst = !periphal_state.si5356_locked || !periphal_state.adv7513_hdmi_up;
     if (!keep_vout_rst) {
       periphals_set_ready_bit();
-      if (menu->type != N64DEBUG) { // LEDs are under control by Debug-Screen
+      if (menu->type != N64DEBUG) { // LEDs are not under control by Debug-Screen
         led_drive(LED_OK,LED_OFF);
         if (video_input_detected) {
           clear_led_timeout(LED_NOK);
@@ -425,7 +425,7 @@ int main()
         message_cnt = CONFIRM_SHOW_CNT_MID;
       }
       changed_linex_setting = FALSE;
-    } else {
+    } else if (menu == &vires_screen) {
       changed_linex_setting = (linex_word_pre != linex_words[palmode].config_val);
     }
 

diff --git a/sw/menu.c b/sw/menu.c
@@ -661,14 +661,17 @@ updateaction_t modify_menu(cmd_t command, menu_t* *current_menu)
   }
 
   // check for functions embedded in menu
-  if ((*current_menu)->leaves[current_sel].leavetype == CFG_FUNC1) {
-    if (command == CMD_MENU_RIGHT) {
-      (*current_menu)->leaves[current_sel].cfgfct_call_1(1);  // at the moment only used for unlock 1440p, so this is correct
-      return NEW_CONF_VALUE;
-    }
+  if (((command == CMD_MENU_RIGHT) || (command == CMD_MENU_LEFT)) &&
+      ((*current_menu)->leaves[current_sel].leavetype == CFG_FUNC4)) { // at the moment only used in scaling menu for horizontal and vertical scale
+    (*current_menu)->leaves[current_sel].cfgfct_call_4(command,current_sel==VERTSCALE_SELECTION,1,0);
+    return NEW_CONF_VALUE;
   }
 
   if ((command == CMD_MENU_RIGHT) || (command == CMD_MENU_ENTER)) {
+    if ((*current_menu)->leaves[current_sel].leavetype == CFG_FUNC1) {
+      (*current_menu)->leaves[current_sel].cfgfct_call_1(1);  // at the moment only used for unlock 1440p, so this is correct
+      return NEW_CONF_VALUE;
+    }
     if ((*current_menu)->leaves[current_sel].leavetype == CFG_FUNC3) {
       (*current_menu)->leaves[current_sel].cfgfct_call_3(current_sel-RES_FUNCTIONS_OFFSET,1,0);  // at the moment only used in resolution menu, so this is correct
       return NEW_CONF_VALUE;
@@ -684,12 +687,6 @@ updateaction_t modify_menu(cmd_t command, menu_t* *current_menu)
     }
   }
 
-  if (((command == CMD_MENU_RIGHT) || (command == CMD_MENU_LEFT)) &&
-      ((*current_menu)->leaves[current_sel].leavetype == CFG_FUNC4)) { // at the moment only used in scaling menu for horizontal and vertical scale
-    (*current_menu)->leaves[current_sel].cfgfct_call_4(command,current_sel==VERTSCALE_SELECTION,1,0);
-    return NEW_CONF_VALUE;
-  }
-
   return NON;
 }
 

diff --git a/sw/menu.h b/sw/menu.h
@@ -71,12 +71,12 @@ typedef enum {
 typedef enum {
   ICONFIG = 0,
   ISUBMENU,
-  INFO_RET_FUNC0,
-  INFO_RET_FUNC1,
-  INFO_RET_FUNC2,
   CFG_FUNC1,
   CFG_FUNC3,
-  CFG_FUNC4
+  CFG_FUNC4,
+  INFO_RET_FUNC0,
+  INFO_RET_FUNC1,
+  INFO_RET_FUNC2
 } leavetype_t;
 
 typedef struct {
@@ -127,7 +127,7 @@ typedef struct menu {
 } menu_t;
 
 extern alt_u16 message_cnt;
-extern menu_t home_menu, debug_screen;
+extern menu_t home_menu, vires_screen, debug_screen;
 
 #define DEBUG_IN_MAIN_MENU_SELECTION  6