mp

Author: mvladic

CMakeLists.txt

@@ -533,7 +533,7 @@ source_group("third_party\\micropython\\extmod" FILES ${src_third_party_micropyt
 
 set(src_third_party_micropython_ports_bb3
     src/third_party/micropython/ports/bb3/main.c
-    src/third_party/micropython/ports/bb3/gccollect.c
+    src/third_party/micropython/ports/bb3/gccollect.cpp
     src/third_party/micropython/ports/bb3/mphalport.cpp
 )
 list (APPEND src_files ${src_third_party_micropython_ports_bb3})

scripts/test.py

@@ -4,8 +4,8 @@
 
 U_STEP = 0.1
 U_MAX = 40.0
-TIME_STEP_MS = 10
-MEASURE_DELAY_MS = 5
+#TIME_STEP_MS = 10
+#MEASURE_DELAY_MS = 5
 I_SET = 0.001
 
 scpi("inst ch1")
@@ -14,7 +14,7 @@
 
 print("start")
 
-#i_list = []
+i_list = []
 #t = ticks_ms()
 i = 0
 while True:
@@ -23,6 +23,14 @@
         break
 
     scpi("volt " + str(u_set))
+    curr = scpi("curr?")
+    mode = scpi("outp:mode?")
+
+    i_list.append(float(curr))
+
+    #print(u_set)
+    #print(curr)
+    #print(mode)
 
     i = i + 1
 
@@ -34,6 +42,8 @@
 
     #i_list.add(scpi("curr?"))
 
+print(i_list)
+
      #t = ticks_add(t, (TIME_STEP_MS - MEASURE_DELAY_MS) * 1000)
     #sleep_ms(ticks_diff(t, ticks_ms()))
 

src/eez/mp.cpp

@@ -111,7 +111,7 @@ osThreadId g_mpTaskHandle;
 #pragma GCC diagnostic ignored "-Wwrite-strings"
 #endif
 
-osThreadDef(g_mpTask, mainLoop, osPriorityNormal, 0, 2048);
+osThreadDef(g_mpTask, mainLoop, osPriorityNormal, 0, 4096);
 
 #if defined(EEZ_PLATFORM_STM32)
 #pragma GCC diagnostic pop
@@ -233,34 +233,31 @@ void oneIter() {
     if (event.status == osEventMessage) {
         switch (event.value.v) {
         case QUEUE_MESSAGE_START_SCRIPT:
-
-            // Initialized stack limit
-            //mp_stack_set_limit(40000 * (BYTES_PER_WORD / 4));
-
-            // Initialize heap
-
-            // volatile int stackTop;
-            // mp_stack_set_top((void *)(&stackTop));
-            // mp_stack_set_limit(1024);
-
-            gc_init(g_scriptSource + g_scriptSourceLength, MP_BUFFER + MP_BUFFER_SIZE);
-
-            mp_init();
+            static bool g_initialized = false;
+            if (!g_initialized) {
+                volatile char dummy;
+                g_initialized = true;
+                mp_stack_set_top((void *)&dummy);
+                gc_init(g_scriptSource + g_scriptSourceLength, MP_BUFFER + MP_BUFFER_SIZE - 32768 - 1024);
+                mp_init();
+            }
 
             nlr_buf_t nlr;
             if (nlr_push(&nlr) == 0) {
                 mp_lexer_t *lex = mp_lexer_new_from_str_len(MP_QSTR__lt_stdin_gt_, g_scriptSource, g_scriptSourceLength, 0);
                 qstr source_name = lex->source_name;
                 mp_parse_tree_t parse_tree = mp_parse(lex, MP_PARSE_FILE_INPUT);
-                mp_obj_t module_fun = mp_compile(&parse_tree, source_name, true);
+                mp_obj_t module_fun = mp_compile(&parse_tree, source_name, MP_EMIT_OPT_NONE, true);
                 mp_call_function_0(module_fun);
                 nlr_pop();
             } else {
                 // uncaught exception
                 mp_obj_print_exception(&mp_plat_print, (mp_obj_t)nlr.ret_val);
             }
 
-            mp_deinit();
+            // gc_sweep_all();
+
+            // mp_deinit();
 
             break;
         }
@@ -328,29 +325,33 @@ void onQueueMessage(uint32_t type, uint32_t param) {
 }
 
 bool scpi(const char *commandOrQueryText, const char **resultText, size_t *resultTextLen) {
-    g_commandOrQueryText = commandOrQueryText;
     g_scpiDataLen = 0;
 
-    osMessagePut(scpi::g_scpiMessageQueueId, SCPI_QUEUE_MP_MESSAGE(EXECUTE_SCPI, 0), osWaitForever);
-
-    while (true) {
-       osEvent event = osMessageGet(g_mpMessageQueueId, osWaitForever);
-       if (event.status == osEventMessage) {
-           switch (event.value.v) {
-           case QUEUE_MESSAGE_SCPI_RESULT:
-               *resultText = g_scpiData;
-               *resultTextLen = g_scpiDataLen;
-               return true;
-           }
-       }
-    }
+    // g_commandOrQueryText = commandOrQueryText;
+    // osMessagePut(scpi::g_scpiMessageQueueId, SCPI_QUEUE_MP_MESSAGE(EXECUTE_SCPI, 0), osWaitForever);
+
+    // while (true) {
+    //    osEvent event = osMessageGet(g_mpMessageQueueId, osWaitForever);
+    //    if (event.status == osEventMessage) {
+    //        switch (event.value.v) {
+    //        case QUEUE_MESSAGE_SCPI_RESULT:
+    //            *resultText = g_scpiData;
+    //            *resultTextLen = g_scpiDataLen;
+    //            return true;
+    //        }
+    //    }
+    // }
 
-    // input(g_scpiContext, (const char *)commandOrQueryText, strlen(commandOrQueryText));
-    // input(g_scpiContext, "\r\n", 2);
+    input(g_scpiContext, (const char *)commandOrQueryText, strlen(commandOrQueryText));
+    input(g_scpiContext, "\r\n", 2);
 
-    // *resultText = g_scpiData;
-    // *resultTextLen = g_scpiDataLen;
-    // return true;
+    if (g_scpiDataLen >= 2 && g_scpiData[g_scpiDataLen - 2] == '\r' && g_scpiData[g_scpiDataLen - 1] == '\n') {
+        g_scpiDataLen -= 2;
+    }
+
+    *resultText = g_scpiData;
+    *resultTextLen = g_scpiDataLen;
+    return true;
 }
 
 } // mp

src/third_party/micropython/ports/bb3/gccollect.c

@@ -0,0 +1,65 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2013, 2014 Damien P. George
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+#include <stdio.h>
+#include <setjmp.h>
+
+#ifdef _MSC_VER
+#pragma warning( push )
+#pragma warning( disable : 4200)
+#endif
+
+extern "C" {
+#include "py/mpstate.h"
+#include "py/gc.h"
+}
+
+#ifdef _MSC_VER
+#pragma warning( pop )
+#endif
+
+#if MICROPY_ENABLE_GC
+
+#include <eez/debug.h>
+
+typedef jmp_buf regs_t;
+static void gc_helper_get_regs(regs_t arr) {
+    setjmp(arr);
+}
+
+extern "C" void gc_collect(void) {
+    DebugTrace("gc_collect\n");
+
+    gc_collect_start();
+    regs_t regs;
+    gc_helper_get_regs(regs);
+    // GC stack (and regs because we captured them)
+    void **regs_ptr = (void**)(void*)&regs;
+    gc_collect_root(regs_ptr, ((mp_uint_t)MP_STATE_THREAD(stack_top) - (mp_uint_t)&regs) / sizeof(mp_uint_t));
+    gc_collect_end();
+}
+
+#endif //MICROPY_ENABLE_GC

src/third_party/micropython/ports/bb3/gccollect.cpp

@@ -49,8 +49,6 @@
 
 #define MICROPY_PY_UTIME_MP_HAL (1)
 
-#define MICROPY_STACKLESS (0)
-
 // type definitions for the specific machine
 
 #define MICROPY_MAKE_POINTER_CALLABLE(p) ((void*)((mp_uint_t)(p) | 1))

src/third_party/micropython/ports/bb3/mpconfigport.h

@@ -28,8 +28,6 @@
 #include <stdio.h>
 #endif
 
-#include <eez/debug.h>
-
 #ifdef _MSC_VER
 #pragma warning( push )
 #pragma warning( disable : 4200)
@@ -45,6 +43,8 @@ extern "C" {
 
 #include "cmsis_os.h"
 
+#include <eez/debug.h>
+
 extern"C" void mp_hal_stdout_tx_strn(const char *str, size_t len) {
     DebugTrace("%.*s", len, str);
 }