Merge pull request #164 from alpha-cactus/master

DEL.X / DEL.R ops

CHANGELOG.md

@@ -4,6 +4,9 @@
 
 - **NEW**: new op: DEVICE.FLIP
 - **FIX**: [some keyboards losing keystrokes](https://github.com/monome/teletype/issues/156)
+- **NEW**: new op: DEL.X
+- **NEW**: new op: DEL.R
+- **IMP**: DELAY_SIZE increased to 16 from 8
 
 ## v3.0
 

docs/ops/delay.toml

@@ -3,7 +3,7 @@ prototype = "DEL x: ..."
 short = "Delay command by `x` ms"
 description = """
 Delay the command following the colon by `x` ms by placing it into a buffer. 
-The buffer can hold up to 8 commands. If the buffer is full, additional commands
+The buffer can hold up to 16 commands. If the buffer is full, additional commands
 will be discarded.
 """
 ["DEL.CLR"]
@@ -12,3 +12,19 @@ short = "Clear the delay buffer"
 description = """
 Clear the delay buffer, cancelling the pending commands.
 """
+["DEL.X"]
+prototype = "DEL.X x y: ..."
+short = "Queue 'x' delayed commands at 'y' ms intervals"
+description = """
+Delay the command following the colon 'x' times at intervals of `y` ms by placing it into a buffer. 
+The buffer can hold up to 16 commands. If the buffer is full, additional commands
+will be discarded.
+"""
+["DEL.R"]
+prototype = "DEL.R x y: ..."
+short = "Trigger '1' command immediately, and queue 'x' minus '1' delayed commands at 'y' ms intervals"
+description = """
+Delay the command following the colon once immediately, and 'x' minus '1' times at intervals of `y` ms by placing it into a buffer. 
+The buffer can hold up to 16 commands. If the buffer is full, additional commands
+will be discarded.
+"""

src/match_token.rl

@@ -586,6 +586,8 @@
         # delay
         "PROB"        => { MATCH_MOD(E_MOD_PROB); };
         "DEL"         => { MATCH_MOD(E_MOD_DEL); };
+        "DEL.X"       => { MATCH_MOD(E_MOD_DEL_X); };
+        "DEL.R"       => { MATCH_MOD(E_MOD_DEL_R); };
 
         # matrixarchate
         "MA.SELECT"   => { MATCH_OP(E_OP_MA_SELECT); };

src/ops/delay.c

@@ -4,41 +4,117 @@
 #include "teletype.h"
 #include "teletype_io.h"
 
+static bool delay_common_add(scene_state_t *ss, exec_state_t *es,
+                             int16_t delay_time,
+                             const tele_command_t *post_command);
+
 static void mod_DEL_func(scene_state_t *ss, exec_state_t *es,
                          command_state_t *cs,
                          const tele_command_t *post_command);
 
 static void op_DEL_CLR_get(const void *data, scene_state_t *ss,
                            exec_state_t *es, command_state_t *cs);
 
+static void mod_DEL_X_func(scene_state_t *ss, exec_state_t *es,
+                           command_state_t *cs,
+                           const tele_command_t *post_command);
+
+static void mod_DEL_R_func(scene_state_t *ss, exec_state_t *es,
+                           command_state_t *cs,
+                           const tele_command_t *post_command);
 
 const tele_mod_t mod_DEL = MAKE_MOD(DEL, mod_DEL_func, 1);
 const tele_op_t op_DEL_CLR = MAKE_GET_OP(DEL.CLR, op_DEL_CLR_get, 0, false);
+const tele_mod_t mod_DEL_X = MAKE_MOD(DEL.X, mod_DEL_X_func, 2);
+const tele_mod_t mod_DEL_R = MAKE_MOD(DEL.R, mod_DEL_R_func, 2);
 
-static void mod_DEL_func(scene_state_t *ss, exec_state_t *es,
-                         command_state_t *cs,
-                         const tele_command_t *post_command) {
+// common code to queue a delay shared between all delay ops
+// NOTE it is the responsibility of the callee to call tele_has_delays
+static bool delay_common_add(scene_state_t *ss, exec_state_t *es,
+                             int16_t delay_time,
+                             const tele_command_t *post_command) {
     int16_t i = 0;
-    int16_t a = cs_pop(cs);
-
-    if (a < 1) a = 1;
 
     // 0 is the magic number for an empty slot.
     // Be careful not to set delay.time[i] to 0 before calling this function.
     while (ss->delay.time[i] != 0 && i != DELAY_SIZE) i++;
 
+    if (delay_time < 1) delay_time = 1;
+
     if (i < DELAY_SIZE) {
         ss->delay.count++;
-        ss->delay.time[i] = a;
+        ss->delay.time[i] = delay_time;
         ss->delay.origin_script[i] = es_variables(es)->script_number;
         ss->delay.origin_i[i] = es_variables(es)->i;
         copy_command(&ss->delay.commands[i], post_command);
-        tele_has_delays(ss->delay.count > 0);
+
+        return true;
     }
+
+    return false;
+}
+
+static void mod_DEL_func(scene_state_t *ss, exec_state_t *es,
+                         command_state_t *cs,
+                         const tele_command_t *post_command) {
+    int16_t delay_time = cs_pop(cs);
+
+    delay_common_add(ss, es, delay_time, post_command);
+    tele_has_delays(ss->delay.count > 0);
 }
 
 static void op_DEL_CLR_get(const void *NOTUSED(data), scene_state_t *ss,
                            exec_state_t *NOTUSED(es),
                            command_state_t *NOTUSED(cs)) {
     clear_delays(ss);
 }
+
+static void mod_DEL_X_func(scene_state_t *ss, exec_state_t *es,
+                           command_state_t *cs,
+                           const tele_command_t *post_command) {
+    int16_t num_delays = cs_pop(cs);
+    int16_t delay_time = cs_pop(cs);
+    int16_t delay_time_next;
+
+    if (delay_time < 1) delay_time = 1;
+
+    // set first delay time to delay time
+    delay_time_next = delay_time;  
+
+    while ( num_delays > 0 && delay_common_add(ss, es, delay_time_next, post_command) ) 
+    {
+        // increment delay time for next delay
+        // normalise incremented value to stop negative wrap from increment
+        delay_time_next += delay_time;
+        delay_time_next = normalise_value(1, 32767, 1, delay_time_next);
+
+        num_delays--;
+    }
+
+    tele_has_delays(ss->delay.count > 0);
+}
+
+static void mod_DEL_R_func(scene_state_t *ss, exec_state_t *es,
+                           command_state_t *cs,
+                           const tele_command_t *post_command) {
+    int16_t num_delays = cs_pop(cs);
+    int16_t delay_time = cs_pop(cs);
+    int16_t delay_time_next;
+
+    if (delay_time < 1) delay_time = 1;
+
+    // set first delay time to 1ms to trigger immediately
+    delay_time_next = 1;  
+
+    while ( num_delays > 0 && delay_common_add(ss, es, delay_time_next, post_command) )
+    {
+        // increment delay time for next delay
+        // normalise incremented value to stop negative wrap from increment
+        delay_time_next += delay_time;
+        delay_time_next = normalise_value(1, 32767, 1, delay_time_next);
+
+        num_delays--;
+    }
+
+    tele_has_delays(ss->delay.count > 0);
+}

src/ops/delay.h

@@ -5,5 +5,7 @@
 
 extern const tele_mod_t mod_DEL;
 extern const tele_op_t op_DEL_CLR;
+extern const tele_mod_t mod_DEL_X;
+extern const tele_mod_t mod_DEL_R;
 
 #endif

src/ops/op.c

@@ -212,7 +212,7 @@ const tele_mod_t *tele_mods[E_MOD__LENGTH] = {
     &mod_OTHER, &mod_PROB,
 
     // delay
-    &mod_DEL,
+    &mod_DEL, &mod_DEL_X, &mod_DEL_R,
 
     // stack
     &mod_S

src/ops/op_enum.h

@@ -526,6 +526,8 @@ typedef enum {
     E_MOD_OTHER,
     E_MOD_PROB,
     E_MOD_DEL,
+    E_MOD_DEL_X,
+    E_MOD_DEL_R,
     E_MOD_S,
     E_MOD__LENGTH,
 } tele_mod_idx_t;

src/state.h

@@ -16,7 +16,7 @@
 #define Q_LENGTH 64
 #define TR_COUNT 4
 #define TRIGGER_INPUTS 8
-#define DELAY_SIZE 8
+#define DELAY_SIZE 16
 #define STACK_OP_SIZE 16
 #define PATTERN_COUNT 4
 #define PATTERN_LENGTH 64