Octavia SC MIDI CH display is now fixed.

ltgcgo · Oct 28, 2023 · d43c2f3 · d43c2f3
1 parent 683fb96
commit d43c2f3
Show file tree

Hide file tree

Showing 11 changed files with 133 additions and 86 deletions.
diff --git a/data/bank/gs.tsv b/data/bank/gs.tsv
@@ -807,7 +807,7 @@ LSB	PRG	MSB	NME
 002	087	002	Fat&Prky
 003	087	003	JUNORave
 003	087	004	JP8BaLd1
-003	087	005	JBPBaLd2
+003	087	005	JP8BaLd2
 003	087	006	SH-5BaLd
 004	087	007	Delay.Ld
 000	088	000	NewAgePd
@@ -1044,7 +1044,7 @@ LSB	PRG	MSB	NME
 000	114	000	SteelDrm
 003	114	001	IslndMlt
 000	115	000	Woodblok
-000	115	008	Cascanet
+000	115	008	Castanet
 003	115	016	Angklung
 003	115	017	AngkRthm
 003	115	024	FngrSnap

diff --git a/data/map/gs.10.tsv b/data/map/gs.10.tsv
@@ -470,11 +470,24 @@ ThickSaw	Fat Saw Ld
 D-50 Fat	D-50 FatLd
 WaspySyn	WaspySynth
 CS SawLd	CS Saw Ld
+MG Saw	MG SawWave
+MG Saw 2	MG SawLd 2
+OB Saw	OB SawWave
 OB Saw 2	OB SawLd 2
-P5 SawLd	P5 Saw Ld
+D-50 Saw	D-50 SawLd
+SH101Saw	SH-101 Saw
+CS Saw	CS SawLead
+MG SawLd	MG SawLead
+OB SawLd	OB SawLead
+P5 SawLd	P5 SawLead
 MGUnison	MG Unison
+OctSawLd	OctSawLead
 Seq.Saw.	Seq. Saw.
+Seq.Saw2	Seq.Saw. 2
 Reso Saw	Reso. Saw
+CheezSaw	Cheese Saw
+ChzSaw 2	CheeseSaw2
+Rthm Saw	Rhythm Saw
 VentLead	Vent Synth
 Pure Pan	Pure PanLd
 FatGR Ld	Fat GR Ld

diff --git a/data/map/gs.12.tsv b/data/map/gs.12.tsv
@@ -340,11 +340,24 @@ Dr. Lead	Doctor Solo
 ThickSaw	Fat Saw Lead
 D-50 Fat	D-50 FatLead
 WaspySyn	Waspy Synth
-CS SawLd	CS Saw Lead
-OB Saw 2	OB SawLead 2
+CS SawLd	CS Saw
+MG Saw	MG Saw 1
+MG Saw 2	MG Saw 2
+OB Saw	OB Saw 1
+OB Saw 2	OB Saw 2
+D-50 Saw	D-50 Saw
+CS Saw	CS Saw
+MG SawLd	MG Saw Lead
+OB SawLd	OB Saw Lead
 P5 SawLd	P5 Saw Lead
+P5 SawLd	P5 Saw Lead
+OctSawLd	Oct Saw Lead
 Seq.Saw.	SequencedSaw
+Seq.Saw2	SequenceSaw2
 Reso Saw	Resonant Saw
+CheezSaw	Cheese Saw 1
+ChzSaw 2	Cheese Saw 2
+Rthm Saw	Rhythmic Saw
 Pure Pan	Pure PanLead
 FatGR Ld	Fat GR Lead
 Acid Gtr	Acid Guitar

diff --git a/data/map/gs.24.tsv b/data/map/gs.24.tsv
@@ -265,11 +265,26 @@ JP8Puls2	JP8 Pulse Lead 2
 MGRezPls	MG Resonant Pulse
 PulseSaw	Pulse Sawtooth Lead
 Dr. Lead	Doctor Lead
-ThickSaw	Fat Sawtooth Lead
+ThickSaw	Thick Sawtooth Lead
 D-50 Fat	D-50 Fat Lead
-OB Saw 2	OB Saw Lead 2
+CS SawLd	CS Sawtooth Lead
+MG Saw	MG Sawtooth 1
+MG Saw 2	MG Sawtooth 2
+OB Saw	OB Sawtooth
+OB Saw 2	OB Sawtooth 2
+D-50 Saw	D-50 Sawtooth
+SH101Saw	SH-101 Sawtooth
+CS Saw	CS Sawtooth Lead
+MG SawLd	MG Sawtooth Lead
+OB SawLd	OB Sawtooth Lead
+P5 SawLd	P5 Sawtooth Lead
+OctSawLd	Octave Sawtooth Lead
 Seq.Saw.	Sequenced Sawtooth
+Seq.Saw2	Sequenced Sawtooth 2
 Reso Saw	Resonant Sawtooth
+CheezSaw	Cheesy Sawtooth
+ChzSaw 2	Cheesy Sawtooth 2
+Rthm Saw	Rhythmic Sawtooth
 VentLead	Vent Synth Lead
 Pure Pan	Pure Pan Lead
 DistLead	Distortion Lead

diff --git a/dist/basic.mjs b/dist/basic.mjs
diff --git a/dist/cambiare.mjs b/dist/cambiare.mjs
diff --git a/dist/state.mjs b/dist/state.mjs
diff --git a/dist/state_skim.mjs b/dist/state_skim.mjs
diff --git a/dist/xp_basic.mjs b/dist/xp_basic.mjs
diff --git a/dist/xp_state.mjs b/dist/xp_state.mjs
diff --git a/src/disp/disp_sc.mjs b/src/disp/disp_sc.mjs
@@ -281,7 +281,13 @@ let ScDisplay = class extends RootDisplay {
 			paramText += Math.abs(cPan - 64).toString().padStart(2, " ");
 		};
 		paramText += sum.chContr[chOff + ccToPos[93]].toString().padStart(3, " ");
-		paramText += (upThis.device.getChSource()[upThis.#ch] + 1).toString().padStart(3, "0");
+		let chSource = upThis.device.getChSource()[upThis.#ch];
+		if (chSource < 128) {
+			paramText += "ABCDEFGH"[chSource >> 4];
+			paramText += ((chSource & 15) + 1).toString().padStart(2, "0");
+		} else {
+			paramText += `${"ABCDEFGH"[upThis.#ch >> 4]}--`;
+		};
 		// Render fonts
 		upThis.xgFont.getStr(paramText).forEach(function (e0, i0) {
 			e0.forEach(function (e1, i1) {