Skip to content

Commit

Permalink
Update for firmware 1.0.6
Browse files Browse the repository at this point in the history
  • Loading branch information
@masc4ii
masc4ii committed Jun 25, 2018
1 parent 0547d23 commit f28da90
Show file tree
Hide file tree
Showing 3 changed files with 116 additions and 46 deletions.
21 changes: 20 additions & 1 deletion ConfiguratorModelD/MainWindow.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
#include <QBuffer>

#define APPNAME "Configurator Model D"
#define VERSION "0.3"
#define VERSION "0.4"

//Constructor
MainWindow::MainWindow(QWidget *parent) :
Expand Down Expand Up @@ -142,6 +142,16 @@ void MainWindow::on_comboBoxMultiTrigger_activated(int index)
m_midiOut->closePort();
}


//Pitch Bend Mode changed -
void MainWindow::on_comboBoxPitchBendMode_activated(int index)
{
m_midiOut->openPort( ui->comboBoxPort->currentIndex() );
std::vector<unsigned char> message = buildMessage( 0x0C, (unsigned char)ui->comboBoxPitchBendMode->currentIndex() );
m_midiOut->sendRawMessage( message );
m_midiOut->closePort();
}

//Pitch Bend
void MainWindow::on_spinBoxPitchBend_editingFinished()
{
Expand Down Expand Up @@ -205,6 +215,15 @@ void MainWindow::on_spinBoxPolyChainId_editingFinished()
m_midiOut->closePort();
}

//Poly chain style
void MainWindow::on_comboBoxPolyChainStyle_activated(int index)
{
m_midiOut->openPort( ui->comboBoxPort->currentIndex() );
std::vector<unsigned char> message = buildMessage( 0x0D, (unsigned char)(ui->comboBoxPolyChainStyle->currentIndex()) );
m_midiOut->sendRawMessage( message );
m_midiOut->closePort();
}

//Qt Box
void MainWindow::on_actionAboutQt_triggered()
{
Expand Down
4 changes: 4 additions & 0 deletions ConfiguratorModelD/MainWindow.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,13 +30,15 @@ private slots:
void on_comboBoxKeyPrio_activated(int index);
void on_spinBoxMidiChannel_editingFinished();
void on_comboBoxMultiTrigger_activated(int index);
void on_comboBoxPitchBendMode_activated(int index);
void on_spinBoxPitchBend_editingFinished();
void on_spinBoxTranspose_editingFinished();
void on_comboBoxModCurve_activated(int index);
void on_spinBoxMidiZeroVolts_editingFinished();
void on_comboBoxMidiChannelSwitches_activated(int index);
void on_comboBoxPolyChainEnable_activated(int index);
void on_spinBoxPolyChainId_editingFinished();
void on_comboBoxPolyChainStyle_activated(int index);

void on_actionAboutQt_triggered();
void on_actionAboutConfiguratorModelD_triggered();
Expand All @@ -48,6 +50,8 @@ private slots:
void on_spinBoxMidiZeroVolts_valueChanged(int arg1);
void on_spinBoxPolyChainId_valueChanged(int arg1);



private:
Ui::MainWindow *ui;
void getPorts(void);
Expand Down
137 changes: 92 additions & 45 deletions ConfiguratorModelD/MainWindow.ui
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
<rect>
<x>0</x>
<y>0</y>
<width>569</width>
<height>344</height>
<width>571</width>
<height>376</height>
</rect>
</property>
<property name="windowTitle">
Expand Down Expand Up @@ -36,19 +36,24 @@
</item>
<item>
<property name="text">
<string>On</string>
<string>On (old style)</string>
</property>
</item>
<item>
<property name="text">
<string>On (new style)</string>
</property>
</item>
</widget>
</item>
<item row="2" column="0">
<item row="3" column="0">
<widget class="QLabel" name="label_4">
<property name="text">
<string>Pitch Bend Semitones</string>
</property>
</widget>
</item>
<item row="2" column="1">
<item row="3" column="1">
<widget class="QSpinBox" name="spinBoxPitchBend">
<property name="alignment">
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
Expand All @@ -74,7 +79,7 @@
</property>
</widget>
</item>
<item row="3" column="1">
<item row="4" column="1">
<widget class="QSpinBox" name="spinBoxTranspose">
<property name="alignment">
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
Expand All @@ -87,7 +92,7 @@
</property>
</widget>
</item>
<item row="4" column="1">
<item row="5" column="1">
<widget class="QComboBox" name="comboBoxModCurve">
<item>
<property name="text">
Expand Down Expand Up @@ -125,20 +130,27 @@
</item>
</widget>
</item>
<item row="3" column="0">
<item row="4" column="0">
<widget class="QLabel" name="label_5">
<property name="text">
<string>Transpose</string>
</property>
</widget>
</item>
<item row="4" column="0">
<item row="5" column="0">
<widget class="QLabel" name="label_6">
<property name="text">
<string>Modulation Curve</string>
</property>
</widget>
</item>
<item row="0" column="2" rowspan="6">
<widget class="Line" name="line">
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
</widget>
</item>
<item row="1" column="0">
<widget class="QLabel" name="label_3">
<property name="sizePolicy">
Expand All @@ -165,13 +177,6 @@
</property>
</widget>
</item>
<item row="0" column="2" rowspan="5">
<widget class="Line" name="line">
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
</widget>
</item>
<item row="0" column="4">
<widget class="QSpinBox" name="spinBoxMidiChannel">
<property name="alignment">
Expand All @@ -185,6 +190,55 @@
</property>
</widget>
</item>
<item row="1" column="3">
<widget class="QLabel" name="label_10">
<property name="text">
<string>MIDI Channel Switches</string>
</property>
</widget>
</item>
<item row="1" column="4">
<widget class="QComboBox" name="comboBoxMidiChannelSwitches">
<item>
<property name="text">
<string>Enable</string>
</property>
</item>
<item>
<property name="text">
<string>Disable</string>
</property>
</item>
</widget>
</item>
<item row="2" column="0">
<widget class="QLabel" name="label_11">
<property name="text">
<string>Pitch Bend Mode</string>
</property>
</widget>
</item>
<item row="2" column="1">
<widget class="QComboBox" name="comboBoxPitchBendMode">
<item>
<property name="text">
<string>Settable</string>
</property>
</item>
<item>
<property name="text">
<string>Fixed</string>
</property>
</item>
</widget>
</item>
<item row="2" column="3">
<widget class="QLabel" name="label_7">
<property name="text">
<string>MIDI Note Zero Volts</string>
</property>
</widget>
</item>
<item row="3" column="3">
<widget class="QLabel" name="label_8">
<property name="text">
Expand All @@ -199,6 +253,19 @@
</property>
</widget>
</item>
<item row="2" column="4">
<widget class="QSpinBox" name="spinBoxMidiZeroVolts">
<property name="alignment">
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
</property>
<property name="maximum">
<number>127</number>
</property>
<property name="value">
<number>36</number>
</property>
</widget>
</item>
<item row="3" column="4">
<widget class="QComboBox" name="comboBoxPolyChainEnable">
<property name="toolTip">
Expand Down Expand Up @@ -226,43 +293,23 @@
</property>
</widget>
</item>
<item row="2" column="3">
<widget class="QLabel" name="label_7">
<item row="5" column="3">
<widget class="QLabel" name="label_12">
<property name="text">
<string>MIDI Note Zero Volts</string>
<string>Poly Chain Style</string>
</property>
</widget>
</item>
<item row="2" column="4">
<widget class="QSpinBox" name="spinBoxMidiZeroVolts">
<property name="alignment">
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
</property>
<property name="maximum">
<number>127</number>
</property>
<property name="value">
<number>36</number>
</property>
</widget>
</item>
<item row="1" column="3">
<widget class="QLabel" name="label_10">
<property name="text">
<string>MIDI Channel Switches</string>
</property>
</widget>
</item>
<item row="1" column="4">
<widget class="QComboBox" name="comboBoxMidiChannelSwitches">
<item row="5" column="4">
<widget class="QComboBox" name="comboBoxPolyChainStyle">
<item>
<property name="text">
<string>Enable</string>
<string>New</string>
</property>
</item>
<item>
<property name="text">
<string>Disable</string>
<string>Old</string>
</property>
</item>
</widget>
Expand Down Expand Up @@ -299,8 +346,8 @@
<rect>
<x>0</x>
<y>0</y>
<width>569</width>
<height>21</height>
<width>571</width>
<height>22</height>
</rect>
</property>
<widget class="QMenu" name="menuFile">
Expand Down

0 comments on commit f28da90

Please sign in to comment.