diff --git a/data/config/morphs.json b/data/config/morphs.json index 98ebcb89..f5ba48ce 100644 --- a/data/config/morphs.json +++ b/data/config/morphs.json @@ -42,5 +42,7 @@ "SM01172912166": "A", "SM01172912136": "B", "SM01172912131": "C", - "SM01172912188": "D" + "SM01172912188": "D", + + "oldSM01174915413": "A" } diff --git a/data/config/paramenums.json b/data/config/paramenums.json index a67c4c33..d223eb83 100644 --- a/data/config/paramenums.json +++ b/data/config/paramenums.json @@ -10,7 +10,7 @@ "quantstyle": [ "none", "frets", "fixed", "pressure" ], "volstyle": [ "fixed", "pressure" ], "shape": [ "line", "triangle", "square", "circle" ], - "morphtype": [ "quadrants", "corners" ], + "morphtype": [ "quadrants", "corners", "A", "B", "C", "D" ], "midiinput": [ "microKEY2 Air", "" ], "movedir": [ "cursor", "left", "right", "up", "down", "random", "random90", "updown", "leftright" ], "rotangdir": [ "right", "left", "random" ], diff --git a/ffgl/source/lib/palette/LayerParams_types.h b/ffgl/source/lib/palette/LayerParams_types.h index 05da827e..78ce3c93 100644 --- a/ffgl/source/lib/palette/LayerParams_types.h +++ b/ffgl/source/lib/palette/LayerParams_types.h @@ -89,6 +89,10 @@ LayerParams_InitializeTypes() { LayerParams_morphtypeTypes.push_back("quadrants"); LayerParams_morphtypeTypes.push_back("corners"); + LayerParams_morphtypeTypes.push_back("A"); + LayerParams_morphtypeTypes.push_back("B"); + LayerParams_morphtypeTypes.push_back("C"); + LayerParams_morphtypeTypes.push_back("D"); LayerParams_midiinputTypes.push_back("microKEY2 Air"); LayerParams_midiinputTypes.push_back(""); diff --git a/kit/logic.go b/kit/logic.go index e13bd769..c986fb66 100644 --- a/kit/logic.go +++ b/kit/logic.go @@ -68,7 +68,7 @@ func (logic *PatchLogic) cursorToPitch(ce CursorEvent) (uint8, error) { scaleName := patch.Get("misc.scale") - // The engine.scale param, if not "", overrides misc.scale + // The global.scale param, if not "", overrides misc.scale engineScaleName, err := GetParam("global.scale") if err != nil { engineScaleName = "" diff --git a/kit/misc.go b/kit/misc.go index 9ed38496..c01d54b4 100644 --- a/kit/misc.go +++ b/kit/misc.go @@ -75,7 +75,7 @@ func LocalPaletteDir() string { if localapp == "" { var err error tempdir, err := GetParam("global.tempdir") - LogWarn("Expecting CommonProgramFiles to be set, using engine.tempdir value", "tempdir", tempdir) + LogWarn("Expecting CommonProgramFiles to be set, using global.tempdir value", "tempdir", tempdir) if err != nil { LogIfError(err) return "" diff --git a/kit/windowsmorph.go b/kit/windowsmorph.go index cba9e7ea..933b3360 100644 --- a/kit/windowsmorph.go +++ b/kit/windowsmorph.go @@ -257,7 +257,7 @@ type oneMorph struct { fwVersionBuild uint8 fwVersionRelease uint8 deviceID int - morphtype string // "corners", "quadrants" + morphtype string // "corners", "quadrants", "A", "B", "C", "D" currentTag string // "A", "B", "C", "D" - it can change dynamically previousTag string // "A", "B", "C", "D" - it can change dynamically contactIdToGid map[int]int @@ -505,10 +505,11 @@ func WinMorphInitialize() error { // It's not explicitly present in morphs.json t, err := GetParam("global.morphtype") if err != nil { - return err + morphtype = "A" + } else { + morphtype = t } - morphtype = t - LogInfo("Morph serial# isn't in morphs.json, using engine.morphtype", "serialnum", m.serialNum, "morphtype", morphtype) + LogInfo("Morph serial# isn't in morphs.json", "serialnum", m.serialNum, "morphtype", morphtype) } m.morphtype = morphtype diff --git a/release/palette_7.83_win_setup.exe b/release/palette_7.83_win_setup.exe new file mode 100644 index 00000000..2124c548 Binary files /dev/null and b/release/palette_7.83_win_setup.exe differ