From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Tue, 30 Dec 2014 21:42:51 +0000 (+0000)
Subject: knifeblock: abstract away $nknives (nfc)
X-Git-Tag: filamentspool-v2-release~284
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=reprap-play.git;a=commitdiff_plain;h=592784ed37ec57de0a94e8ead8f9420f0e555f36

knifeblock: abstract away $nknives (nfc)
---

diff --git a/knifeblock-knives-filter b/knifeblock-knives-filter
index a5bee25..bb832cf 100755
--- a/knifeblock-knives-filter
+++ b/knifeblock-knives-filter
@@ -5,6 +5,8 @@ use POSIX;
 
 our %want;
 
+our $nknives = 3;
+
 our @part_order = qw(h b l);
 
 my $want = shift @ARGV;
@@ -12,9 +14,9 @@ my ($wknife,$wparts) = $want =~ m/^(\d)([a-z]+)$/ or die;
 
 sub want ($) {
     my ($colournum) = @_;
-    my $knife = ($colournum-1) % 3;
+    my $knife = ($colournum-1) % $nknives;
     return 0 unless $knife == $wknife;
-    my $part = $part_order[ floor(($colournum-1) / 3) ];
+    my $part = $part_order[ floor(($colournum-1) / $nknives) ];
     die "huh colour $colournum?" unless defined $part;
     return 0 unless $part =~ m/[$wparts]/o;
     print STDERR "$0: including colour $colournum ($knife $part)\n";