mirror of
https://github.com/UpsilonNumworks/Upsilon.git
synced 2026-01-18 16:27:34 +01:00
a0583aa2a9
This is due to a missing check in the interruptible sleep function which was not checking if the delay was negative, then was passed to the Ion::Timing::usleep function, who only takes signed values
72 lines
2.3 KiB
C++
72 lines
2.3 KiB
C++
#include "helpers.h"
|
|
#include "port.h"
|
|
#include <ion.h>
|
|
extern "C" {
|
|
#include "mphalport.h"
|
|
}
|
|
|
|
bool micropython_port_vm_hook_loop() {
|
|
/* This function is called very frequently by the MicroPython engine. We grab
|
|
* this opportunity to interrupt execution and/or refresh the display on
|
|
* platforms that need it. */
|
|
|
|
/* Doing too many things here slows down Python execution quite a lot. So we
|
|
* only do things once in a while and return as soon as possible otherwise. */
|
|
|
|
static uint64_t t = Ion::Timing::millis();
|
|
static constexpr uint64_t delay = 100;
|
|
|
|
uint64_t t2 = Ion::Timing::millis();
|
|
if (t2 - t < delay) {
|
|
return false;
|
|
}
|
|
t = t2;
|
|
|
|
micropython_port_vm_hook_refresh_print();
|
|
// Check if the user asked for an interruption from the keyboard
|
|
return micropython_port_interrupt_if_needed();
|
|
}
|
|
|
|
void micropython_port_vm_hook_refresh_print() {
|
|
assert(MicroPython::ExecutionEnvironment::currentExecutionEnvironment() != nullptr);
|
|
MicroPython::ExecutionEnvironment::currentExecutionEnvironment()->refreshPrintOutput();
|
|
}
|
|
|
|
bool micropython_port_interruptible_msleep(int32_t delay) {
|
|
// Check if the user entered a bad delay (negative)
|
|
if (delay < 0) {
|
|
return false;
|
|
}
|
|
|
|
assert(delay >= 0);
|
|
/* We don't use millis because the systick drifts when changing the HCLK
|
|
* frequency. */
|
|
constexpr int32_t interruptionCheckDelay = 100;
|
|
const int32_t numberOfInterruptionChecks = delay / interruptionCheckDelay;
|
|
int32_t remainingDelay = delay - numberOfInterruptionChecks * interruptionCheckDelay;
|
|
int32_t currentRemainingInterruptionChecks = numberOfInterruptionChecks;
|
|
do {
|
|
// We assume the time taken by the interruption check is insignificant
|
|
if (micropython_port_interrupt_if_needed()) {
|
|
return true;
|
|
}
|
|
Ion::Timing::msleep(currentRemainingInterruptionChecks == numberOfInterruptionChecks ? remainingDelay : interruptionCheckDelay);
|
|
currentRemainingInterruptionChecks--;
|
|
} while (currentRemainingInterruptionChecks >= 0);
|
|
return false;
|
|
}
|
|
|
|
bool micropython_port_interrupt_if_needed() {
|
|
Ion::Keyboard::State scan = Ion::Keyboard::scan();
|
|
Ion::Keyboard::Key interruptKey = static_cast<Ion::Keyboard::Key>(mp_interrupt_char);
|
|
if (scan.keyDown(interruptKey)) {
|
|
mp_keyboard_interrupt();
|
|
return true;
|
|
}
|
|
return false;
|
|
}
|
|
|
|
int micropython_port_random() {
|
|
return Ion::random();
|
|
}
|