remove unused qr code from wheel

diff --git a/3d-printables/wheel-data.scad b/3d-printables/wheel-data.scad
index 940228a82050b61680289bc8848668dd4276a317..7288895df8fc0f9c3da636fa2b77084d05e5be8d 100644 (file)
--- a/3d-printables/wheel-data.scad
+++ b/3d-printables/wheel-data.scad
@@ -9,13 +9,13 @@
 //  100 will make printing smooth
 $fn = 100;
 
-qr_size = 45;
-qr_height = 2;
+wheel_square_spoke_size = 45;
+wheel_square_spoke_thickness = 2;
 
 wall_width = 3;
 
 wheel_width = 9;
-wheel_radius = sqrt(2 * pow(qr_size / 2, 2)) + wall_width / 2;
+wheel_radius = sqrt(2 * pow(wheel_square_spoke_size / 2, 2)) + wall_width / 2;
 
 motor_shaft_radius = 3.7;
 motor_shaft_flat_width = 4.8;
@@ -57,64 +57,22 @@ module tread(wheel_radius, tread_radius) {
     translate([wheel_radius, 0]) {
       circle(tread_radius); } } }
 
-module wheel_black(radius,
-                   width,
-                   shaft_radius,
-                   shaft_flat_width,
-                   wall_width,
-                   tread_radius) {
-  color("black") {
-    difference() {
-      rim(radius, wall_width, width);
-      translate([0, 0, width / 2]) {
-        tread(radius, tread_radius); } }
-    linear_extrude(height = qr_height) {
-      difference() {
-        qr_black_flat();
-        mounting_screw_flat(); } }
-    translate([0, 0, qr_height]) {
-      motor_shaft_holder(shaft_radius,
-                         shaft_flat_width,
-                         wall_width,
-                         width - qr_height); } } }
-
-module wheel_white() {
-  color("white") {
-    linear_extrude(height = qr_height) {
-      difference() {
-        qr_white_flat();
-        mounting_screw_flat(); } } } }
-
 module wheel(radius,
              width,
              shaft_radius,
              shaft_flat_width,
              wall_width,
              tread_radius) {
-  wheel_black(radius,
-              width,
-              shaft_radius,
-              shaft_flat_width,
-              wall_width,
-              tread_radius);
-  wheel_white(); }
-
-module wheel_solid(radius,
-                   width,
-                   shaft_radius,
-                   shaft_flat_width,
-                   wall_width,
-                   tread_radius) {
   difference() {
     rim(radius, wall_width * 2, width);
     translate([0, 0, width / 2]) {
       tread(radius, tread_radius); } }
-  linear_extrude(height = qr_height) {
+  linear_extrude(height = wheel_square_spoke_thickness) {
     difference() {
-      square(qr_size, center = true);
+      square(wheel_square_spoke_size, center = true);
       mounting_screw_flat(); } }
-  translate([0, 0, qr_height]) {
+  translate([0, 0, wheel_square_spoke_thickness]) {
     motor_shaft_holder(shaft_radius,
                        shaft_flat_width,
                        wall_width,
-                       width - qr_height); } }
+                       width - wheel_square_spoke_thickness); } }

diff --git a/3d-printables/wheel.scad b/3d-printables/wheel.scad
index eee5dd1dd3ec2e892efe04a5b3906eee85bd2b45..656ae160816e5e8b302681ae6c287e035973b5bc 100644 (file)
--- a/3d-printables/wheel.scad
+++ b/3d-printables/wheel.scad
@@ -11,18 +11,9 @@ $fn = 100;
 
 include <wheel-data.scad>
 
-/*
 wheel(wheel_radius,
       wheel_width,
       motor_shaft_radius,
       motor_shaft_flat_width,
       wall_width,
       tread_radius);
-*/
-
-wheel_solid(wheel_radius,
-            wheel_width,
-            motor_shaft_radius,
-            motor_shaft_flat_width,
-            wall_width,
-            tread_radius);