Skip to content

Commit 62ed23d

Browse files
committed
add static ProgramVector to support debugMessage functions
1 parent 99e959e commit 62ed23d

1 file changed

Lines changed: 10 additions & 3 deletions

File tree

Source/MidiBoot.cpp

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,17 +9,18 @@
99
#include "MidiController.h"
1010
#include "Storage.h"
1111
#include "usb_device.h"
12+
#include "ProgramVector.h"
1213

1314
static SystemMidiReader midi_rx;
1415
MidiController midi_tx;
1516
FirmwareLoader loader;
1617
ProgramManager program;
17-
18-
extern "C" int testButton();
18+
ProgramVector staticVector;
1919

2020
MidiHandler::MidiHandler(){}
2121
ProgramManager::ProgramManager(){}
2222
void ProgramManager::exitProgram(bool isr){}
23+
ProgramVector* getProgramVector() { return &staticVector; }
2324
void setParameterValue(uint8_t ch, int16_t value){}
2425
void SystemMidiReader::reset(){}
2526
void Owl::setOperationMode(uint8_t mode){}
@@ -72,8 +73,12 @@ void sendMessage(uint8_t cmd, const char* msg){
7273
}
7374

7475
void sendMessage(){
75-
if(getErrorStatus() != NO_ERROR)
76+
if(getErrorStatus() != NO_ERROR){
7677
message = getErrorMessage() == NULL ? "Error" : getErrorMessage();
78+
}else if(getProgramVector()->message != NULL){
79+
message = getProgramVector()->message;
80+
getProgramVector()->message = NULL;
81+
}
7782
if(message != NULL){
7883
char buffer[64];
7984
buffer[0] = SYSEX_PROGRAM_MESSAGE;
@@ -196,6 +201,7 @@ extern "C" {
196201
midi_tx.setOutputChannel(MIDI_OUTPUT_CHANNEL);
197202
midi_rx.setInputChannel(MIDI_INPUT_CHANNEL);
198203
storage.init();
204+
getProgramVector()->message = NULL;
199205
sendMessage(SYSEX_PROGRAM_MESSAGE, "OWL Bootloader Ready");
200206
}
201207

@@ -291,6 +297,7 @@ void MidiHandler::handleSysEx(uint8_t* data, uint16_t size){
291297
device_dfu();
292298
#else
293299
error(RUNTIME_ERROR, "Bootloader OK");
300+
setErrorStatus(NO_ERROR);
294301
#endif
295302
break;
296303
case SYSEX_FIRMWARE_UPLOAD:

0 commit comments

Comments
 (0)