From 955a978803896df1c5d1f5e3aa3d9865daa70251 Mon Sep 17 00:00:00 2001
From: Jarno Lehtinen <lehtinen@sci.fi>
Date: Tue, 26 Mar 2019 17:29:01 +0200
Subject: [PATCH] Update C64_matrix.sc

---
 C64_keyboard/C64_matrix.sc | 41 ++++++++++++++++++--------------------
 1 file changed, 19 insertions(+), 22 deletions(-)

diff --git a/C64_keyboard/C64_matrix.sc b/C64_keyboard/C64_matrix.sc
index 7b09957..55d94dc 100644
--- a/C64_keyboard/C64_matrix.sc
+++ b/C64_keyboard/C64_matrix.sc
@@ -9,41 +9,38 @@ matrix
 	debounce 5
 	blocking 1
 
-	sense			PB6		PB2		PB3		PB1		PF7		PF6		PF5		PF4	PD3
-	strobe	PD1		1		BACK_QUOTE	TAB		ESC		SPACE		LCTRL		Q		2	UNASSIGNED
-	strobe	PD0		3		W		A		LSHIFT		Z		S		E		4	UNASSIGNED
-	strobe	PD4		5		R		D		X		C		F		T		6	UNASSIGNED
-	strobe	PC6		7		Y		G		V		B		H		U		8	UNASSIGNED
-	strobe	PD7		9		I		J		N		M		K		O		0	UNASSIGNED
-	strobe	PE6		MINUS		P		L		COMMA		PERIOD		SEMICOLON	LEFT_BRACE	EQUAL	UNASSIGNED
-	strobe	PB4		INSERT		RIGHT_BRACE	QUOTE		SLASH		RSHIFT		BACKSLASH	DELETE		HOME	PAGE_UP
-	strobe	PB5		BACKSPACE	ENTER		RIGHT		DOWN		F1		F3		F5		F7	UNASSIGNED
+	sense		PB6		PB2		PB3		PB1		PF7		PF6		PF5		PF4	PD3
+	strobe	PD1	1		BACK_QUOTE	TAB		ESC		SPACE		LCTRL		Q		2	UNASSIGNED
+	strobe	PD0	3		W		A		LSHIFT		Z		S		E		4	UNASSIGNED
+	strobe	PD4	5		R		D		X		C		F		T		6	UNASSIGNED
+	strobe	PC6	7		Y		G		V		B		H		U		8	UNASSIGNED
+	strobe	PD7	9		I		J		N		M		K		O		0	UNASSIGNED
+	strobe	PE6	MINUS		P		L		COMMA		PERIOD		SEMICOLON	LEFT_BRACE	EQUAL	UNASSIGNED
+	strobe	PB4	INSERT		RIGHT_BRACE	QUOTE		SLASH		RSHIFT		BACKSLASH	DELETE		HOME	PAGE_UP
+	strobe	PB5	BACKSPACE	ENTER		RIGHT		DOWN		F1		F3		F5		F7	UNASSIGNED
 end
 
 # arrow left = BACK_QUOTE (section/fraction)
-# pound = INSERT
+# pound (£) = INSERT
 # restore = PAGE_UP
 # run/stop = ESC
 # commodore = LCTRL
 # arrow up = DELETE
-# asterisk = RIGHT_BRACE
-# minus = EQUAL
-# plus = MINUS
-# at '@' = LEFT_BRACE
+# asterisk (*) = RIGHT_BRACE
+# minus (-) = EQUAL
+# plus (+) = MINUS
+# at (@) = LEFT_BRACE
 # ctrl = TAB
 # lshift = LSHIFT
 # rshift = RSHIFT
-# equal = BACKSLASH
-# colon = SEMICOLON
-# semicolon = QUOTE
+# equal (=) = BACKSLASH
+# colon (:) = SEMICOLON
+# semicolon (;) = QUOTE
 
 macroblock
-	macro F7 LCTRL				# C= + F7 = F12
-		PUSH_META CLEAR_META ALL
+	macro F7 SHIFT		# SHIFT + F7 = F12
 		PRESS F12
-		POP_ALL_META
+		CLEAR_ALL
 	endmacro
 endblock
 
-# +,- ja £, * ja @ shiftillä
-#