From 8ac92eca2c4a55a100d15a6e13e93eb6b81b9041 Mon Sep 17 00:00:00 2001
From: Ricardo Band <email@ricardo.band>
Date: Thu, 3 Feb 2022 21:31:41 +0100
Subject: [PATCH] rendering works

---
 .gitignore        |  4 ++--
 mkbd65/config.ini | 26 +++++++++++++-------------
 mkbd65/main.py    | 14 ++++++++------
 mkbd65/util.py    |  6 +++---
 4 files changed, 26 insertions(+), 24 deletions(-)

diff --git a/.gitignore b/.gitignore
index 9f6975c..39e5007 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,8 +1,8 @@
 .idea/
 
-*gcode
+*.gcode
 *.stl
-*.amf
+*.3mf
 *.scad
 __pycache__/
 *.pyc
diff --git a/mkbd65/config.ini b/mkbd65/config.ini
index 4444281..9d7ba32 100644
--- a/mkbd65/config.ini
+++ b/mkbd65/config.ini
@@ -1,14 +1,14 @@
 [oneplus_8t]
-phone_width=160.7
-phone_height=74.1
-phone_thickness=8.4
-phone_corner_radius=10
-phone_side_radius=5
-key_mat_margin=1
-key_mat_padding=1
-key_mat_thickness=0.5
-key_mat_key_width=9
-key_mat_key_height=6
-key_mat_key_corner_radius=1
-key_mat_key_thickness=2
-key_mat_font=DejaVu Sans:style=Bold
\ No newline at end of file
+phone_width = 160.7
+phone_height = 74.1
+phone_thickness = 8.4
+phone_corner_radius = 10
+phone_side_radius = 5
+key_mat_margin = 1
+key_mat_padding = 1
+key_mat_thickness = 0.5
+key_mat_key_width = 9
+key_mat_key_height = 6
+key_mat_key_corner_radius = 1
+key_mat_key_thickness = 2
+key_mat_font = DejaVu Sans:style=Bold
diff --git a/mkbd65/main.py b/mkbd65/main.py
index c4ccf61..d61ae3b 100755
--- a/mkbd65/main.py
+++ b/mkbd65/main.py
@@ -1,6 +1,8 @@
+#!/usr/bin/env python3
 """
 All sizes are in millimeters.
 """
+
 import sys
 from subprocess import run
 from configparser import ConfigParser
@@ -8,12 +10,13 @@ from configparser import ConfigParser
 from solid import scad_render_to_file
 
 from key_mat import key_mat
+
 from phone import phone
 
 
 def main(device: str = "oneplus_8t", layout: str = "ansi"):
     config = ConfigParser()
-    config.read_file("config.ini")
+    config.read("config.ini")
 
     if not config.has_section(device):
         sys.exit(f"{device} not found in config.ini")
@@ -45,22 +48,21 @@ def main(device: str = "oneplus_8t", layout: str = "ansi"):
             component[1],
             filepath=f"mkbd65_{component[0]}.scad",
             file_header=f'$fn = 64;',
-            include_orig_code=True
+            include_orig_code=False
         )
         print(f"Generate STL for component {component[0]}...")
         run(["openscad", "-o", f"mkbd65_{component[0]}.stl", f"mkbd65_{component[0]}.scad"])
         print(f"Generate 3MF for component {component[0]}...")
         run(["openscad", "-o", f"mkbd65_{component[0]}.3mf", f"mkbd65_{component[0]}.scad"])
 
-
     # obj_all = obj_phone + obj_key_mat
     # scad_render_to_file(obj_all, filepath="mkbd65.scad", file_header=f'$fn = 64;', include_orig_code=True)
 
 
 if __name__ == "__main__":
-    if "-h" in sys.argv or "--help" in sys.argv:
+    if "-h" in sys.argv or "--help" in sys.argv or len(sys.argv) < 2:
         print("Usage:")
         print("  ./main.py <PHONE> [LAYOUT]\n")
         print("Layout can be ANSI or ISO.")
-
-    main(device=sys.argv[1])
+    else:
+        main(device=sys.argv[1])
diff --git a/mkbd65/util.py b/mkbd65/util.py
index b9d0c18..fa586bf 100644
--- a/mkbd65/util.py
+++ b/mkbd65/util.py
@@ -6,15 +6,15 @@ FILAMENT_LAYER = 0.1
 LAYOUTS = {
     "ansi": [
         ["Esc", "1", "2", "3", "4", "5", "6", "7", "8", "9", "0", "Bksp", None],
-        ["Q", "W", "E", "R", "T", "Y", "U", "I", "O", "P", "[", "]", "\\"],
-        ["A", "S", "D", "F", "G", "H", "J", "K", "L", ";", "\"", "Enter", None],
+        ["Q", "W", "E", "R", "T", "Y", "U", "I", "O", "P", "[", "]", "\\\\"],
+        ["A", "S", "D", "F", "G", "H", "J", "K", "L", ";", "\\\"", "Enter", None],
         ["Z", "X", "C", "V", "B", "N", "M", ",", ".", "/", "Up", "Shift", None],
         ["Ctrl", "Fn", "Shift", "Alt", "Space", None, None, "-", "=", "Left", "Down", "Right", "Ctrl"]
     ],
     "iso": [
         ["Esc", "1", "2", "3", "4", "5", "6", "7", "8", "9", "0", "Bksp", None],
         ["Q", "W", "E", "R", "T", "Y", "U", "I", "O", "P", "[", "]", "Ent"],
-        ["A", "S", "D", "F", "G", "H", "J", "K", "L", ";", "\"", "\\", None],
+        ["A", "S", "D", "F", "G", "H", "J", "K", "L", ";", "\\\"", "\\\\", None],
         ["Z", "X", "C", "V", "B", "N", "M", ",", ".", "/", "Up", "Shift", None],
         ["Ctrl", "Fn", "Shift", "Alt", "Space", None, None, "-", "=", "Left", "Down", "Right", "Ctrl"]
     ]