Merge pull request #6 from risgk/develop

v1.2.1
risgk · Aug 26, 2022 · 5f87474 · 5f87474
2 parents 1fb3387 + e7d383f
commit 5f87474
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 11 deletions.
diff --git a/DigitalSynthVRA8U/osc.h b/DigitalSynthVRA8U/osc.h
@@ -690,7 +690,7 @@ class Osc {
 
         int16_t temp;
         if (m_waveform[0] == WAVEFORM_1_S_SAW) {
-          temp = high_sbyte(+m_osc_gain_effective[0] * m_osc1_shape_ii_control);
+          temp = high_sbyte(+m_osc_gain_effective[0] * (128 - m_osc1_shape_ii_control));
           m_osc_gain_effective[3] = temp + temp;
         } else if (m_waveform[0] == WAVEFORM_1_PULSE) {
           temp = high_sbyte(-m_osc_gain_effective[0] * m_osc1_shape_ii_control);

diff --git a/README.md b/README.md
@@ -1,6 +1,6 @@
-# Digital Synth VRA8-U v1.2.0
+# Digital Synth VRA8-U v1.2.1
 
-- 2022-08-25 ISGK Instruments
+- 2022-08-26 ISGK Instruments
 - <https://github.com/risgk/digital-synth-vra8-u>
 
 ## Concept
@@ -18,6 +18,7 @@
 
 ## Change History
 
+- v1.2.1: Reverses the effect of the Osc 1 Shape II value for SS (Shaped Saw Wave)
 - v1.2.0: Change the range of Osc 1 Shape from -64 -- +63 to 0 -- 127; Fix the comment on Osc 1 Shape II in VRA8-U CTRL
 - v1.1.1: Reduce noise in Chorus Mode M and S2
 - v1.1.0: Add SS (Shaped Saw Wave) to Osc 1 Wave; Add Osc 1 Shape II; Reduce noise when Chorus Delay Time changes; Improve Random Ctrl of VRA-8 CTRL not to change Amp Level; Improve notes for $$ and $$$; Other changes

diff --git a/VRA8-U-MIDI-Implementation-Chart.txt b/VRA8-U-MIDI-Implementation-Chart.txt
@@ -1,5 +1,5 @@
-  [United Synthesizer]                                            Date: 2022-08-25                  
-  Model: Digital Synth VRA8-U     MIDI Implementation Chart       Version: 1.2.0                    
+  [United Synthesizer]                                            Date: 2022-08-26                  
+  Model: Digital Synth VRA8-U     MIDI Implementation Chart       Version: 1.2.1                    
 +-------------------------------+---------------+---------------+----------------------------------+
 | Function...                   | Transmitted   | Recognized    | Remarks                          |
 +-------------------------------+---------------+---------------+----------------------------------+

diff --git a/VRA8-U-Parameter-List.md b/VRA8-U-Parameter-List.md
@@ -1,6 +1,6 @@
-# Digital Synth VRA8-U Parameter List v1.2.0
+# Digital Synth VRA8-U Parameter List v1.2.1
 
-- 2022-08-25 ISGK Instruments
+- 2022-08-26 ISGK Instruments
 - <https://github.com/risgk/digital-synth-vra8-u>
 
 ## Control Change Parameters
@@ -27,9 +27,9 @@
         - 127: Pulse Width 0% (min)
 - Osc 1 Shape II $$
     - Shaped Saw Wave
-        - 0: Saw 100% + Saw 100% (min)
+        - 0: Saw 100% + Saw 0% (max)
         - 64: Saw 100% + Saw 50%
-        - 127: Saw 100% + Saw 0% (max)
+        - 127: Saw 100% + Saw 100% (min)
     - Pulse Wave
         - 0: Pulse 100% = Saw 100% + Reverse Saw 100% (min)
         - 64: Pulse 50% + Saw 50% = Saw 100% + Reverse Saw 50%

diff --git a/vra8-u-ctrl.html b/vra8-u-ctrl.html
@@ -41,7 +41,7 @@
 }
 </style>
 <script>
-const APP_NAME_VERSION = "VRA8-U CTRL v1.2.0";
+const APP_NAME_VERSION = "VRA8-U CTRL v1.2.1";
 
 const MIDI_CH        = 0;       // Basic Channel 1
 const NOTE_OFF       = 0x80;

diff --git a/vra8-u-prog-preset.json b/vra8-u-prog-preset.json
@@ -1,5 +1,5 @@
 {
-  "_version     " : "VRA8-U CTRL v1.2.0",
+  "_version     " : "VRA8-U CTRL v1.2.1",
   "_comment     " : "  CURRENT  #8   #9   #10  #11  #12  #13  #14  #15  ",
   "OSC_1_WAVE     " : [ [0  ], [0  , 0  , 0  , 127, 0  , 96 , 0  , 0  ] ],
   "OSC_1_SHAPE    " : [ [0  ], [0  , 0  , 0  , 0  , 0  , 0  , 0  , 0  ] ],