Skip to content

Fix default channel bug for cc messages etc #13

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Dec 11, 2024
Merged

Fix default channel bug for cc messages etc #13

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
12 changes: 8 additions & 4 deletions src/MidiCommon.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,21 +58,24 @@ void MidiCommon :: pitchBend(uint16_t value, int8_t channelPar) {
writeData(&outMessage, 2);
}

void MidiCommon :: channelPressure(uint8_t valuePar, int8_t channel){
void MidiCommon :: channelPressure(uint8_t valuePar, int8_t channelPar) {
uint8_t channel = channelPar != -1 ? channelPar : sendingChannel;
uint8_t value = valuePar & 0b1111111;
this->outMessage.status = 0b1101 << 4 | channel;
this->outMessage.arg1 = value ;
writeData(&outMessage, 1);
}

void MidiCommon :: polyPressure(uint8_t valuePar, int8_t channel){
void MidiCommon :: polyPressure(uint8_t valuePar, int8_t channelPar) {
uint8_t channel = channelPar != -1 ? channelPar : sendingChannel;
uint8_t value = valuePar & 0b1111111;
this->outMessage.status = 0b1010 << 4 | channel;
this->outMessage.arg1 = value ;
writeData(&outMessage, 1);
}

void MidiCommon :: programChange(uint8_t program, int8_t channel){
void MidiCommon :: programChange(uint8_t program, int8_t channelPar) {
uint8_t channel = channelPar != -1 ? channelPar : sendingChannel;
uint8_t value = program & 0b1111111;
this->outMessage.status = 0b1100 << 4 | channel;
this->outMessage.arg1 = value ;
Expand All @@ -91,7 +94,8 @@ void MidiCommon :: localControl( bool active, int8_t channel){
controlChange(122,active ? 127 : 0, channel);
}

void MidiCommon :: controlChange(uint8_t msg, uint8_t value, int8_t channel){
void MidiCommon :: controlChange(uint8_t msg, uint8_t value, int8_t channelPar) {
uint8_t channel = channelPar != -1 ? channelPar : sendingChannel;
this->outMessage.status = 0b1011 << 4 | channel;
this->outMessage.arg1 = msg;
this->outMessage.arg2 = value;
Expand Down