7.1.0-beta3

zephyr 3.1.99

Author: quantum-leaps

examples/zephyr/blinky/prj.conf

@@ -3,6 +3,7 @@
 
 CONFIG_NUM_COOP_PRIORITIES=29
 CONFIG_NUM_PREEMPT_PRIORITIES=40
+CONFIG_THREAD_NAME=y
 CONFIG_REBOOT=y
 
 # for QSPY...

examples/zephyr/blinky/src/blinky.c

@@ -1,36 +1,34 @@
-/*****************************************************************************
-* Product: Simple Blinky example
-* Last Updated for Version: 5.6.5
-* Date of the Last Update:  2016-06-03
-*
-*                    Q u a n t u m     L e a P s
-*                    ---------------------------
-*                    innovating embedded systems
-*
+/*============================================================================
+* QP/C Real-Time Embedded Framework (RTEF)
 * Copyright (C) 2005 Quantum Leaps, LLC. All rights reserved.
 *
-* This program is open source software: you can redistribute it and/or
-* modify it under the terms of the GNU General Public License as published
-* by the Free Software Foundation, either version 3 of the License, or
-* (at your option) any later version.
+* SPDX-License-Identifier: GPL-3.0-or-later OR LicenseRef-QL-commercial
 *
-* Alternatively, this program may be distributed and modified under the
-* terms of Quantum Leaps commercial licenses, which expressly supersede
-* the GNU General Public License and are specifically designed for
-* licensees interested in retaining the proprietary status of their code.
+* This software is dual-licensed under the terms of the open source GNU
+* General Public License version 3 (or any later version), or alternatively,
+* under the terms of one of the closed source Quantum Leaps commercial
+* licenses.
 *
-* This program is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-* GNU General Public License for more details.
+* The terms of the open source GNU General Public License version 3
+* can be found at: <www.gnu.org/licenses/gpl-3.0>
 *
-* You should have received a copy of the GNU General Public License
-* along with this program. If not, see <www.gnu.org/licenses/>.
+* The terms of the closed source Quantum Leaps commercial licenses
+* can be found at: <www.state-machine.com/licensing>
+*
+* Redistributions in source code must retain this top-level comment block.
+* Plagiarizing this software to sidestep the license obligations is illegal.
 *
 * Contact information:
-* Web:   www.state-machine.com
+* <www.state-machine.com>
 * <[email protected]>
-*****************************************************************************/
+============================================================================*/
+/*!
+* @date Last updated on: 2022-08-24
+* @version Last updated for: Zephyr 3.1.99 and @ref qpc_7_1_0
+*
+* @file
+* @brief Blinky example
+*/
 #include "qpc.h"
 #include "blinky.h"
 #include "bsp.h"

examples/zephyr/blinky/src/blinky.h

@@ -1,36 +1,34 @@
-/*****************************************************************************
-* Product: simple "Blinky" example
-* Last Updated for Version: 5.4.0
-* Date of the Last Update:  2015-03-07
+/*============================================================================
+* QP/C Real-Time Embedded Framework (RTEF)
+* Copyright (C) 2005 Quantum Leaps, LLC. All rights reserved.
 *
-*                    Q u a n t u m     L e a P s
-*                    ---------------------------
-*                    innovating embedded systems
+* SPDX-License-Identifier: GPL-3.0-or-later OR LicenseRef-QL-commercial
 *
-* Copyright (C) 2005 Quantum Leaps, LLC. state-machine.com.
+* This software is dual-licensed under the terms of the open source GNU
+* General Public License version 3 (or any later version), or alternatively,
+* under the terms of one of the closed source Quantum Leaps commercial
+* licenses.
 *
-* This program is open source software: you can redistribute it and/or
-* modify it under the terms of the GNU General Public License as published
-* by the Free Software Foundation, either version 3 of the License, or
-* (at your option) any later version.
+* The terms of the open source GNU General Public License version 3
+* can be found at: <www.gnu.org/licenses/gpl-3.0>
 *
-* Alternatively, this program may be distributed and modified under the
-* terms of Quantum Leaps commercial licenses, which expressly supersede
-* the GNU General Public License and are specifically designed for
-* licensees interested in retaining the proprietary status of their code.
+* The terms of the closed source Quantum Leaps commercial licenses
+* can be found at: <www.state-machine.com/licensing>
 *
-* This program is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-* GNU General Public License for more details.
-*
-* You should have received a copy of the GNU General Public License
-* along with this program. If not, see <www.gnu.org/licenses/>.
+* Redistributions in source code must retain this top-level comment block.
+* Plagiarizing this software to sidestep the license obligations is illegal.
 *
 * Contact information:
-* <www.state-machine.com/licensing>
+* <www.state-machine.com>
 * <[email protected]>
-*****************************************************************************/
+============================================================================*/
+/*!
+* @date Last updated on: 2022-08-24
+* @version Last updated for: Zephyr 3.1.99 and @ref qpc_7_1_0
+*
+* @file
+* @brief Blinky example
+*/
 #ifndef BLINKY_H
 #define BLINKY_H
 

examples/zephyr/blinky/src/bsp.c

@@ -1,52 +1,68 @@
+/*============================================================================
+* QP/C Real-Time Embedded Framework (RTEF)
+* Copyright (C) 2005 Quantum Leaps, LLC. All rights reserved.
+*
+* SPDX-License-Identifier: GPL-3.0-or-later OR LicenseRef-QL-commercial
+*
+* This software is dual-licensed under the terms of the open source GNU
+* General Public License version 3 (or any later version), or alternatively,
+* under the terms of one of the closed source Quantum Leaps commercial
+* licenses.
+*
+* The terms of the open source GNU General Public License version 3
+* can be found at: <www.gnu.org/licenses/gpl-3.0>
+*
+* The terms of the closed source Quantum Leaps commercial licenses
+* can be found at: <www.state-machine.com/licensing>
+*
+* Redistributions in source code must retain this top-level comment block.
+* Plagiarizing this software to sidestep the license obligations is illegal.
+*
+* Contact information:
+* <www.state-machine.com>
+* <[email protected]>
+============================================================================*/
+/*!
+* @date Last updated on: 2022-08-24
+* @version Last updated for: Zephyr 3.1.99 and @ref qpc_7_1_0
+*
+* @file
+* @brief BSP for Zephyr, Blinky example
+*/
 #include "qpc.h"
 #include "bsp.h"
 
-#include <drivers/gpio.h>
-#include <sys/reboot.h>
+#include <zephyr/drivers/gpio.h>
+#include <zephyr/sys/reboot.h>
 /* other drivers, if necessary ... */
 
 Q_DEFINE_THIS_FILE
 
 /* The devicetree node identifier for the "led0" alias. */
 #define LED0_NODE DT_ALIAS(led0)
 
-#if DT_NODE_HAS_STATUS(LED0_NODE, okay)
-#define LED0    DT_GPIO_LABEL(LED0_NODE, gpios)
-#define PIN     DT_GPIO_PIN(LED0_NODE, gpios)
-#define FLAGS   DT_GPIO_FLAGS(LED0_NODE, gpios)
-#else
-/* A build error here means your board isn't set up to blink an LED. */
-#error "Unsupported board: led0 devicetree alias is not defined"
-#define LED0    ""
-#define PIN     0
-#define FLAGS   0
-#endif
-
-static struct device const *dev_LED0;
+static struct gpio_dt_spec const l_led0 = GPIO_DT_SPEC_GET(LED0_NODE, gpios);
 static struct k_timer QF_tick_timer;
 static void QF_tick_function(struct k_timer *tid) {
     (void)tid; /* unused parameter */
     QTIMEEVT_TICK_X(0U, (void *)0);
 }
 
 void BSP_init(void) {
-    dev_LED0 = device_get_binding(LED0);
-    Q_ASSERT(dev_LED0 != NULL);
-
-    int ret = gpio_pin_configure(dev_LED0, PIN, GPIO_OUTPUT_ACTIVE | FLAGS);
+    int ret = gpio_pin_configure_dt(&l_led0, GPIO_OUTPUT_ACTIVE);
     Q_ASSERT(ret >= 0);
 
     k_timer_init(&QF_tick_timer, &QF_tick_function, NULL);
 }
 
 void BSP_ledOn(void) {
     printk("BSP_ledOn\n");
-    gpio_pin_set(dev_LED0, PIN, true);
+    gpio_pin_set_dt(&l_led0, true);
 }
 
 void BSP_ledOff(void) {
     printk("BSP_ledOff\n");
-    gpio_pin_set(dev_LED0, PIN, false);
+    gpio_pin_set_dt(&l_led0, false);
 }
 
 /* QF callbacks ============================================================*/

examples/zephyr/blinky/src/bsp.h

@@ -1,36 +1,34 @@
-/*****************************************************************************
-* Product: DPP example
-* Last Updated for Version: 5.6.0
-* Date of the Last Update:  2015-11-22
-*
-*                    Q u a n t u m     L e a P s
-*                    ---------------------------
-*                    innovating embedded systems
-*
+/*============================================================================
+* QP/C Real-Time Embedded Framework (RTEF)
 * Copyright (C) 2005 Quantum Leaps, LLC. All rights reserved.
 *
-* This program is open source software: you can redistribute it and/or
-* modify it under the terms of the GNU General Public License as published
-* by the Free Software Foundation, either version 3 of the License, or
-* (at your option) any later version.
+* SPDX-License-Identifier: GPL-3.0-or-later OR LicenseRef-QL-commercial
 *
-* Alternatively, this program may be distributed and modified under the
-* terms of Quantum Leaps commercial licenses, which expressly supersede
-* the GNU General Public License and are specifically designed for
-* licensees interested in retaining the proprietary status of their code.
+* This software is dual-licensed under the terms of the open source GNU
+* General Public License version 3 (or any later version), or alternatively,
+* under the terms of one of the closed source Quantum Leaps commercial
+* licenses.
 *
-* This program is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-* GNU General Public License for more details.
+* The terms of the open source GNU General Public License version 3
+* can be found at: <www.gnu.org/licenses/gpl-3.0>
 *
-* You should have received a copy of the GNU General Public License
-* along with this program. If not, see <www.gnu.org/licenses/>.
+* The terms of the closed source Quantum Leaps commercial licenses
+* can be found at: <www.state-machine.com/licensing>
+*
+* Redistributions in source code must retain this top-level comment block.
+* Plagiarizing this software to sidestep the license obligations is illegal.
 *
 * Contact information:
-* <www.state-machine.com/licensing>
+* <www.state-machine.com>
 * <[email protected]>
-*****************************************************************************/
+============================================================================*/
+/*!
+* @date Last updated on: 2022-08-24
+* @version Last updated for: Zephyr 3.1.99 and @ref qpc_7_1_0
+*
+* @file
+* @brief BSP for Zephyr, Blinky example
+*/
 #ifndef BSP_H
 #define BSP_H
 

examples/zephyr/blinky/src/main.c

@@ -1,36 +1,34 @@
-/*****************************************************************************
-* Product: "Blinky" example
-* Last updated for version 7.0.1
-* Last updated on  2022-06-04
-*
-*                    Q u a n t u m  L e a P s
-*                    ------------------------
-*                    Modern Embedded Software
-*
+/*============================================================================
+* QP/C Real-Time Embedded Framework (RTEF)
 * Copyright (C) 2005 Quantum Leaps, LLC. All rights reserved.
 *
-* This program is open source software: you can redistribute it and/or
-* modify it under the terms of the GNU General Public License as published
-* by the Free Software Foundation, either version 3 of the License, or
-* (at your option) any later version.
+* SPDX-License-Identifier: GPL-3.0-or-later OR LicenseRef-QL-commercial
 *
-* Alternatively, this program may be distributed and modified under the
-* terms of Quantum Leaps commercial licenses, which expressly supersede
-* the GNU General Public License and are specifically designed for
-* licensees interested in retaining the proprietary status of their code.
+* This software is dual-licensed under the terms of the open source GNU
+* General Public License version 3 (or any later version), or alternatively,
+* under the terms of one of the closed source Quantum Leaps commercial
+* licenses.
 *
-* This program is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-* GNU General Public License for more details.
+* The terms of the open source GNU General Public License version 3
+* can be found at: <www.gnu.org/licenses/gpl-3.0>
 *
-* You should have received a copy of the GNU General Public License
-* along with this program. If not, see <www.gnu.org/licenses/>.
+* The terms of the closed source Quantum Leaps commercial licenses
+* can be found at: <www.state-machine.com/licensing>
+*
+* Redistributions in source code must retain this top-level comment block.
+* Plagiarizing this software to sidestep the license obligations is illegal.
 *
 * Contact information:
-* <www.state-machine.com/licensing>
+* <www.state-machine.com>
 * <[email protected]>
-*****************************************************************************/
+============================================================================*/
+/*!
+* @date Last updated on: 2022-08-24
+* @version Last updated for: Zephyr 3.1.99 and @ref qpc_7_1_0
+*
+* @file
+* @brief main() for Zephyr, Blinky example
+*/
 #include "qpc.h"
 #include "blinky.h"
 #include "bsp.h"
@@ -52,12 +50,12 @@ int main() {
     /* instantiate and start the active objects... */
     Blinky_ctor();
     QActive_setAttr(AO_Blinky,
-                    0,            /* thread opions */
+                    0,            /* thread options */
                     "Blinky");    /* thread name */
     QACTIVE_START(AO_Blinky,      /* AO pointer to start */
                   1U,             /* unique QP priority of the AO */
                   l_blinkyQSto,   /* storage for the AO's queue */
-                  Q_DIM(l_blinkyQSto), /* lenght of the queue [entries] */
+                  Q_DIM(l_blinkyQSto), /* length of the queue [entries] */
                   (void *)l_blinkyStack, /* stack storage */
                   K_THREAD_STACK_SIZEOF(l_blinkyStack), /* stack size [bytes] */
                   (void *)0);     /* initial event (or 0) */

examples/zephyr/dpp/prj.conf

@@ -3,6 +3,7 @@
 
 CONFIG_NUM_COOP_PRIORITIES=29
 CONFIG_NUM_PREEMPT_PRIORITIES=40
+CONFIG_THREAD_NAME=y
 CONFIG_REBOOT=y
 
 # for QSPY...