diff --git a/VERSION b/VERSION index 02932d3b..2b4445ac 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -7.93 +7.94 diff --git a/data/config/morphs.json b/data/config/morphs.json index 1fc34f5d..346d8cb7 100644 --- a/data/config/morphs.json +++ b/data/config/morphs.json @@ -29,10 +29,10 @@ "SM01180216670": "C", "SM01173612418": "D", - "SM01174915280": "A", - "SM01174213460": "B", - "SM2116I110058": "C", - "SM01174814566": "D", + "SM01174915280": "B", + "SM01174213460": "C", + "SM2116I110058": "D", + "SM01174814566": "A", "SM01173612386": "B", "SM01174213320": "D", diff --git a/data/config/paramenums.json b/data/config/paramenums.json index 89bef3f6..b8c4657c 100644 --- a/data/config/paramenums.json +++ b/data/config/paramenums.json @@ -12,7 +12,7 @@ "volstyle": [ "fixed", "pressure" ], "shape": [ "line", "triangle", "square", "circle" ], "morphtype": [ "quadrants", "corners", "A", "B", "C", "D" ], - "midiinput": [ "microKEY2 Air", "" ], + "midiinput": [ "microKEY", "microKEY2 Air", "" ], "movedir": [ "cursor", "left", "right", "up", "down", "random", "random90", "updown", "leftright" ], "rotangdir": [ "right", "left", "random" ], "mirror": [ "none", "vertical", "horizontal", "four" ], diff --git a/data/saved/global/External_Scale On.json b/data/saved/global/External_Scale On.json index f6178e09..19219475 100644 --- a/data/saved/global/External_Scale On.json +++ b/data/saved/global/External_Scale On.json @@ -1,6 +1,6 @@ { "params": { - "global.midisetexternalscale":"true" + "global.midisetexternalscale":"true", "global.scale":"external" } } diff --git a/ffgl/source/lib/palette/LayerParams_types.h b/ffgl/source/lib/palette/LayerParams_types.h index 55ce36b4..f9d721da 100644 --- a/ffgl/source/lib/palette/LayerParams_types.h +++ b/ffgl/source/lib/palette/LayerParams_types.h @@ -97,6 +97,7 @@ LayerParams_InitializeTypes() { LayerParams_morphtypeTypes.push_back("C"); LayerParams_morphtypeTypes.push_back("D"); + LayerParams_midiinputTypes.push_back("microKEY"); LayerParams_midiinputTypes.push_back("microKEY2 Air"); LayerParams_midiinputTypes.push_back(""); diff --git a/kit/engine.go b/kit/engine.go index 5881f795..68d0f720 100644 --- a/kit/engine.go +++ b/kit/engine.go @@ -181,12 +181,16 @@ func GetParamFloat(nm string) (float64, error) { return f, nil } -func SaveGlobalParams() (err error) { +func SaveCurrentGlobalParams() (err error) { return GlobalParams.Save("global", "_Current") } func LoadGlobalParams() (err error) { - paramsMap, err := LoadParamsMapOfCategory("global", "_Current") + return LoadGlobalParamsFrom("_Current") +} + +func LoadGlobalParamsFrom(filename string) (err error) { + paramsMap, err := LoadParamsMapOfCategory("global", filename) if err != nil { LogIfError(err) return err diff --git a/kit/engineapi.go b/kit/engineapi.go index 42df1de3..ed5ce13a 100644 --- a/kit/engineapi.go +++ b/kit/engineapi.go @@ -118,6 +118,14 @@ func ExecuteGlobalApi(api string, apiargs map[string]string) (result string, err TheAttractManager.SetAttractMode(IsTrueValue(v)) return "", nil + case "load": + fname, ok := apiargs["filename"] + if !ok { + return "", fmt.Errorf("ExecuteGlobalApi: missing filename parameter") + } + err := LoadGlobalParamsFrom(fname) + return "",err + case "set": name, value, err := GetNameValue(apiargs) if err != nil { diff --git a/python/palette_gui.py b/python/palette_gui.py index f16d8e42..1dc2be29 100644 --- a/python/palette_gui.py +++ b/python/palette_gui.py @@ -940,7 +940,7 @@ def loadAndSend(self,category,filename): if category == "global": # log("Loading","category","global","filename",filename) - palette.palette_quad_api("load", + palette.palette_global_api("load", "\"filename\": \"" + filename + "\"" ", \"category\": \"" + category + "\"") elif category == "quad": diff --git a/release/palette_7.94_win_setup.exe b/release/palette_7.94_win_setup.exe new file mode 100644 index 00000000..cfc4ef53 Binary files /dev/null and b/release/palette_7.94_win_setup.exe differ