Remove QSpy related parts

Author: Nguyen Do

README.MD

@@ -15,23 +15,4 @@ Open any of the examples and upload to an ESP32.
 
 - Typically `QF::run()` should be executed as a last instruction before QP takes charge of executing the framework. As such, it should not return and instead give control to the scheduler of the host. However, the ESP32 framework (esp-idf) already runs the scheduler [before](https://github.com/espressif/arduino-esp32/blob/8ee5f0a11e5423a018e0f89146e05074466274db/cores/esp32/main.cpp#L55) `void setup()` and `void loop()`. This means that instead of running `QF::run()` in a loop, it suffices to execute it once as the last instruction in `void setup()`.
 
-## QPSY
-
-[QSPY](https://www.state-machine.com/qtools/qspy.html) can be activated by defining `QS_ON`in `bsp.cpp` of both examples
-
-Example of how to communicate with esp32 target with qspy enabled.
-
-```bash
-qspy -c YOUR_SERIAL_PORT -b 115200
-```
-
-## QView
-
-DPP example can be tested with [QView™](https://www.state-machine.com/qtools/qview.html) example located in `examples/dpp_bsp-esp32/qview`. There are two bat scripts (Windows) which can run the QView scripts.
-
-
-Note: QSpy must be running before using QView.
-
-
-
-
+- No more QSpy on this port

examples/blinky_bsp-esp32/blinky_bsp-esp32.qm

@@ -90,15 +90,11 @@ public:
 #include "blinky.hpp"  // Blinky application interface
 #include "bsp.hpp"     // Board Support Package (BSP)
 #include "Arduino.h"
-#include "esp_log.h"
 #include "esp_freertos_hooks.h"
 
 using namespace QP;
-static constexpr unsigned LED_BUILTIN = 13;
-// QS facilities
+static constexpr unsigned LED_BUILTIN = 2;
 
-// un-comment if QS instrumentation needed
-//#define QS_ON
 // BSP functions
 static void tickHook_ESP32(void); /*Tick hook for QP */
 static uint8_t const l_TickHook = static_cast<uint8_t>(0);
@@ -121,62 +117,21 @@ void BSP::init(void) {
     pinMode(LED_BUILTIN, OUTPUT);
     Serial.begin(115200); // run serial port at 115200 baud rate
     QS_INIT(nullptr);
-#ifdef QS_ON
-    // setup the QS filters...
-    QS_GLB_FILTER(QP::QS_SM_RECORDS); // state machine records
-    QS_GLB_FILTER(QP::QS_AO_RECORDS); // active object records
-    QS_GLB_FILTER(QP::QS_UA_RECORDS); // all user records
-#endif
 }
 //............................................................................
 void BSP::ledOff(void) {
     digitalWrite(LED_BUILTIN, LOW);
-    log_i("led off");
+    Serial.println("led off");
 }
 //............................................................................
 void BSP::ledOn(void) {
     digitalWrite(LED_BUILTIN, HIGH);
-    log_i("led on");
+    Serial.println("led on");
 }
-
 //............................................................................
-void QSpy_Task(void *) {
-  while(1)
-  {
-    // transmit QS outgoing data (QS-TX)
-    uint16_t len = Serial.availableForWrite();
-    if (len > 0U) { // any space available in the output buffer?
-        uint8_t const *buf = QS::getBlock(&len);
-        if (buf) {
-            Serial.write(buf, len); // asynchronous and non-blocking
-        }
-    }
-
-    // receive QS incoming data (QS-RX)
-    len = Serial.available();
-    if (len > 0U) {
-        do {
-            QP::QS::rxPut(Serial.read());
-        } while (--len > 0U);
-        QS::rxParse();
-    }
-    delay(100);
-  };
-}
-
 void QF::onStartup(void) {
     esp_register_freertos_tick_hook_for_cpu(tickHook_ESP32, QP_CPU_NUM);
     QS_OBJ_DICTIONARY(&l_TickHook);
-#ifdef QS_ON
-    xTaskCreatePinnedToCore(
-                    QSpy_Task,   /* Function to implement the task */
-                    "QSPY", /* Name of the task */
-                    10000,      /* Stack size in words */
-                    NULL,       /* Task input parameter */
-                    configMAX_PRIORITIES-1,          /* Priority of the task */
-                    NULL,       /* Task handle. */
-                    QP_CPU_NUM);  /* Core where the task should run */
-#endif
 }
 //............................................................................
 extern "C" Q_NORETURN Q_onAssert(char const * const module, int location) {
@@ -185,63 +140,14 @@ extern "C" Q_NORETURN Q_onAssert(char const * const module, int locati
     //
     (void)module;
     (void)location;
-    log_e("QP Assert module: %s @ %d", module, location);
+    Serial.print("QP Assert module: ");
+    Serial.print(module);
+    Serial.print("@ ");
+    Serial.println(location);
     QF_INT_DISABLE(); // disable all interrupts
     for (;;) { // sit in an endless loop for now
     }
-}
-
-//----------------------------------------------------------------------------
-// QS callbacks...
-//............................................................................
-namespace QP {
-#ifdef Q_SPY
-namespace QS {
-bool onStartup(void const * arg) {
-    static uint8_t qsTxBuf[1024]; // buffer for QS transmit channel (QS-TX)
-    static uint8_t qsRxBuf[128];  // buffer for QS receive channel (QS-RX)
-    initBuf  (qsTxBuf, sizeof(qsTxBuf));
-    rxInitBuf(qsRxBuf, sizeof(qsRxBuf));
-    return true; // return success
-}
-//............................................................................
-void onCommand(uint8_t cmdId, uint32_t param1,
-                       uint32_t param2, uint32_t param3)
-{
-    (void)cmdId;
-    (void)param1;
-    (void)param2;
-    (void)param3;
-}
-//............................................................................
-void onCleanup(void) {
-}
-//............................................................................
-QP::QTimeEvtCtr onGetTime(void) {
-    return millis();
-}
-//............................................................................
-void onFlush(void) {
-#ifdef QS_ON
-    uint16_t len = 0xFFFFU; // big number to get as many bytes as available
-    uint8_t const *buf = QS::getBlock(&len); // get continguous block of data
-    while (buf != nullptr) { // data available?
-        Serial.write(buf, len); // might poll until all bytes fit
-        len = 0xFFFFU; // big number to get as many bytes as available
-        buf = QS::getBlock(&len); // try to get more data
-    }
-    Serial.flush(); // wait for the transmission of outgoing data to complete
-#endif // QS_ON
-}
-//............................................................................
-void onReset(void) {
-    esp_restart();
-}
-} // namespace QS
-
-#endif // Q_SPY
-
-} // namespace QP</text>
+}</text>
   </file>
   <file name="blinky.hpp">
    <text>#ifndef BLINKY_HPP
@@ -259,7 +165,7 @@ $declare${AOs::AO_Blinky}
 #endif // BLINKY_HPP
 </text>
   </file>
-  <file name="main.cpp">
+  <file name="blinky_bsp-esp32.ino">
    <text>#include &quot;qpcpp.hpp&quot;   // QP-C++ framework
 #include &quot;blinky.hpp&quot;  // Blinky application interface
 #include &quot;bsp.hpp&quot;     // Board Support Package (BSP)
@@ -285,7 +191,7 @@ void setup() {
     AO_Blinky-&gt;start(1U, // priority
                      blinky_queueSto, // queue storage for events
                      Q_DIM(blinky_queueSto), //len of queue
-                     stack, 
+                     stack,
                      sizeof(stack));
 
     QF::run(); // Normally QF Run is located in a loop 

examples/blinky_bsp-esp32/bsp.cpp

@@ -42,11 +42,8 @@
 #include "esp_freertos_hooks.h"
 
 using namespace QP;
-static constexpr unsigned LED_BUILTIN = 13;
-// QS facilities
+static constexpr unsigned LED_BUILTIN = 2;
 
-// un-comment if QS instrumentation needed
-//#define QS_ON
 // BSP functions
 static void tickHook_ESP32(void); /*Tick hook for QP */
 static uint8_t const l_TickHook = static_cast<uint8_t>(0);
@@ -69,12 +66,6 @@ void BSP::init(void) {
     pinMode(LED_BUILTIN, OUTPUT);
     Serial.begin(115200); // run serial port at 115200 baud rate
     QS_INIT(nullptr);
-#ifdef QS_ON
-    // setup the QS filters...
-    QS_GLB_FILTER(QP::QS_SM_RECORDS); // state machine records
-    QS_GLB_FILTER(QP::QS_AO_RECORDS); // active object records
-    QS_GLB_FILTER(QP::QS_UA_RECORDS); // all user records
-#endif
 }
 //............................................................................
 void BSP::ledOff(void) {
@@ -86,45 +77,10 @@ void BSP::ledOn(void) {
     digitalWrite(LED_BUILTIN, HIGH);
     Serial.println("led on");
 }
-
 //............................................................................
-void QSpy_Task(void *) {
-  while(1)
-  {
-    // transmit QS outgoing data (QS-TX)
-    uint16_t len = Serial.availableForWrite();
-    if (len > 0U) { // any space available in the output buffer?
-        uint8_t const *buf = QS::getBlock(&len);
-        if (buf) {
-            Serial.write(buf, len); // asynchronous and non-blocking
-        }
-    }
-
-    // receive QS incoming data (QS-RX)
-    len = Serial.available();
-    if (len > 0U) {
-        do {
-            QP::QS::rxPut(Serial.read());
-        } while (--len > 0U);
-        QS::rxParse();
-    }
-    delay(100);
-  };
-}
-
 void QF::onStartup(void) {
     esp_register_freertos_tick_hook_for_cpu(tickHook_ESP32, QP_CPU_NUM);
     QS_OBJ_DICTIONARY(&l_TickHook);
-#ifdef QS_ON
-    xTaskCreatePinnedToCore(
-                    QSpy_Task,   /* Function to implement the task */
-                    "QSPY", /* Name of the task */
-                    10000,      /* Stack size in words */
-                    NULL,       /* Task input parameter */
-                    configMAX_PRIORITIES-1,          /* Priority of the task */
-                    NULL,       /* Task handle. */
-                    QP_CPU_NUM);  /* Core where the task should run */
-#endif
 }
 //............................................................................
 extern "C" Q_NORETURN Q_onAssert(char const * const module, int location) {
@@ -140,56 +96,4 @@ extern "C" Q_NORETURN Q_onAssert(char const * const module, int location) {
     QF_INT_DISABLE(); // disable all interrupts
     for (;;) { // sit in an endless loop for now
     }
-}
-
-//----------------------------------------------------------------------------
-// QS callbacks...
-//............................................................................
-namespace QP {
-#ifdef Q_SPY
-namespace QS {
-bool onStartup(void const * arg) {
-    static uint8_t qsTxBuf[1024]; // buffer for QS transmit channel (QS-TX)
-    static uint8_t qsRxBuf[128];  // buffer for QS receive channel (QS-RX)
-    initBuf  (qsTxBuf, sizeof(qsTxBuf));
-    rxInitBuf(qsRxBuf, sizeof(qsRxBuf));
-    return true; // return success
-}
-//............................................................................
-void onCommand(uint8_t cmdId, uint32_t param1,
-                       uint32_t param2, uint32_t param3)
-{
-    (void)cmdId;
-    (void)param1;
-    (void)param2;
-    (void)param3;
-}
-//............................................................................
-void onCleanup(void) {
-}
-//............................................................................
-QP::QTimeEvtCtr onGetTime(void) {
-    return millis();
-}
-//............................................................................
-void onFlush(void) {
-#ifdef QS_ON
-    uint16_t len = 0xFFFFU; // big number to get as many bytes as available
-    uint8_t const *buf = QS::getBlock(&len); // get continguous block of data
-    while (buf != nullptr) { // data available?
-        Serial.write(buf, len); // might poll until all bytes fit
-        len = 0xFFFFU; // big number to get as many bytes as available
-        buf = QS::getBlock(&len); // try to get more data
-    }
-    Serial.flush(); // wait for the transmission of outgoing data to complete
-#endif // QS_ON
-}
-//............................................................................
-void onReset(void) {
-    esp_restart();
-}
-} // namespace QS
-
-#endif // Q_SPY
-
-} // namespace QP
+}