Merge pull request #80 from chinenual/develop

Fix bug #79

DEVNOTES.md

@@ -0,0 +1,33 @@
+# Synergize
+
+When built for development, use cntl-D to toggle Chrome Developer Tools.
+
+# SYNHCS
+
+## Setup
+
+* compile interceptty 
+* install DOSBox
+* install Z80 emulator Z80MU
+* setup DOSBox config. add: 
+   ```
+   serial1=directserial realport:ttys002
+   mount C "/Users/tynor/Documents/DOSBox/SYNHCS"
+   mount A "/Users/tynor/Documents/DOSBox/SYNHCS/SYNHCS/CARTS"
+   mount B "/Users/tynor/Documents/DOSBox/SYNHCS/SYNHCS/VOICES/Internal"
+   C:
+   ```
+
+## run
+
+* run interceptty and take note of device it allocates.  after it starts ls -l /tmp/tty.proxy to find the pty to use for dosbox.  Edit the DOSBox preferences accordingly
+
+   ```
+   ~/src/3rdParty/interceptty/interceptty -v /dev/cu.usbserial-AL05OC8S /tmp/tty.proxy
+```
+
+* Start DOSBox
+* Start Z80MU
+* Start SYNHCS
+
+

RELEASE_NOTES.md

@@ -9,6 +9,13 @@ permalink: /docs/release-notes
 
 # Release Notes
 
+## 2.6.1
+
+* Fixes [issue #79](https://github.com/chinenual/synergize/issues/79):
+  semitone values for the oscillator HARM values were encoded
+  incorrectly.  "s1" was incorrectly displayed and interpreted for the
+  Synergy value meaning "s11", "s2" displayed for "s10", etc.
+
 ## 2.6.0
 
 * Adds the ability to convert the sequencer events from a SYN file into a MIDI file.  See

VERSION

@@ -1,2 +1,2 @@
-VERSION=2.6.0
+VERSION=2.6.1
 

docs/README.md

@@ -46,7 +46,7 @@ Download the release:
 See the [User Manual](voice-library.md) for sites where you can download the original DK/Mulogix voice library.
 
 ## Issues / Bugs / Feature Requests
- 
+
 Please report problems or suggest new features via a [github issue](https://github.com/chinenual/synergize/issues).  If you don't have a github account, send an email to "support at chinenual.com".
 
 

resources/app/static/js/viewVCE_voice.js

@@ -102,7 +102,9 @@ let viewVCE_voice = {
 		if (val == -12) {
 			newStr = "dc";
 		} else if (val < 0) {
-			newStr = "s" + (-val);
+		    	// bug#79:  -1 (ff)  -> s1, -2 (fe) -> s2
+		        // correct: -1 (ff) -> s11, -2 (fe) -> s10
+			newStr = "s" + (12 + val);
 		} else {
 			newStr = str;
 		}
@@ -115,8 +117,11 @@ let viewVCE_voice = {
 		if (str === "dc") {
 			newStr = '-12';
 		} else if (ret = str.match(/s(\d+)/)) {
+		    	// bug#79:  s1 -> -1 (ff), s2 -> -2 (fe)
+		    	// correct: s1 -> -11 (f5), s2 -> -10 (f6)
+		        //          s11 -> -1 (ff),  s10 -> -2 (fe)
 			val = parseInt(ret[1], 10);
-			newStr = '' + (-val);
+			newStr = '' + (val - 12);
 		} else if (ret = str.match(/\d+/)) {
 			newStr = str;
 		} else {

version.go

@@ -1,3 +1,3 @@
 package main
 
-const Version = "2.6.0"
+const Version = "2.6.1"

windows-installer.wxs

@@ -14,8 +14,8 @@
   <!-- Change Product Id GUID for major release or change in components -->
   <!-- Change Product UpgradeCode GUID for major release  -->
   <Product Name="Synergize $(var.VERSION)"
-	   Id="68081C43-F5C9-412F-9A0A-7BF4B5D3AFA7"
-	   UpgradeCode="E4D363A2-2847-47CA-AA16-C9D2B6478A18"
+	   Id="68081C43-F5C9-412F-9A0A-7BF4B5D3AFA8"
+	   UpgradeCode="E4D363A2-2847-47CA-AA16-C9D2B6478A19"
 	   Version="$(var.VERSION)" Language="1033" Manufacturer="Chinenual">
 
     <Package Id="*" Keywords="Installer" Description="Synergize $(var.VERSION) Installer" Comments="MIT License" Manufacturer="Chinenual" InstallScope="perMachine" InstallerVersion="100" Compressed="yes"/>