Skip to content

Fixed API issues #8

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
midilab merged 3 commits into from
Nov 16, 2024
Merged

Fixed API issues #8

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
dc007d4
API change in the ESP32 Arduino libraries, see:
rdridder Oct 12, 2024
8dc18c7
The timer handling changed in the ESP32 Arduino libraries, see docume…
rdridder Oct 12, 2024
d7e3f1b
Update esp32.h
midilab Nov 16, 2024
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
2 changes: 1 addition & 1 deletion module/midi/BLE-MIDI/hardware/BLEMIDI_ESP32.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@ class MyCharacteristicCallbacks : public BLECharacteristicCallbacks

void onWrite(BLECharacteristic *characteristic)
{
std::string rxValue = characteristic->getValue();
String rxValue = characteristic->getValue();
if (rxValue.length() > 0)
{
_bluetoothEsp32->receive((uint8_t *)(rxValue.c_str()), rxValue.length());
Expand Down
2 changes: 1 addition & 1 deletion module/midi/BLE-MIDI/hardware/BLEMIDI_ESP32_NimBLE.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@ class MyCharacteristicCallbacks : public BLECharacteristicCallbacks

void onWrite(BLECharacteristic *characteristic)
{
std::string rxValue = characteristic->getValue();
String rxValue = characteristic->getValue();
if (rxValue.length() > 0)
{
_bluetoothEsp32->receive((uint8_t *)(rxValue.c_str()), rxValue.length());
Expand Down
9 changes: 3 additions & 6 deletions platforms/esp32.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,16 +53,13 @@ void initTimer(uint32_t init_clock)
// create the ctrlTask
xTaskCreate(ctrlTask, "ctrlTask", CTRL_STACK_SIZE, NULL, CTRL_TASK_PRIORITY, &_taskHandle);

_uctrlTimer = timerBegin(TIMER_ID, 60, true);
_uctrlTimer = timerBegin(init_clock);

// attach to generic uclock ISR
timerAttachInterrupt(_uctrlTimer, &handlerISR, false);
timerAttachInterrupt(_uctrlTimer, &handlerISR);

// init clock tick time
timerAlarmWrite(_uctrlTimer, init_clock, true);

// activate it!
timerAlarmEnable(_uctrlTimer);
timerAlarm(_uctrlTimer, init_clock, true, 0);
}

} // end namespace uctrl