Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file modified firmware image/FIRMWARE.BIN
Binary file not shown.
1 change: 1 addition & 0 deletions front/LxrAvr/Menu/menu.c
Original file line number Diff line number Diff line change
Expand Up @@ -432,6 +432,7 @@ const enum Datatypes PROGMEM parameter_dtypes[NUM_PARAMS] = {
/*PAR_MIDI_NOTE5*/ DTYPE_NOTE_NAME,
/*PAR_MIDI_NOTE6*/ DTYPE_NOTE_NAME,
/*PAR_MIDI_NOTE7*/ DTYPE_NOTE_NAME,
/*PAR_KIT_VERSION*/ DTYPE_0B255,
/*PAR_ROLL*/ DTYPE_MENU | (MENU_ROLL_RATES<<4),
/*PAR_MORPH*/ DTYPE_0B255,
/*PAR_ACTIVE_STEP */ DTYPE_0B127, //230
Expand Down
6 changes: 4 additions & 2 deletions front/LxrAvr/Parameters.h
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@

enum ParamEnums
{

PAR_NONE, //TODO this is modwheel - stupid offset +/- 1 /*0*/
PAR_MOD_WHEEL , /*1*/

Expand Down Expand Up @@ -296,7 +296,9 @@ enum ParamEnums
PAR_MIDI_NOTE5,
PAR_MIDI_NOTE6,
PAR_MIDI_NOTE7,


PAR_KIT_VERSION,

//#########################################
//######## End of sound Parameters ########
//#########################################
Expand Down
17 changes: 17 additions & 0 deletions front/LxrAvr/Preset/presetManager.c
Original file line number Diff line number Diff line change
Expand Up @@ -191,6 +191,7 @@ static FRESULT preset_readDrumsetData(uint8_t isMorph)
FRESULT res=f_read((FIL*)&preset_File, para,END_OF_SOUND_PARAMETERS, &bytesRead);
if(res==FR_OK) {
// set to 0 for any that were not read from the file
// this will include setting the kit version to 0 if it was not included
if(END_OF_SOUND_PARAMETERS-bytesRead)
memset(para+bytesRead,0,END_OF_SOUND_PARAMETERS-bytesRead);

Expand All @@ -204,6 +205,22 @@ static FRESULT preset_readDrumsetData(uint8_t isMorph)
if(para[PAR_TARGET_LFO1+i] >= nmt )
para[PAR_TARGET_LFO1+i] = 0;
}

if(para[PAR_KIT_VERSION]<FILE_VERSION) // file version is ouf of date - put any corrections here
{
if(para[PAR_KIT_VERSION]<2) // kit versioning started at version 2, with addition of LP2 Filter
{
for (i=PAR_FILTER_TYPE_1;i<=PAR_FILTER_TYPE_6;i++)
{
if (para[i]==6)
{
para[i]=7;
}
}
}
// end of corrections - save the version as a param so it gets written with kit on save
para[PAR_KIT_VERSION]=FILE_VERSION;
}
}

return res;
Expand Down
1 change: 1 addition & 0 deletions mainboard/LxrStm32/src/MIDI/ParameterArray.h
Original file line number Diff line number Diff line change
Expand Up @@ -325,6 +325,7 @@ enum ParamEnums
PAR_MIDI_NOTE5,
PAR_MIDI_NOTE6,
PAR_MIDI_NOTE7, //110 - beware going over 127, can't fit into midi data, will need another msg
PAR_KIT_VERSION,
END_OF_SOUND_PARAMETERS,
//#########################################
//######## End of sound Parameters ########
Expand Down