From 461b0572d9a1ee7776f973dbf15e42d1eef76d73 Mon Sep 17 00:00:00 2001 From: Henry Bucklow Date: Sat, 24 Jul 2021 23:00:00 +0100 Subject: Fixed use of rotate() when generating keycaps on carbonfet layout. --- src/dactyl_manuform.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/dactyl_manuform.py b/src/dactyl_manuform.py index 69098e6..2a22f25 100644 --- a/src/dactyl_manuform.py +++ b/src/dactyl_manuform.py @@ -1147,7 +1147,7 @@ def carbonfet_thumb_15x_layout(shape, plate=True): def carbonfet_thumbcaps(): t1 = carbonfet_thumb_1x_layout(sa_cap(1)) - t15 = carbonfet_thumb_15x_layout(rotate(sa_cap(1.5), pi / 2, [0, 0, 1])) + t15 = carbonfet_thumb_15x_layout(rotate(sa_cap(1.5), [0, 0, rad2deg(pi / 2)])) return t1.add(t15) -- cgit v1.2.3 From a8dfa64eb72e8d1ba216142fade8ca89effe326f Mon Sep 17 00:00:00 2001 From: Henry Bucklow Date: Sat, 24 Jul 2021 23:15:01 +0100 Subject: Fixed use of rotate() when generating keycaps on mini layout. --- src/dactyl_manuform.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/dactyl_manuform.py b/src/dactyl_manuform.py index 2a22f25..255372d 100644 --- a/src/dactyl_manuform.py +++ b/src/dactyl_manuform.py @@ -910,7 +910,7 @@ def mini_thumb_15x_layout(shape): def mini_thumbcaps(): t1 = mini_thumb_1x_layout(sa_cap(1)) - t15 = mini_thumb_15x_layout(rotate(sa_cap(1), pi / 2, [0, 0, 1])) + t15 = mini_thumb_15x_layout(rotate(sa_cap(1), [0, 0, rad2deg(pi / 2)])) return t1.add(t15) -- cgit v1.2.3 From 56c1d0b38702372b8cf35c6bf3ec3b0e3b00b62c Mon Sep 17 00:00:00 2001 From: Henry Bucklow Date: Sun, 25 Jul 2021 10:12:16 +0100 Subject: Allow oled_mount_type to be "NONE" as well as None. This makes it possible to remove the OLED mount from the .json file. --- src/dactyl_manuform.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/dactyl_manuform.py b/src/dactyl_manuform.py index 255372d..283bbab 100644 --- a/src/dactyl_manuform.py +++ b/src/dactyl_manuform.py @@ -69,7 +69,7 @@ def debugprint(info): print(info) -if oled_mount_type is not None: +if oled_mount_type is not None and oled_mount_type != "NONE": for item in oled_configurations[oled_mount_type]: locals()[item] = oled_configurations[oled_mount_type][item] @@ -104,7 +104,7 @@ mount_height = keyswitch_height + 2 * plate_rim mount_thickness = plate_thickness double_plate_height = (sa_double_length - mount_height) / 3 -if oled_mount_type is not None: +if oled_mount_type is not None and oled_mount_type != "NONE": left_wall_x_offset = oled_left_wall_x_offset_override left_wall_z_offset = oled_left_wall_z_offset_override -- cgit v1.2.3