Videx: menu configuration and documentation.

Author: ThorstenBr

README.md

@@ -180,6 +180,20 @@ but uses an unused 8th data bit to switich to a 560pixel/line monochrome resolut
 Another example showing the Video7 16color with hires monochrome pixel mix mode:
 ![Video7](images/A2DVI_Video7_DHGR2.jpg)
 
+## Videx Support
+Stock Apple IIs did not support 80 column display.
+A popular extension were "Videx" video cards, which provided 80 column support - and support for various character sets.
+
+A2DVI is able to display the Videx 80 column video mode on an Apple II.
+Enable the Videx support by selecting the Videx character set in the menu (US, German, French, Spanish, ...).
+
+The Videx support of A2DVI is currently "passive" only:
+
+* You need to have an original Videx card plugged into slot 3 of your Apple II (the original card provides a ROM, registers and additional RAM to your Apple II).
+* Plug your A2DVI card in any other slot.
+
+![A2DVI Videx](images/A2DVI_Videx.jpg)
+
 ## Debug Monitor
 The configuration menu offers a debugging feature. Enabling the "**DEBUG MONITOR**" shows extra lines above and below the normal Apple II screen (in red):
 
@@ -251,6 +265,7 @@ Firmware updates of an A2DVI card are easy and safe:
 
 * **40/80 column text modes** for Apple IIe
 * **40 column text mode** for Apple II
+* **VIDEX 80 column text** for Apple II
 * **LORES graphics mode**
 * **Double-LORES graphics mode**
 * **HIRES graphics mode**

firmware/config/config.c

@@ -41,8 +41,9 @@ volatile bool      language_switch = false; // false: main/local char set, true:
 volatile bool      enhanced_font_enabled;
 volatile uint8_t   reload_charsets = 4;
 
+uint8_t            cfg_videx_selection = 0; //0:DISABLED
 uint8_t            cfg_local_charset = 0;
-uint8_t            cfg_alt_charset = 0;
+uint8_t            cfg_alt_charset   = 0;
 uint32_t           invalid_fonts = 0xffffffff;
 volatile uint8_t   color_mode = 1;
 rendering_fx_t     rendering_fx = FX_ENABLED;
@@ -82,7 +83,7 @@ struct __attribute__((__packed__)) config_t
 
     uint8_t  test_mode_enabled;
     rendering_fx_t rendering_fx;
-    uint8_t  videx_enabled;
+    uint8_t  videx_selection;
 
     // Add new fields after here. When reading the config use the IS_STORED_IN_CONFIG macro
     // to determine if the field you're looking for is actually present in the stored config.
@@ -263,11 +264,11 @@ void DELAYED_COPY_CODE(config_load_charsets)(void)
         }
     }
 
-    if (reload_charsets & 4)
+    if ((reload_charsets & 4)&&(cfg_videx_selection>0))
     {
         // videx character sets
-        memcpy32(character_rom_videx_normal,  character_roms_videx[0], CHARACTER_ROM_SIZE);
-        memcpy32(character_rom_videx_inverse, character_roms_videx[1], CHARACTER_ROM_SIZE);
+        memcpy32(character_rom_videx_normal,  character_roms_videx[cfg_videx_selection-1], CHARACTER_ROM_SIZE);
+        memcpy32(character_rom_videx_inverse, videx_inverse,                               CHARACTER_ROM_SIZE);
     }
 
     reload_charsets = 0;
@@ -300,7 +301,11 @@ void config_load(void)
     SET_IFLAG(cfg->video7_enabled,       IFLAGS_VIDEO7);
     SET_IFLAG(cfg->debug_lines_enabled,  IFLAGS_DEBUG_LINES);
     SET_IFLAG(cfg->test_mode_enabled,    IFLAGS_TEST);
-    SET_IFLAG((IS_STORED_IN_CONFIG(cfg, videx_enabled) && cfg->videx_enabled), IFLAGS_VIDEX);
+    if (IS_STORED_IN_CONFIG(cfg, videx_selection))
+    {
+        cfg_videx_selection = cfg->videx_selection;
+        SET_IFLAG(cfg_videx_selection>0, IFLAGS_VIDEX);
+    }
     if(IS_STORED_IN_CONFIG(cfg, rendering_fx))
     {
         rendering_fx = cfg->rendering_fx;
@@ -330,9 +335,8 @@ void config_load_defaults(void)
     SET_IFLAG(1, IFLAGS_SCANLINEEMU);
     SET_IFLAG(0, IFLAGS_DEBUG_LINES);
     SET_IFLAG(0, IFLAGS_FORCED_MONO);
-    SET_IFLAG(0, IFLAGS_VIDEO7);
+    SET_IFLAG(1, IFLAGS_VIDEO7);
     SET_IFLAG(0, IFLAGS_TEST);
-    SET_IFLAG(0, IFLAGS_VIDEX);
     rendering_fx = FX_ENABLED;
     config_setflags();
 
@@ -345,6 +349,8 @@ void config_load_defaults(void)
 
     cfg_local_charset       = DEFAULT_LOCAL_CHARSET;
     cfg_alt_charset         = DEFAULT_ALT_CHARSET;
+    cfg_videx_selection     = 0;
+    SET_IFLAG((cfg_videx_selection>0), IFLAGS_VIDEX);
 
     // reload both character sets
     reload_charsets |= 3;
@@ -368,7 +374,7 @@ void DELAYED_COPY_CODE(config_save)(void)
     new_config->video7_enabled          = IS_IFLAG(IFLAGS_VIDEO7);
     new_config->debug_lines_enabled     = IS_IFLAG(IFLAGS_DEBUG_LINES);
     new_config->test_mode_enabled       = IS_IFLAG(IFLAGS_TEST);
-    new_config->videx_enabled           = IS_IFLAG(IFLAGS_VIDEX);
+    new_config->videx_selection         = cfg_videx_selection;
     new_config->rendering_fx            = rendering_fx;
     new_config->color_mode              = color_mode;
     new_config->machine_type            = cfg_machine;

firmware/config/config.h

@@ -78,6 +78,7 @@ extern bool               input_switch_state;
 extern          uint32_t invalid_fonts;
 extern          uint8_t  cfg_local_charset;
 extern          uint8_t  cfg_alt_charset;
+extern          uint8_t  cfg_videx_selection;
 extern volatile uint8_t  reload_charsets;
 
 

firmware/fonts/textfont.c

@@ -63,10 +63,9 @@ const uint8_t* DELAYED_COPY_DATA(character_roms)[32] =
     CUSTOM_FONT_ROM(15)
 };
 
-const uint8_t* DELAYED_COPY_DATA(character_roms_videx)[11] =
+const uint8_t* DELAYED_COPY_DATA(character_roms_videx)[VIDEX_FONT_COUNT] =
 {
     videx_normal,
-    videx_inverse,
     videx_uppercase,
     videx_german,
     videx_french,

firmware/fonts/textfont.h

@@ -47,7 +47,8 @@ extern uint8_t __font_roms_start[];
 #define CUSTOM_FONT_ROM(i) (&__font_roms_start[(i)*CHARACTER_ROM_SIZE])
 
 extern const uint8_t* character_roms[MAX_FONT_COUNT];
-extern const uint8_t* character_roms_videx[11];
+#define VIDEX_FONT_COUNT 10
+extern const uint8_t* character_roms_videx[VIDEX_FONT_COUNT];
 
 extern const uint8_t textfont_iie_us_enhanced[256 * 8];
 extern const uint8_t textfont_iie_us_unenhanced[256 * 8];

firmware/menu/menu.c

@@ -35,7 +35,7 @@ SOFTWARE.
 #include "menu.h"
 
 // number of elements in the menu
-#define MENU_ENTRY_COUNT (17)
+#define MENU_ENTRY_COUNT (18)
 
 // number of non-config elements in the two column menu area
 #define MENU_ENTRIES_NONCFG (6)
@@ -245,6 +245,21 @@ const char* DELAYED_COPY_DATA(MenuFontNames)[MAX_FONT_COUNT] =
     "CUSTOM FONT 16"
 };
 
+const char* DELAYED_COPY_DATA(MenuVidex)[VIDEX_FONT_COUNT+1] =
+{
+    "DISABLED",  //0
+    "US",        //1
+    "UPPERCASE", //2
+    "GERMAN",    //3
+    "FRENCH",    //4
+    "SPANISH",   //5
+    "KATAKANA",  //6
+    "APL",       //7
+    "SUPER SUB", //8
+    "EPSON",     //9
+    "SYMBOL"     //10
+};
+
 static void menuOption(uint8_t y, uint8_t Selection, const char* pMenu, const char* pValue)
 {
     uint x = (Selection >= (MENU_OFS_NONCFG+3)) ? 20:0;
@@ -577,6 +592,26 @@ bool DELAYED_COPY_CODE(menuDoSelection)(bool increase)
             }
             break;
         case 10:
+            if (increase)
+            {
+                if (cfg_videx_selection < VIDEX_FONT_COUNT)
+                {
+                    cfg_videx_selection++;
+                    reload_charsets |= 4;
+                }
+            }
+            else
+            {
+                if (cfg_videx_selection > 0)
+                {
+                    cfg_videx_selection--;
+                    if (cfg_videx_selection > 0)
+                        reload_charsets |= 4;
+                }
+            }
+            SET_IFLAG((cfg_videx_selection>0), IFLAGS_VIDEX);
+            break;
+        case 11:
             SET_IFLAG(!IS_IFLAG(IFLAGS_DEBUG_LINES), IFLAGS_DEBUG_LINES);
             SET_IFLAG(0, IFLAGS_TEST);
             break;
@@ -651,9 +686,12 @@ static inline bool menuCheckKeys(char key)
             if ((!LANGUAGE_SWITCH_ENABLED())&&(CurrentMenu == 4))
                 CurrentMenu = 3;
             break;
-        case 'D':
+        case 'X':
             CurrentMenu = 10;
             break;
+        case 'D':
+            CurrentMenu = 11;
+            break;
         case 'R':
             CurrentMenu = MENU_OFS_NONCFG+0;
             Cmd = 1;
@@ -809,15 +847,16 @@ void DELAYED_COPY_CODE(menuShow)(char key)
 
     menuOption(13,8,  "8 ANALOG RENDER FX:", MenuRendering[rendering_fx]);
     menuOption(14,9,  "9 VIDEO7 MODES:",     MenuOnOff[IS_IFLAG(IFLAGS_VIDEO7)]);
-    menuOption(15,10, "D DEBUG MONITOR:",    MenuOnOff[IS_IFLAG(IFLAGS_DEBUG_LINES)]);
+    menuOption(15,10, "X VIDEX CHARSET:",    MenuVidex[cfg_videx_selection]);
+    menuOption(16,11, "D DEBUG MONITOR:",    MenuOnOff[IS_IFLAG(IFLAGS_DEBUG_LINES)]);
 
-    menuOption(17,11, "R RESTORE DEFAULTS",  0);
-    menuOption(18,12, "L LOAD FROM FLASH",   0);
-    menuOption(19,13, "S SAVE TO FLASH",     0);
+    menuOption(18,12, "R RESTORE DEFAULTS",  0);
+    menuOption(19,13, "L LOAD FROM FLASH",   0);
+    menuOption(20,14, "S SAVE TO FLASH",     0);
 
-    menuOption(17,14, "A ABOUT",             0);
-    menuOption(18,15, "B DEBUG",             0);
-    menuOption(19,16, "T TEST",              0);
+    menuOption(18,15, "A ABOUT",             0);
+    menuOption(19,16, "B DEBUG",             0);
+    menuOption(20,17, "T TEST",              0);
 
     // show some special characters, for immediate feedback when selecting character sets
     printXY(40-11, 21, "[{\\~#$`^|}]", PRINTMODE_NORMAL);

firmware/test/tests.c

@@ -488,7 +488,7 @@ void test_videx()
         simulateWrite(0xc300, 0);
         for (uint32_t b=0;b<0x200;b++)
         {
-            simulateWrite(0xcc00+b, '0'+bank);//b&0xff);
+            simulateWrite(0xcc00+b, b&0xff);
         }
     }