- Implemented preset saving for the GP5 on LCD editor

- fixed unplugging/replugging of USB pedals. Can now swap between any pedal without needing a controller reboot

Author: Greg Smith

source/main/control.c

@@ -1236,6 +1236,19 @@ uint32_t control_get_current_preset_index(void)
     return ControlData.ConfigData.PresetOrderMappingConfig.PresetOrder[ControlData.PresetIndex];
 }  
 
+/****************************************************************************
+* NAME:        
+* DESCRIPTION: 
+* PARAMETERS:  
+* RETURN:      
+* NOTES:       
+*****************************************************************************/
+void control_get_current_preset_name(char* dest)
+{
+    memcpy((void*)dest, (void*)ControlData.PresetNames[control_get_current_preset_index()], MAX_PRESET_NAME_LENGTH);
+    dest[MAX_PRESET_NAME_LENGTH - 1] = 0;
+}
+
 /****************************************************************************
 * NAME:        
 * DESCRIPTION: 

source/main/control.h

@@ -321,6 +321,7 @@ uint8_t* control_get_preset_order(void);
 void control_set_sync_complete(void);
 uint8_t control_get_sync_complete(void);
 uint32_t control_get_current_preset_index(void);
+void control_get_current_preset_name(char* dest);
 
 // config API
 void control_set_default_config(void);

source/main/display.c

@@ -480,6 +480,10 @@ void action_amp_skin_next(lv_event_t * e)
 *****************************************************************************/
 void action_close_settings_page(lv_event_t * e)
 {
+    // save preset
+    usb_save_preset();
+
+    // close settings screen
     lv_scr_load_anim(objects.screen1, LV_SCR_LOAD_ANIM_FADE_IN, 0, 0, false);
 }
 

source/main/usb_comms.c

@@ -516,6 +516,34 @@ void usb_load_preset_to_slot_b(uint32_t preset)
     }
 }
 
+/****************************************************************************
+* NAME:        
+* DESCRIPTION: 
+* PARAMETERS:  
+* RETURN:      
+* NOTES:       
+*****************************************************************************/
+void usb_save_preset(void)
+{
+    tUSBMessage message;
+
+    if (usb_input_queue == NULL)
+    {
+        ESP_LOGE(TAG, "usb_save_preset queue null");            
+    }
+    else
+    {
+        message.Command = USB_COMMAND_SAVE_PRESET;
+        message.Payload = 0;
+
+        // send to queue
+        if (xQueueSend(usb_input_queue, (void*)&message, 0) != pdPASS)
+        {
+            ESP_LOGE(TAG, "usb_save_preset queue send failed!");            
+        }
+    }
+}
+
 /****************************************************************************
 * NAME:        
 * DESCRIPTION: 

source/main/usb_comms.h

@@ -45,7 +45,8 @@ enum USB_Commands
     USB_COMMAND_SET_PRESET,
     USB_COMMAND_MODIFY_PARAMETER,
     USB_COMMAND_LOAD_PRESET_TO_SLOT_A,
-    USB_COMMAND_LOAD_PRESET_TO_SLOT_B
+    USB_COMMAND_LOAD_PRESET_TO_SLOT_B,
+    USB_COMMAND_SAVE_PRESET
 };
 
 typedef struct 
@@ -70,6 +71,7 @@ void usb_set_preset(uint32_t preset);
 void usb_modify_parameter(uint16_t index, float value);
 void usb_load_preset_to_slot_a(uint32_t preset);
 void usb_load_preset_to_slot_b(uint32_t preset);
+void usb_save_preset(void);
 uint8_t usb_get_max_presets_for_connected_modeller(void);
 uint8_t usb_get_first_preset_index_for_connected_modeller(void);
 uint8_t usb_get_connected_modeller_type(void);

source/main/usb_tonex.c

@@ -1302,6 +1302,11 @@ void usb_tonex_handle(class_driver_t* driver_obj)
                             ESP_LOGW(TAG, "Attempt to modify unknown param %d", (int)message.Payload);
                         }
                     } break;
+
+                    case USB_COMMAND_SAVE_PRESET:
+                    {
+                        // todo - need to send back the entire 32kb+ preset details 
+                    } break;
                 }
             }
         } break;
@@ -1539,6 +1544,29 @@ void usb_tonex_init(class_driver_t* driver_obj, QueueHandle_t comms_queue)
 *****************************************************************************/
 void usb_tonex_deinit(void)
 {
-    //to do here: need to clean up properly if pedal disconnected
-    //cdc_acm_host_close();
+    // close USB
+    cdc_acm_host_close(cdc_dev);
+    vTaskDelay(200);
+    cdc_dev = NULL;
+    cdc_acm_host_uninstall();
+
+    // dealloc mem
+    free((void*)InputBuffers);
+    InputBuffers = NULL;
+
+    free((void*)TxBuffer);    
+    TxBuffer = NULL;
+
+    free((void*)FramedBuffer);
+    FramedBuffer = NULL;
+
+    free((void*)TonexData);
+    TonexData = NULL;
+
+    boot_init_needed = 0;
+    boot_preset_request = 0;
+    boot_global_request = 0;
+
+    // preallocate big memory again, ready for freeing on reconnect
+    tonex_common_preallocate_memory();
 }

source/main/usb_tonex_one.c

@@ -1384,6 +1384,11 @@ void usb_tonex_one_handle(class_driver_t* driver_obj)
                             ESP_LOGW(TAG, "Attempt to modify unknown param %d", (int)message.Payload);
                         }
                     } break;
+
+                    case USB_COMMAND_SAVE_PRESET:
+                    {
+                        // Tonex One uses auto save, nothing needed
+                    } break;
                 }
             }
         } break;
@@ -1624,6 +1629,29 @@ void usb_tonex_one_init(class_driver_t* driver_obj, QueueHandle_t comms_queue)
 *****************************************************************************/
 void usb_tonex_one_deinit(void)
 {
-    //to do here: need to clean up properly if pedal disconnected
-    //cdc_acm_host_close();
+    // close USB
+    cdc_acm_host_close(cdc_dev);
+    vTaskDelay(200);
+    cdc_dev = NULL;
+    cdc_acm_host_uninstall();
+
+    // dealloc mem
+    free((void*)InputBuffers);
+    InputBuffers = NULL;
+
+    free((void*)TxBuffer);    
+    TxBuffer = NULL;
+
+    free((void*)FramedBuffer);
+    FramedBuffer = NULL;
+
+    free((void*)TonexData);
+    TonexData = NULL;
+
+    boot_init_needed = 0;
+    boot_global_request = 0;
+    boot_preset_request = 0;
+
+    // preallocate big memory again, ready for freeing on reconnect
+    tonex_common_preallocate_memory();
 }

source/main/usb_valeton_gp5.c

@@ -423,6 +423,7 @@ static uint8_t usb_valeton_gp5_process_single_sysex(const uint8_t* buffer, uint3
 static void usb_valeton_gp5_request_ir(void);
 static void usb_valeton_gp5_request_nams(void);
 static void usb_valeton_gp5_request_globals(void);
+static void usb_valeton_gp5_save_preset(uint16_t preset_index, char* preset_name);
 
 /****************************************************************************
 * NAME:        
@@ -1593,6 +1594,48 @@ static void usb_valeton_gp5_set_effect_block_state(uint8_t block_index, uint8_t
     usb_valeton_gp5_send_sysex((const uint8_t*)midi_tx, sizeof(midi_tx), 0x01);
 }
 
+/****************************************************************************
+* NAME:        
+* DESCRIPTION: 
+* PARAMETERS:  
+* RETURN:      
+* NOTES:       
+*****************************************************************************/
+static void usb_valeton_gp5_save_preset(uint16_t preset_index, char* preset_name)
+{
+    uint8_t midi_tx[] = {0x04, 0x0A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+                         0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
+    uint8_t preset_name_length;
+    uint8_t buffer_index;
+
+    // set preset index
+    midi_tx[2] = (uint8_t)(preset_index / 16);
+    midi_tx[3] = (uint8_t)(preset_index % 16);
+
+    // set preset name
+    preset_name_length = strlen(preset_name);
+    if (preset_name_length > 10)
+    {
+        preset_name_length = 10;
+    }
+    
+    // name starts at offset 10, and is 10 characters/20 bytes long
+    buffer_index = 10;
+    for (uint32_t character = 0; character < preset_name_length; character++)
+    {
+        // break character into 2 x 4 bit nibbles e.g. 47 becomes 04 07
+        midi_tx[buffer_index++] = (preset_name[character] >> 4) & 0x0F;
+        midi_tx[buffer_index++] = preset_name[character] & 0x0F;
+    }
+
+    ESP_LOGI(TAG, "Save Preset");
+
+    // debug
+    //ESP_LOG_BUFFER_HEXDUMP(TAG, midi_tx, sizeof(midi_tx), ESP_LOG_INFO);
+
+    usb_valeton_gp5_send_sysex((const uint8_t*)midi_tx, sizeof(midi_tx), 0x01);
+}
+
 /****************************************************************************
 * NAME:        
 * DESCRIPTION: 
@@ -2148,6 +2191,14 @@ void usb_valeton_gp5_handle(class_driver_t* driver_obj)
                             ESP_LOGW(TAG, "Attempt to modify unknown param %d", (int)message.Payload);
                         }
                     } break;
+
+                    case USB_COMMAND_SAVE_PRESET:
+                    {
+                        char preset_name[MAX_PRESET_NAME_LENGTH];
+                        control_get_current_preset_name(preset_name);
+
+                        usb_valeton_gp5_save_preset(control_get_current_preset_index(), preset_name);
+                    } break;
                 }
             }
         } break;
@@ -2280,6 +2331,27 @@ void usb_valeton_gp5_init(class_driver_t* driver_obj, QueueHandle_t comms_queue)
 *****************************************************************************/
 void usb_valeton_gp5_deinit(void)
 {
-    //to do here: need to clean up properly if pedal disconnected
-    //cdc_acm_host_close();
+    midi_host_close(midi_dev);
+    vTaskDelay(200);
+    midi_dev = NULL;
+    midi_host_uninstall();
+
+    // free mem
+    free((void*)InputBuffers);
+    InputBuffers = NULL;
+    
+    free((void*)ProcessingBuffer);
+    ProcessingBuffer = NULL;
+
+    free((void*)TransmitBuffer);
+    TransmitBuffer = NULL;
+
+    free((void*)TxBuffer);
+    TxBuffer = NULL;
+
+    free((void*)ValetonGP5Data);
+    ValetonGP5Data = NULL;
+
+    // preallocate big memory again, ready for freeing on reconnect
+    tonex_common_preallocate_memory();
 }