From 62e2ebe7ecad47fef02fd8f2a4173bdf9021b8a2 Mon Sep 17 00:00:00 2001
From: Ondrej Jirman <megous@megous.com>
Date: Tue, 31 Aug 2021 19:00:49 +0200
Subject: [PATCH] Fix keymap generator, drop prototype keymap

---
 keymaps/factory-keymap-megi.txt | 63 ---------------------------------
 keymaps/factory-keymap.txt      |  2 +-
 keymaps/map-to-c.php            |  2 +-
 3 files changed, 2 insertions(+), 65 deletions(-)
 delete mode 100644 keymaps/factory-keymap-megi.txt

diff --git a/keymaps/factory-keymap-megi.txt b/keymaps/factory-keymap-megi.txt
deleted file mode 100644
index b8dade0..0000000
--- a/keymaps/factory-keymap-megi.txt
+++ /dev/null
@@ -1,63 +0,0 @@
-# physical layout Row:Col -> KEY COMBO_KEY1 COMBO_KEY2
-# combo1 is using FN key, combo2 is using PINE key
-# see factory-keymap.jpg
-# https://elixir.bootlin.com/linux/latest/source/include/uapi/linux/input-event-codes.h#L76
-
-1:1  ESC
-1:2  1 LEFTSHIFT+BACKSLASH F1
-1:3  2 BACKSLASH F2
-1:4  3 DOLLAR F3    # pound, really, but who uses that? also it doesn't have a keycode in Linux
-1:5  4 EURO F4
-1:6  5 LEFTSHIFT+GRAVE F5
-1:7  6 GRAVE F6
-1:8  7 MINUS F7
-1:9  8 EQUAL F8
-1:10 9 LEFTSHIFT+MINUS F9
-1:11 0 PLUS F10
-1:12 BACKSPACE DELETE
-
-2:1  TAB
-2:2  Q
-2:3  W
-2:4  E
-2:5  R
-2:6  T
-2:7  Y Z
-2:8  U
-2:9  I
-2:10 O
-2:11 P
-2:12 ENTER
-
-3:1  LEFTMETA LEFTSHIFT+SYSRQ    # LEFTMETA = PINE key
-3:2  A
-3:3  S
-3:4  D
-3:5  F
-3:6  G
-3:7  H
-3:8  J
-3:9  K
-3:10 L
-3:11 SEMICOLON INSERT
-
-4:1  LEFTSHIFT
-4:2  Z
-4:3  X
-4:4  C LEFTCTRL
-4:5  V
-4:6  B
-4:7  N
-4:8  M
-4:9  COMMA HOME
-4:10 DOT UP
-4:11 SLASH END
-
-5:1  LEFTCTRL
-5:2  FN
-5:3  LEFTALT
-5:4  SPACE
-5:5  RIGHTALT
-5:6  APOSTROPHE LEFT
-5:7  LEFTBRACE DOWN
-5:8  RIGHTBRACE RIGHT
diff --git a/keymaps/factory-keymap.txt b/keymaps/factory-keymap.txt
index 0f49825..9d93c20 100644
--- a/keymaps/factory-keymap.txt
+++ b/keymaps/factory-keymap.txt
@@ -13,7 +13,7 @@
 1:8  7 MINUS F7
 1:9  8 EQUAL F8
 1:10 9 LEFTSHIFT+MINUS F9
-1:11 0 PLUS F10
+1:11 0 KPPLUS F10
 1:12 BACKSPACE DELETE
 
 2:1  TAB
diff --git a/keymaps/map-to-c.php b/keymaps/map-to-c.php
index 5fd3964..681e962 100644
--- a/keymaps/map-to-c.php
+++ b/keymaps/map-to-c.php
@@ -57,7 +57,7 @@ foreach (explode("\n", $kmap) as $ln) {
 		
 		for ($i = 0; $i < 3; $i++) {
 			$alt = $alts[$i] ?? null;
-			if (!$alt)
+			if ($alt === null)
 				break;
 
 			$keys = preg_split('#\+#', $alt, -1, PREG_SPLIT_NO_EMPTY);