6.4.0

Author: QL

QP-Arduino_GPL_Exception.txt

@@ -2,7 +2,7 @@ QP-nano FRAMEWORK EXCEPTION FOR ARDUINO
 
 Version 1.1, 22 June 2016
 
-Copyright (c) Quantum Leaps, LLC. <http://state-machine.com/>
+Copyright (c) 2016 Quantum Leaps, LLC. <https://www.state-machine.com/>
 
 Everyone is permitted to copy and distribute verbatim copies of this
 license document, but changing it is not allowed.
@@ -20,10 +20,10 @@ programs to use, in this way, the QP-nano Framework code covered
 by this Exception.
 
 0. Definitions.
-"QP-nano Framework for Arduino" is a lightweight state machine
-framework as well as supporting build scripts and examples, as
-distributed in the QP-nano framework adaptation for Arduino at
-<https://sourceforge.net/projects/qpc/files/QP-nano_Arduino/>.
+"QP-nano Framework for Arduino" is a lightweight real-time framework,
+as well as all supporting ports and examples, as distributed from:
+<https://sourceforge.net/projects/qpc/files> and
+<https://github.com/QuantumLeaps>
 
 "Arduino-Certified Board" means any board with an Arduino-supported
 CPU that bears an official Arduino logo and/or is officially

README.md README.txtREADME.md renamed to README.txt

@@ -1,13 +1,11 @@
-![QP framework](https://state-machine.com/img/qpn-arduino_banner.jpg)
-
 This README provides a quick overview of QP-nano for Arduino.
 Please refer to the companion webiste to this project at:
 
-https://state-machine.com/arduino
+https://www.state-machine.com/arduino
 
 
----------------------------------------------------------------------------
-## Software Installation on Windows
+Software Installation on Windows
+================================
 The QP-nano adaptation for Arduino is distributed in a single ZIP
 archive qpn-<ver>_arduino-1.8.x.zip, where <ver> stands for version of
 the QP-nano framework.
@@ -21,14 +19,15 @@ box. Once you identify the Sketchbook folder, you simply unzip the whole
 archive to your Sketchbook.
 
 
-## Software Installation on MacOS
+Software Installation on MacOS
+==============================
 The Mac funtionality has been tested, but other users will likely find
 issues. Please submit issues at https://sourceforge.net/p/qpc/bugs/ and
 submit questions and suggestions at
 https://sourceforge.net/p/qpc/discussion/668726/
 
-
-### Install Dependencies
+Install Dependencies
+--------------------
 1. Install the AVR-GCC tooltrain for Mac OS X. Following are the commands
 to install using Homebrew (must have Homebrew installed):
 
@@ -46,8 +45,8 @@ security warnings.
 
 4. Install QM.
 
+Instructions for Configuring External Tools for a Model
 
-### Instructions for Configuring External Tools for a Model
 1. Ensure the model is not open in QM.
 
 2. Copy the Blinky model's settings
@@ -61,20 +60,22 @@ Sketchbook folder to the model's folder.
 Once you have a working .model file, copy it to other models and use it as
 a starting point.
 
-
-## Known Issues
+Known Issues
+------------
 1. The serialterm External Tool is working by opening a Terminal window.
 An additional Terminal window also appears and can be safely closed. When
 the Terminal window displaying the Arduino's output is closed, the port is
 busy and can no longer be accessed. Work-around is to unplug and
 re-connect the Arduino from the Mac's USB port.
 
 
----------------------------------------------------------------------------
-# Building the Examples in the QM Modeling Tool
+Building the Examples in the QM Modeling Tool
+=============================================
 
-> **NOTE:** To start working with the freeware QM modeling tool, you need to
+****
+NOTE: To start working with the freeware QM modeling tool, you need to
 download the tool from https://sourceforge.net/projects/qpc/files/QM.
+****
 
 Each QP-nano example for Arduino (in the examples_avr folder) contains
 a QM model, which is a file with the extension .qm., such as
@@ -86,8 +87,8 @@ you generate the complete Arduino sketch automatically-
 press of a button.
 
 
----------------------------------------------------------------------------
-# Licensing
+Licensing
+=========
 The QP-nano framework for Arduino is licensed under the modified GPLv3
 license (see file GPLv3.txt) with the QP-Arduino Exception (see file
 QP-Arduino_GPL_Exception.txt). Specifically, the Exception removes the
@@ -98,22 +99,19 @@ The QM graphical modeling tool is freeware. The QM tool is provided
 under the terms of a simple End-User License Agreement (EULA).
 
 
----------------------------------------------------------------------------
-# Documentation
+Documentation
+=============
 Please refer to the companion webiste to this project at:
 
-https://state-machine.com/arduino
+https://www.state-machine.com/arduino
 
 Specifically, the Application Note: "Event-Driven Arduino Programming
 with QP and QM" is available from:
 
-https://state-machine.com/doc/AN_Event-Driven_Arduino_QP-nano.pdf
-
+https://www.state-machine.com/doc/AN_Event-Driven_Arduino_QP-nano.pdf
 
----------------------------------------------------------------------------
-# How to get help?
-- [Free Support Forum](https://sourceforge.net/p/qpc/discussion/668726)
-- [Bug Reports](https://sourceforge.net/p/qpc/bugs/)
-- [Feature Requests](https://sourceforge.net/p/qpc/feature-requests/)
-- [Quantum Leaps website](https://state-machine.com)
 
+Support Questions
+=================
+Please submit any questions or comments to the free QP support forum at:
+http://sourceforge.net/p/qpc/discussion/668726

libraries/qpn_avr/examples/blinky/.blinky

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<session version="4.1.2">
+<session version="4.4.0">
  <item name="license">GPL</item>
  <group name="locked"/>
  <group name="settings">
@@ -9,8 +9,8 @@
   <item name="backups">0</item>
  </group>
  <group name="windows">
-  <item id=".::blinky.ino">-225,0,800,445</item>
-  <item id="AOs::Blinky::SM">0,0,575,407,*</item>
+  <item id=".::blinky.ino">0,0,800,445</item>
+  <item id="AOs::Blinky::SM">0,0,1105,359,*</item>
  </group>
  <group name="search">
   <item name="options">4129280</item>

libraries/qpn_avr/examples/blinky/blinky.ino

@@ -3,7 +3,7 @@
 * Model: blinky.qm
 * File:  ${.::blinky.ino}
 *
-* This code has been generated by QM tool (https://state-machine.com/qm).
+* This code has been generated by QM 4.4.0 (https://www.state-machine.com/qm).
 * DO NOT EDIT THIS FILE MANUALLY. All your changes will be lost.
 *
 * This program is open source software: you can redistribute it and/or
@@ -107,11 +107,13 @@ void Q_onAssert(char const Q_ROM * const file, int line) {
 
 //============================================================================
 // define all AO classes (state machine)...
-/*$define${AOs::Blinky} ####################################################*/
+/*$skip${QP_VERSION} #######################################################*/
 /* Check for the minimum required QP version */
-#if ((QP_VERSION < 601) || (QP_VERSION != ((QP_RELEASE^4294967295U) % 0x3E8)))
-#error qpn version 6.0.1 or higher required
+#if (QP_VERSION < 640U) || (QP_VERSION != ((QP_RELEASE^4294967295U) % 0x3E8U))
+#error qpn version 6.4.0 or higher required
 #endif
+/*$endskip${QP_VERSION} ####################################################*/
+/*$define${AOs::Blinky} ####################################################*/
 /*${AOs::Blinky} ...........................................................*/
 /*${AOs::Blinky::SM} .......................................................*/
 static QState Blinky_initial(Blinky * const me) {

libraries/qpn_avr/examples/blinky/blinky.qm

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<model version="4.1.2" links="0">
+<model version="4.4.0" links="0">
  <documentation>This is the Blinky example for the Arduino-UNO board, which blinks the on-board LED (L) once per second. The example demonstrates:
 
 1. One active object class &quot;Blinky&quot; (inside the package &quot;AOs&quot;)

libraries/qpn_avr/examples/dpp/.dpp

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<session version="4.1.2">
+<session version="4.4.0">
  <item name="license">GPL</item>
  <group name="locked"/>
  <group name="settings">
@@ -9,9 +9,9 @@
   <item name="backups">0</item>
  </group>
  <group name="windows">
-  <item id=".::dpp.ino">-225,0,800,445</item>
-  <item id="AOs::Philo::SM">0,0,575,407,*</item>
-  <item id="AOs::Table::SM">-65,0,640,480</item>
+  <item id=".::dpp.ino">0,0,1105,543</item>
+  <item id="AOs::Philo::SM">0,0,1105,479,*</item>
+  <item id="AOs::Table::SM">0,0,640,480</item>
  </group>
  <group name="search">
   <item name="options">4129280</item>

libraries/qpn_avr/examples/dpp/dpp.ino

@@ -3,7 +3,7 @@
 * Model: dpp.qm
 * File:  ${.::dpp.ino}
 *
-* This code has been generated by QM tool (https://state-machine.com/qm).
+* This code has been generated by QM 4.4.0 (https://www.state-machine.com/qm).
 * DO NOT EDIT THIS FILE MANUALLY. All your changes will be lost.
 *
 * This program is open source software: you can redistribute it and/or
@@ -161,11 +161,11 @@ ISR(TIMER2_COMPA_vect) {
         switch (Serial.read()) { // read the incoming byte
             case 'p':
             case 'P':
-                QACTIVE_POST_ISR(&AO_Table.super, PAUSE_SIG, 0U);
+                QACTIVE_POST_ISR(&AO_Table, PAUSE_SIG, 0U);
                 break;
             case 's':
             case 'S':
-                QACTIVE_POST_ISR(&AO_Table.super, SERVE_SIG, 0U);
+                QACTIVE_POST_ISR(&AO_Table, SERVE_SIG, 0U);
                 break;
         }
     }
@@ -195,17 +195,24 @@ void QV_onIdle(void) {   // called with interrupts DISABLED
 //............................................................................
 void Q_onAssert(char const Q_ROM * const file, int line) {
     // implement the error-handling policy for your application!!!
+    Serial.print(F("ASSERTION:"));
+    Serial.print(file);
+    Serial.print(line, DEC);
+    for (uint32_t volatile i = 100000; i > 0; --i) {
+    }
     QF_INT_DISABLE(); // disable all interrupts
     QF_RESET();  // reset the CPU
 }
 
 //============================================================================
 // define all AO classes...
-/*$define${AOs::Philo} #####################################################*/
+/*$skip${QP_VERSION} #######################################################*/
 /* Check for the minimum required QP version */
-#if ((QP_VERSION < 601) || (QP_VERSION != ((QP_RELEASE^4294967295U) % 0x3E8)))
-#error qpn version 6.0.1 or higher required
+#if (QP_VERSION < 640U) || (QP_VERSION != ((QP_RELEASE^4294967295U) % 0x3E8U))
+#error qpn version 6.4.0 or higher required
 #endif
+/*$endskip${QP_VERSION} ####################################################*/
+/*$define${AOs::Philo} #####################################################*/
 /*${AOs::Philo} ............................................................*/
 /*${AOs::Philo::SM} ........................................................*/
 static QState Philo_initial(Philo * const me) {

libraries/qpn_avr/examples/dpp/dpp.qm

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<model version="4.1.2" links="0">
+<model version="4.4.0" links="0">
  <documentation>This is the Dining Philosopher Problem (DPP) example for the Arduino-UNO board. The example demonstrates:
 
 1. Multiple active objects (5 Philosophers and 1 Table AO)
@@ -363,11 +363,11 @@ ISR(TIMER2_COMPA_vect) {
         switch (Serial.read()) { // read the incoming byte
             case 'p':
             case 'P':
-                QACTIVE_POST_ISR(&amp;AO_Table.super, PAUSE_SIG, 0U);
+                QACTIVE_POST_ISR(&amp;AO_Table, PAUSE_SIG, 0U);
                 break;
             case 's':
             case 'S':
-                QACTIVE_POST_ISR(&amp;AO_Table.super, SERVE_SIG, 0U);
+                QACTIVE_POST_ISR(&amp;AO_Table, SERVE_SIG, 0U);
                 break;
         }
     }
@@ -397,6 +397,11 @@ void QV_onIdle(void) {   // called with interrupts DISABLED
 //............................................................................
 void Q_onAssert(char const Q_ROM * const file, int line) {
     // implement the error-handling policy for your application!!!
+    Serial.print(F(&quot;ASSERTION:&quot;));
+    Serial.print(file);
+    Serial.print(line, DEC);
+    for (uint32_t volatile i = 100000; i &gt; 0; --i) {
+    }
     QF_INT_DISABLE(); // disable all interrupts
     QF_RESET();  // reset the CPU
 }

libraries/qpn_avr/examples/dpp_comp/.dpp_comp

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<session version="4.1.2">
+<session version="4.4.0">
  <item name="license">GPL</item>
  <group name="locked"/>
  <group name="settings">
@@ -9,9 +9,9 @@
   <item name="backups">0</item>
  </group>
  <group name="windows">
-  <item id=".::dpp_comp.ino">-338,0,913,613</item>
+  <item id=".::dpp_comp.ino">0,0,1105,479,*</item>
   <item id="AOs::Philo::SM">0,0,892,660</item>
-  <item id="AOs::Table::SM">0,0,575,407,*</item>
+  <item id="AOs::Table::SM">0,0,1105,543</item>
  </group>
  <group name="search">
   <item name="options">2032128</item>

libraries/qpn_avr/examples/dpp_comp/dpp_comp.ino

@@ -3,7 +3,7 @@
 * Model: dpp_comp.qm
 * File:  ${.::dpp_comp.ino}
 *
-* This code has been generated by QM tool (https://state-machine.com/qm).
+* This code has been generated by QM 4.4.0 (https://www.state-machine.com/qm).
 * DO NOT EDIT THIS FILE MANUALLY. All your changes will be lost.
 *
 * This program is open source software: you can redistribute it and/or
@@ -206,22 +206,24 @@ void QV_onIdle(void) {   // called with interrupts DISABLED
 //............................................................................
 void Q_onAssert(char const Q_ROM * const module, int line) {
     // implement the error-handling policy for your application!!!
-    //Serial.print(F("Assert: "));
+    Serial.print(F("ASSERT:"));
     Serial.print(reinterpret_cast<const __FlashStringHelper *>(module));
     Serial.println(line, DEC);
-    delay(200);
-
+    delay(500);
+    for (;;) {}
     QF_INT_DISABLE(); // disable all interrupts
     QF_RESET();  // reset the CPU
 }
 
 //============================================================================
 // define the components...
-/*$define${AOs::Philo} #####################################################*/
+/*$skip${QP_VERSION} #######################################################*/
 /* Check for the minimum required QP version */
-#if ((QP_VERSION < 601) || (QP_VERSION != ((QP_RELEASE^4294967295U) % 0x3E8)))
-#error qpn version 6.0.1 or higher required
+#if (QP_VERSION < 640U) || (QP_VERSION != ((QP_RELEASE^4294967295U) % 0x3E8U))
+#error qpn version 6.4.0 or higher required
 #endif
+/*$endskip${QP_VERSION} ####################################################*/
+/*$define${AOs::Philo} #####################################################*/
 /*${AOs::Philo} ............................................................*/
 /*${AOs::Philo::ctor} ......................................................*/
 static void Philo_ctor(Philo * const me, uint8_t num) {