Merge pull request #72 from perkowitz/mike/seq-release

Release version with new Seq module
perkowitz · Oct 12, 2019 · a7c3484 · a7c3484
2 parents 9a1aa78 + 242b5c9
commit a7c3484
Show file tree

Hide file tree

Showing 13 changed files with 147 additions and 99 deletions.
diff --git a/README.md b/README.md
@@ -26,6 +26,21 @@ here in Github, but also via [HuBoard](https://huboard.com/perkowitz/issho#/mile
 
 # Release notes
 
+## 2019-10-06 v1.0.7
+- Add control tracks to Seq module.
+- Use tap/press for selecting and toggling steps on note and control tracks.
+- Combined the GATE and VELOCITY editing modes in Seq, since tap/press allows both.
+- Finer control of value settings for velocity and controllers.
+- Add MONO mode to Seq, for sequencing monophonic melodies.
+- Moved outdated modules into a 'deprecated' package.  
+- Updated to java 12, updated Module reference.
+
+## 2018-10-14 v1.0.6
+- Fix hang on shutdown.
+- Step module goes into random mode while receiving a fill signal.
+- Updates from [s0len0id](https://github.com/s0len0id) for running on Windows.
+- Independent input and output MIDI settings. 
+
 ## 2017-11-26 v1.0.5
 - In Beatbox, combine jump and play modes into a single mode. Add momentary pitch control and measure clock.
 - In Shihai, a fill button that tells all Sessionizeable modules to play a fill.

diff --git a/doc/getting-started.md b/doc/getting-started.md
@@ -47,19 +47,19 @@ sequence data in the directory you run it from, so always run it from here.
 
 On a Pi, run it with this command:
 
-`> java -cp issho-1.0.6-shaded.jar net.perkowitz.issho.hachi.Hachi hachi-pi.json`
+`> java -cp issho-1.0.7-shaded.jar net.perkowitz.issho.hachi.Hachi hachi-pi.json`
 
 On a Mac:
 
-`> java -cp issho-1.0-6-shaded.jar net.perkowitz.issho.hachi.Hachi hachi-mac.json`
+`> java -cp issho-1.0-7-shaded.jar net.perkowitz.issho.hachi.Hachi hachi-mac.json`
 
 On Windows:
 * running the app
 
-`> java -cp issho-1.0.6-shaded.jar net.perkowitz.issho.hachi.Hachi <your-json-config>` 
+`> java -cp issho-1.0.7-shaded.jar net.perkowitz.issho.hachi.Hachi <your-json-config>` 
 * listing available midi devices:
 
-`> java -cp issho-1.0.6-shaded.jar net.perkowitz.issho.util.FindMidiDevices` 
+`> java -cp issho-1.0.7-shaded.jar net.perkowitz.issho.util.FindMidiDevices` 
 
 # Set up the Pi
 

diff --git a/doc/hachi/modules/seq-beat.png b/doc/hachi/modules/seq-beat.png
diff --git a/doc/hachi/modules/seq-control.png b/doc/hachi/modules/seq-control.png
diff --git a/doc/hachi/modules/seq-jump.png b/doc/hachi/modules/seq-jump.png
diff --git a/doc/hachi/modules/seq-mono.png b/doc/hachi/modules/seq-mono.png
diff --git a/doc/hachi/modules/seq.md b/doc/hachi/modules/seq.md
diff --git a/doc/hachi/modules/seq.png b/doc/hachi/modules/seq.png
diff --git a/hachi b/hachi
@@ -1,4 +1,4 @@
 #!/bin/sh
 
-java -cp target/issho-1.0.6-shaded.jar net.perkowitz.issho.hachi.Hachi $1
+java -cp target/issho-1.0.7-shaded.jar net.perkowitz.issho.hachi.Hachi $1
 
diff --git a/mem b/mem
@@ -1,4 +1,4 @@
 #!/bin/sh
 
-java -cp target/issho-1.0.6-shaded.jar net.perkowitz.issho.hachi.MemoryApp $1 $2
+java -cp target/issho-1.0.7-shaded.jar net.perkowitz.issho.hachi.MemoryApp $1 $2
 
diff --git a/pom.xml b/pom.xml
@@ -3,7 +3,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>net.perkowitz</groupId>
     <artifactId>issho</artifactId>
-    <version>1.0.6</version>
+    <version>1.0.7</version>
     <name>Issho</name>
 
     <properties>
@@ -41,7 +41,7 @@
         <dependency>
             <groupId>org.projectlombok</groupId>
             <artifactId>lombok</artifactId>
-            <version>1.16.8</version>
+            <version>1.18.8</version>
         </dependency>
 
         <dependency>
@@ -63,16 +63,15 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
-                <version>2.0.2</version>
+                <version>3.8.0</version>
                 <configuration>
-                    <source>1.8</source>
-                    <target>1.8</target>
+                    <release>12</release>
                 </configuration>
             </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-shade-plugin</artifactId>
-                <version>1.7.1</version>
+                <version>3.2.0</version>
                 <executions>
                     <execution>
                         <phase>package</phase>

diff --git a/src/main/java/net/perkowitz/issho/hachi/modules/seq/SeqModule.java b/src/main/java/net/perkowitz/issho/hachi/modules/seq/SeqModule.java
@@ -85,6 +85,7 @@ public SeqModule(Transmitter inputTransmitter, Receiver outputReceiver, Map<Inte
         this.seqDisplay.setMode(mode);
         this.filePrefix = filePrefix;
         this.settingsModule = new SettingsSubmodule(true, true, true, true);
+        this.tiesEnabled = (mode != BEAT);
         load(0);
     }
 

diff --git a/src/main/java/net/perkowitz/issho/hachi/modules/shihai/ShihaiModule.java b/src/main/java/net/perkowitz/issho/hachi/modules/shihai/ShihaiModule.java
@@ -12,6 +12,7 @@
 import net.perkowitz.issho.hachi.Sessionizeable;
 import net.perkowitz.issho.devices.GridControl;
 import net.perkowitz.issho.hachi.modules.*;
+import net.perkowitz.issho.hachi.modules.Module;
 
 import javax.sound.midi.Receiver;
 import javax.sound.midi.Transmitter;
@@ -27,7 +28,7 @@ public class ShihaiModule extends MidiModule implements Clockable {
 
     private static int[] tempos = new int[] { 128, 124, 120, 116, 112, 108, 100, 92 };
 
-    @Getter @Setter private Module[] modules;
+    @Getter private Module[] modules;
 
     private ShihaiDisplay shihaiDisplay;
     private SettingsSubmodule settingsModule;