From d03d49ac44dcec2172feb34c38a4fd6c90f0f249 Mon Sep 17 00:00:00 2001
From: jn <jn@ccc.ac>
Date: Thu, 2 Feb 2023 03:48:48 +0100
Subject: [PATCH] Move scancode-to-ASCII conversion into the terminal

---
 applications/sh/main.asm       | 7 +++----
 applications/terminal/main.asm | 1 +
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/applications/sh/main.asm b/applications/sh/main.asm
index c743c33..839a8dc 100644
--- a/applications/sh/main.asm
+++ b/applications/sh/main.asm
@@ -21,11 +21,11 @@ shell_task_loop:
 
 shell_task_parse_key:
     ; first, check if enter, delete, or backspace was pressed
-    cmp.8 r0, 0x1C ; enter
+    cmp.8 r0, 0x0a ; enter
     ifz jmp shell_key_down_enter
-    cmp.8 r0, 0x6F ; delete
+    cmp.8 r0, 0x7f ; delete
     ifz jmp shell_key_down_backspace
-    cmp.8 r0, 0x0E ; backspace
+    cmp.8 r0, 0x08 ; backspace
     ifz jmp shell_key_down_backspace
 
     ; then, overwrite the cursor
@@ -35,7 +35,6 @@ shell_task_parse_key:
     mov r0, r1
 
     ; then, add it to the text buffer and print it to the screen
-    call scancode_to_ascii
     call print_character_to_terminal
     call shell_push_character
 
diff --git a/applications/terminal/main.asm b/applications/terminal/main.asm
index 34e57dc..ae160a9 100644
--- a/applications/terminal/main.asm
+++ b/applications/terminal/main.asm
@@ -67,6 +67,7 @@ key_down:
     ifz push event_loop_end
     ifz jmp caps_pressed
 
+    call scancode_to_ascii
     mov.8 [read_buffer], r0
 
     jmp event_loop_end