Fixed link port, LCD cursor, and keypad bugs

drdnar · Dec 24, 2014 · 4f13c2e · 4f13c2e
1 parent 9213f65
commit 4f13c2e
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 4 deletions.
diff --git a/Tiedye/Hardware/TI84PCSE/ColorLcd.cs b/Tiedye/Hardware/TI84PCSE/ColorLcd.cs
@@ -225,10 +225,12 @@ public void WriteData(byte value)
                     RegEntryMode = val;
                     break;
                 case 0x20: // Cursor Row
-                    CursorRow = (val % 240);
+                    LastCursorRow = CursorRow = (val % 240);
+                    CursorColumn = LastCursorColumn;
                     break;
                 case 0x21: // Cursor Column
-                    CursorColumn = (val % 320);
+                    LastCursorColumn = CursorColumn = (val % 320);
+                    CursorRow = LastCursorRow;
                     break;
                 case 0x22: // GRAM Buffer
                     if (LogEnable)
@@ -305,6 +307,8 @@ public ushort RegEntryMode
 
         public int CursorRow = 0;
         public int CursorColumn = 0;
+        public int LastCursorRow = 0;
+        public int LastCursorColumn = 0;
         public int GramBuffer = 0;
         public void IncCursor()
         {

diff --git a/Tiedye/Hardware/TI84PCSE/Ti84PlusCSe.cs b/Tiedye/Hardware/TI84PCSE/Ti84PlusCSe.cs
@@ -435,15 +435,15 @@ byte ReadLogPort(object sender, ushort address)
             switch (address & 0xFF)
             {
                 case 0x00: // D-Bus
-                    return DBus.ReadLines();
+                    return 3;//DBus.ReadLines();
                 case 0x01: // Keypad
                     return Keypad.Read();
                 case 0x02: // TODO: System status
                     // Bit 1 is the LCD ready timer.
                     return (byte)(1 | 2 | (Mapper.FlashWriteEnable ? 4 : 0) | 0xE0);
                 case 0x03: // Interrupt mask
                     // TODO: DBus interrupt enable
-                    return (byte)((Keypad.OnInterruptEnable ? 1 : 0) | (Apd.GenerateInterrupt ? 2 : 0) | (PApd.GenerateInterrupt ? 4 : 0) | (OffEnableMode ? 8 : 0));// | (DBus.I));
+                    return (byte)((Keypad.OnInterruptEnable ? 1 : 0) | (Apd.GenerateInterrupt ? 2 : 0) | (PApd.GenerateInterrupt ? 4 : 0) | 16);// | (DBus.I));
                 case 0x04: // Interrupt ID
                     return (byte)((Keypad.OnKey ? 0 : 8) | ((byte)Interrupts & 0xFF) | (CrystalTimer1.HasExpired ? 0x20 : 0) | (CrystalTimer2.HasExpired ? 0x40 : 0) | (CrystalTimer3.HasExpired ? 0x80 : 0));
                 case 0x05: // Memory page C

diff --git a/TiedyeDesktop/Resources/layout-myriad-trans-keys.png b/TiedyeDesktop/Resources/layout-myriad-trans-keys.png