From a67ba8d52f04fc74d90f1885325f76cec04546f4 Mon Sep 17 00:00:00 2001
From: Selene ToyKeeper
Date: Wed, 28 Aug 2019 02:28:01 -0600
Subject: added arbitrary ramp shape powers to level_calc.py, to more easily
 hit specific values

---
 bin/level_calc.py | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

(limited to 'bin/level_calc.py')

diff --git a/bin/level_calc.py b/bin/level_calc.py
index f16f8ce..6f07621 100755
--- a/bin/level_calc.py
+++ b/bin/level_calc.py
@@ -14,7 +14,7 @@ def main(args):
     """
     # Get parameters from the user
     questions_main = [
-            (str, 'ramp_shape', 'cube', 'Ramp shape? [cube, square, fifth, seventh, ninth, log]'),
+            (str, 'ramp_shape', 'cube', 'Ramp shape? [cube, square, fifth, seventh, ninth, log, N.NN]'),
             (int, 'num_channels', 1, 'How many power channels?'),
             (int, 'num_levels', 4, 'How many total levels do you want?'),
             ]
@@ -179,11 +179,19 @@ shapes = dict(
         )
 
 def power(x):
-    return shapes[ramp_shape][0](x)
+    try:
+        factor = float(ramp_shape)
+        return math.pow(x, factor)
+    except ValueError:
+        return shapes[ramp_shape][0](x)
 
 
 def invpower(x):
-    return shapes[ramp_shape][1](x)
+    try:
+        factor = float(ramp_shape)
+        return math.pow(x, 1.0 / factor)
+    except ValueError:
+        return shapes[ramp_shape][1](x)
 
 
 def input_text():
-- 
cgit v1.2.3


From 5cde301fc1ae3f297804c93a2528ab4a79a5f6cd Mon Sep 17 00:00:00 2001
From: Selene ToyKeeper
Date: Sun, 15 Sep 2019 15:35:29 -0600
Subject: level_calc.py: note the highest level for each channel before the
 next channel starts,   so it'll be easier to identify the channel transition
 points

---
 bin/level_calc.py | 10 ++++++++++
 1 file changed, 10 insertions(+)

(limited to 'bin/level_calc.py')

diff --git a/bin/level_calc.py b/bin/level_calc.py
index f16f8ce..f1e7d16 100755
--- a/bin/level_calc.py
+++ b/bin/level_calc.py
@@ -152,6 +152,16 @@ def multi_pwm(answers, channels):
                 (cnum+1,
                  ','.join([str(int(round(i))) for i in channel.modes])))
 
+    # Show highest level for each channel before next channel starts
+    for cnum, channel in enumerate(channels[:-1]):
+        prev = 0
+        i = 1
+        while (i < answers.num_levels) \
+                and (channel.modes[i] >= channel.modes[i-1]) \
+                and (channels[cnum+1].modes[i] == 0):
+            i += 1
+        print('Ch%i max: %i (%.2f/255)' % (cnum, i, channel.modes[i-1]))
+
 
 def get_value(text, default, args):
     """Get input from the user, or from the command line args."""
-- 
cgit v1.2.3