Fixes PS/2 input code for new prototype PCB, adds program.py to flash EEPROM

Author: Felix "xq" Queißner

Hardware/Expansions/PS2 Input/Prototype/Quad PS2 Input.kicad_sch

@@ -2381,6 +2381,86 @@
 			(embedded_fonts no)
 		)
 	)
+	(text "+1"
+		(exclude_from_sim no)
+		(at 40.64 60.325 0)
+		(effects
+			(font
+				(size 1.27 1.27)
+			)
+		)
+		(uuid "04002af5-a0ed-4739-8922-2a5546b4101f")
+	)
+	(text "+3"
+		(exclude_from_sim no)
+		(at 40.64 57.15 0)
+		(effects
+			(font
+				(size 1.27 1.27)
+			)
+		)
+		(uuid "157728c6-b376-464c-ab1c-114ed74400f2")
+	)
+	(text "+0"
+		(exclude_from_sim no)
+		(at 74.295 60.325 0)
+		(effects
+			(font
+				(size 1.27 1.27)
+			)
+		)
+		(uuid "53521eec-55dd-4472-842d-ad390cac35e7")
+	)
+	(text "+5"
+		(exclude_from_sim no)
+		(at 40.64 54.61 0)
+		(effects
+			(font
+				(size 1.27 1.27)
+			)
+		)
+		(uuid "8e7cbd78-89f3-4a99-8a67-b1d5a688e5e5")
+	)
+	(text "+7"
+		(exclude_from_sim no)
+		(at 40.64 52.07 0)
+		(effects
+			(font
+				(size 1.27 1.27)
+			)
+		)
+		(uuid "993261e6-324a-4226-b33d-8d8ac6fa01f8")
+	)
+	(text "+6"
+		(exclude_from_sim no)
+		(at 74.295 52.07 0)
+		(effects
+			(font
+				(size 1.27 1.27)
+			)
+		)
+		(uuid "be36cb8f-1225-4efd-951c-34f88c4a1c24")
+	)
+	(text "+4"
+		(exclude_from_sim no)
+		(at 74.295 55.245 0)
+		(effects
+			(font
+				(size 1.27 1.27)
+			)
+		)
+		(uuid "c27cef4d-690c-48c0-82f2-0310b63af31b")
+	)
+	(text "+2"
+		(exclude_from_sim no)
+		(at 74.295 57.785 0)
+		(effects
+			(font
+				(size 1.27 1.27)
+			)
+		)
+		(uuid "dc62684c-ae94-4425-81b1-dc9c99be7d30")
+	)
 	(junction
 		(at 88.9 38.1)
 		(diameter 0)

Hardware/Expansions/PS2 Input/firmware.propan

@@ -9,9 +9,9 @@ const PS2_TX_WORD_SIZE = 12 // 1 Start + 8 Data + 1 Parity + 1 Stop + 1 Acknowle
 // Number of cpu clocks until a true timeout is detected
 const PS2_BIT_RCV_TIMEOUT_TICKS = ticks(CLK, us=2500) 
 
-const USART_RX_MODE      = P_TRUE_A|P_LOCAL_A|P_INVERT_B|P_PLUS2_B|P_PASS_AB|P_LOGIC_A|P_SYNC_IO|P_TRUE_IN|P_TRUE_OUTPUT|P_HIGH_FLOAT|P_LOW_FAST|P_TT_10|P_SYNC_RX
-const CLOCK_TIMEOUT_MODE = P_TRUE_A|P_LOCAL_A|P_PASS_AB|P_LOGIC_A|P_SYNC_IO|P_TRUE_IN|P_TRUE_OUTPUT|P_HIGH_FLOAT|P_LOW_FAST|P_TT_00|P_EVENTS_TICKS
-const OPEN_DRAIN_MODE    = P_TRUE_A|P_LOCAL_A|P_TRUE_B|P_LOCAL_A|P_PASS_AB|P_LOGIC_A|P_SYNC_IO|P_TRUE_IN|P_TRUE_OUTPUT|P_HIGH_FLOAT|P_LOW_FAST|P_TT_00|P_NORMAL
+const USART_RX_MODE      = P_TRUE_A | P_LOCAL_A | P_INVERT_B | P_PLUS1_B | P_PASS_AB | P_LOGIC_A | P_SYNC_IO | P_TRUE_IN | P_TRUE_OUTPUT | P_HIGH_FLOAT | P_LOW_FAST | P_TT_10 | P_SYNC_RX
+const CLOCK_TIMEOUT_MODE = P_TRUE_A | P_LOCAL_A | P_PASS_AB  | P_LOGIC_A | P_SYNC_IO | P_TRUE_IN | P_TRUE_OUTPUT | P_HIGH_FLOAT | P_LOW_FAST | P_TT_00 | P_EVENTS_TICKS
+const OPEN_DRAIN_MODE    = P_TRUE_A | P_LOCAL_A | P_TRUE_B   | P_LOCAL_A | P_PASS_AB | P_LOGIC_A | P_SYNC_IO | P_TRUE_IN |  P_TRUE_OUTPUT | P_HIGH_FLOAT | P_LOW_FAST | P_TT_00 | P_NORMAL
 
 const RTS_DELAY_TICKS = ticks(CLK, us=100)
 
@@ -45,10 +45,10 @@ entry:
   COGID PS2_DAT
   SUB   PS2_DAT, 1 // subtract 1 as we're using pins 0...7 with module 1
   SHL   PS2_DAT, 3 // multiply with 8 to get base pin
-  ADD   PS2_DAT, 4 // 32 => 36
+  ADD   PS2_DAT, 0 // 32 => 36
 
   MOV   PS2_CLK, PS2_DAT
-  ADD   PS2_CLK, 2 // 36 => 38
+  ADD   PS2_CLK, 1 // 32 => 33
 
   CALL setup_rx_mode
 

Hardware/Expansions/justfile

@@ -16,7 +16,7 @@ compile-expansion folder pid:
     {{root_dir}}/Scripts/ExpCard.py \
         --output "{{folder}}/eeprom.json" \
         "{{vendor_id}}" "{{pid}}" "{{dummy_serial}}"
-    
+
     [ -f "{{folder}}/firmware.propan" ] && propan \
         --output "{{folder}}/firmware.bin" \
         --format flat \
@@ -29,7 +29,7 @@ compile-expansion folder pid:
     [ -f "{{folder}}/firmware.propan" ] || ashet-exp encode \
         --output "{{folder}}/eeprom.bin" \
         "{{folder}}/eeprom.json" || true 
-    
+
     [ -f "{{folder}}/eeprom.json" ]
 
     hexdump -C "{{folder}}/eeprom.bin" \

Hardware/Expansions/program.py

@@ -0,0 +1,61 @@
+#!/usr/bin/env python3
+
+import sys 
+
+from os import stat_result
+
+from argparse import ArgumentParser
+from pathlib import Path 
+
+LEGAL_DISK_SIZES: frozenset[int] = frozenset((4096, 8192, 16384))
+
+def main() -> int:
+
+    parser = ArgumentParser()
+    parser.add_argument("image", type=Path)
+    parser.add_argument("--disk", type=Path, default=Path("/dev/sda"), required=False)
+
+    args = parser.parse_args()
+
+    image_path: Path = args.image
+    disk_path :Path = args.disk
+
+    image: bytes = image_path.read_bytes()
+
+    sys_dir: Path = Path("/sys/class/block/") / disk_path.name
+    assert sys_dir.is_dir(), f"{sys_dir.as_posix()!r} is not a directory"
+
+    def get_sysfs(key: str) -> str:
+        return (sys_dir / key).read_text('utf-8').strip()
+
+    dev_type = get_sysfs("device/model")
+    if dev_type != "EEPROM2FS":
+        print(f"Unexpected disk type. Expected {'EEPROM2FS'!r}, but found {dev_type!r}", file=sys.stderr)
+        return 1
+
+    block_count = int(get_sysfs("size"))
+    disk_size = 512 * block_count
+
+    if disk_size not in LEGAL_DISK_SIZES:
+        print(f"Unexpected disk size {disk_size}. Expected one of {sorted(LEGAL_DISK_SIZES)}", file=sys.stderr)
+        return 1
+    
+    print("Writing image file...")
+    with disk_path.open("rb+") as disk:
+        disk.write(image)
+        disk.flush()
+
+    print("Validating image file...")
+    with disk_path.open("rb") as disk:
+        check = disk.read(len(image))
+        if image != check:
+            print("Failed to write image!.", file=sys.stderr)
+            return 1
+        
+    print("Success!")
+
+    return 0
+
+
+if __name__ == "__main__":
+    sys.exit(main())