UpsilonNumworks/Upsilon
1
0
Fork 0
mirror of https://github.com/UpsilonNumworks/Upsilon.git synced 2026-03-18 21:30:38 +01:00
Code Issues Packages Projects Releases Wiki Activity

[apps/code] Do not call interrupt in printText

Browse Source
This commit is contained in:
Léa Saviot
2020-01-20 15:01:47 +01:00
parent 1dacd71acb
commit 3dcb40b5d4
3 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
apps/code/console_controller.cpp
View File

@@ -386,7 +386,6 @@ void ConsoleController::refreshPrintOutput() {
/* printText is called by the Python machine. /* printText is called by the Python machine.
* The text argument is not always null-terminated. */ * The text argument is not always null-terminated. */
void ConsoleController::printText(const char * text, size_t length) { void ConsoleController::printText(const char * text, size_t length) {
micropython_port_vm_hook_loop_content();
size_t textCutIndex = firstNewLineCharIndex(text, length); size_t textCutIndex = firstNewLineCharIndex(text, length);
if (textCutIndex >= length) { if (textCutIndex >= length) {
/* If there is no new line in text, just append it to the output /* If there is no new line in text, just append it to the output
@@ -406,6 +405,7 @@ void ConsoleController::printText(const char * text, size_t length) {
assert(textCutIndex == length - 1); assert(textCutIndex == length - 1);
appendTextToOutputAccumulationBuffer(text, length-1); appendTextToOutputAccumulationBuffer(text, length-1);
flushOutputAccumulationBufferToStore(); flushOutputAccumulationBufferToStore();
micropython_port_vm_hook_refresh_print();
} }
void ConsoleController::autoImportScript(Script script, bool force) { void ConsoleController::autoImportScript(Script script, bool force) {

12
python/port/helpers.cpp
View File

@@ -19,16 +19,16 @@ bool micropython_port_vm_hook_loop() {
return false; return false;
} }
return micropython_port_vm_hook_loop_content(); micropython_port_vm_hook_refresh_print();
}
bool micropython_port_vm_hook_loop_content() {
assert(MicroPython::ExecutionEnvironment::currentExecutionEnvironment() != nullptr);
MicroPython::ExecutionEnvironment::currentExecutionEnvironment()->refreshPrintOutput();
// Check if the user asked for an interruption from the keyboard // Check if the user asked for an interruption from the keyboard
return micropython_port_interrupt_if_needed(); 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) { bool micropython_port_interruptible_msleep(int32_t delay) {
assert(delay >= 0); assert(delay >= 0);
/* We don't use millis because the systick drifts when changing the HCLK /* We don't use millis because the systick drifts when changing the HCLK

2
python/port/helpers.h
View File

@@ -10,7 +10,7 @@ extern "C" {
// These methods return true if they have been interrupted // These methods return true if they have been interrupted
bool micropython_port_vm_hook_loop(); bool micropython_port_vm_hook_loop();
bool micropython_port_vm_hook_loop_content(); void micropython_port_vm_hook_refresh_print();
bool micropython_port_interruptible_msleep(int32_t delay); bool micropython_port_interruptible_msleep(int32_t delay);
bool micropython_port_interrupt_if_needed(); bool micropython_port_interrupt_if_needed();
int micropython_port_random(); int micropython_port_random();