Merge branch 'probonopd:main' into buttonmidi

pull/365/head^2
Kevin 3 years ago committed by GitHub
commit b3f678b72a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 2
      .github/workflows/build.yml
  2. 7
      src/serialmididevice.cpp

@ -24,7 +24,7 @@ jobs:
run: | run: |
set -ex set -ex
cd circle-stdlib/libs/circle cd circle-stdlib/libs/circle
git checkout a8e8c9f # develop git checkout 646c362 # develop
cd - cd -
- name: Install toolchains - name: Install toolchains
run: | run: |

@ -49,7 +49,12 @@ CSerialMIDIDevice::~CSerialMIDIDevice (void)
boolean CSerialMIDIDevice::Initialize (void) boolean CSerialMIDIDevice::Initialize (void)
{ {
assert (m_pConfig); assert (m_pConfig);
return m_Serial.Initialize (m_pConfig->GetMIDIBaudRate ()); boolean res = m_Serial.Initialize (m_pConfig->GetMIDIBaudRate ());
unsigned ser_options = m_Serial.GetOptions();
// Ensure CR->CRLF translation is disabled for MIDI links
ser_options &= ~(SERIAL_OPTION_ONLCR);
m_Serial.SetOptions(ser_options);
return res;
} }
void CSerialMIDIDevice::Process (void) void CSerialMIDIDevice::Process (void)

Loading…
Cancel
Save