diff options
| author | Joshua Shreve <j.a.shreve@gmail.com> | 2021-07-25 21:44:42 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-07-25 21:44:42 -0400 |
| commit | e01ad9e719fe65d55326b27430dd72967576e301 (patch) | |
| tree | 57b1331664f7567cd0807cd7b459b98b57a419c1 | |
| parent | 0456cbbf49c195842d3420fa540a7965a9e35697 (diff) | |
| parent | bef669da28b97dbb1f96cb5950b42bdd293863e4 (diff) | |
Merge pull request #13 from sffubs/master
Fixed stacktraces when using different thumb layouts, and when disabling OLED.
| -rw-r--r-- | src/dactyl_manuform.py | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/dactyl_manuform.py b/src/dactyl_manuform.py index 1d4f87c..3948c98 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] @@ -108,7 +108,7 @@ if default_1U_cluster: else: double_plate_height = (.95*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 left_wall_lower_y_offset = oled_left_wall_lower_y_offset @@ -988,7 +988,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) @@ -1225,7 +1225,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) |