Create Part class, think about output assignments

This commit is contained in:
Jan-Henrik 2019-10-06 12:55:04 +02:00
parent 59424f01bb
commit 88916400d2
3 changed files with 109 additions and 93 deletions

View file

@ -2,9 +2,9 @@
#include "drivers/display.h" #include "drivers/display.h"
#include "drivers/gpio.h" #include "drivers/gpio.h"
#include "part.h"
#include "stmlib/system/system_clock.h" #include "stmlib/system/system_clock.h"
#include "ui.h" #include "ui.h"
#include "part.h"
using namespace stmlib; using namespace stmlib;
@ -12,6 +12,7 @@ GPIO gpio;
Display display; Display display;
UI ui; UI ui;
//SystemClock system_clock; //SystemClock system_clock;
Part part[4];
// Default interrupt handlers. // Default interrupt handlers.
extern "C" { extern "C" {
@ -103,7 +104,7 @@ void InitTimers(void)
void Init(void) void Init(void)
{ {
//SystemInit(); SystemInit();
NVIC_SetVectorTable(NVIC_VectTab_FLASH, 0x8000); NVIC_SetVectorTable(NVIC_VectTab_FLASH, 0x8000);
IWDG_WriteAccessCmd(IWDG_WriteAccess_Enable); IWDG_WriteAccessCmd(IWDG_WriteAccess_Enable);
IWDG_SetPrescaler(IWDG_Prescaler_16); IWDG_SetPrescaler(IWDG_Prescaler_16);

Binary file not shown.

View file

@ -5,50 +5,65 @@ enum MIDIThruMode { OFF,
ON, ON,
POLYCHAIN }; POLYCHAIN };
enum BiOutputMode { enum BiOutputType {
PITCH_UNI, BI_OFF = 0,
PITCH_BI, BI_PITCH_UNI,
SAWTOOTH, BI_PITCH_BI,
SQUARE, BI_SAWTOOTH,
SINE, BI_SQUARE,
TRIANGLE BI_SINE,
BI_TRIANGLE
}; };
enum UniOutputMode { enum UniOutputType {
PITCH, UNI_OFF = 0,
VELOCITY, UNI_PITCH,
AFTERTOUCH UNI_VELOCITY,
UNI_MODULATION,
UNI_AFTERTOUCH,
UNI_BREATH,
UNI_EXP,
UNI_GATE
}; };
enum GateOutputMode { enum GateOutputType {
GATE, GATE_OFF = 0,
TRIGGER GATE_GATE,
GATE_TRIGGER
}; };
class Part { class Part {
public: public:
Part() Part()
: voice_count(1) : poly_voice_count(1)
, output_column_count(1)
, midi_filter_channel_enabled(true) , midi_filter_channel_enabled(true)
, midi_filter_channel(1) , midi_filter_channel(1)
, midi_filter_lowest_note(0)
, midi_filter_highest_note(127)
, midi_thru_mode(OFF) , midi_thru_mode(OFF)
, output_mode_0(PITCH_UNI)
, output_mode_1(VELOCITY)
, output_mode_2(AFTERTOUCH)
, output_mode_3(GATE)
{ {
for (int i = 0; i < 4; i++) {
output_type_row_0[i] = BI_OFF;
output_type_row_1[i] = UNI_OFF;
output_type_row_2[i] = UNI_OFF;
output_type_row_3[i] = GATE_OFF;
}
} }
void ProcessMidiInput(/* TODO: Inputs */); void ProcessMidiInput(/* TODO: Inputs */);
private: private:
uint8_t voice_count; uint8_t poly_voice_count;
uint8_t output_column_count;
bool midi_filter_channel_enabled; bool midi_filter_channel_enabled;
uint8_t midi_filter_channel; uint8_t midi_filter_channel;
uint8_t midi_filter_lowest_note;
uint8_t midi_filter_highest_note;
MIDIThruMode midi_thru_mode; MIDIThruMode midi_thru_mode;
BiOutputMode output_mode_0; BiOutputType output_type_row_0[4];
UniOutputMode output_mode_1; UniOutputType output_type_row_1[4];
UniOutputMode output_mode_2; UniOutputType output_type_row_2[4];
GateOutputMode output_mode_3; GateOutputType output_type_row_3[4];
}; };
#endif #endif