8.0.0

Author: quantum-leaps

arm-cm/real-time_nucleo-c031c6/qk/bsp.c

@@ -293,7 +293,7 @@ void QF_onStartup(void) {
     SysTick_Config((SystemCoreClock / BSP_TICKS_PER_SEC) + 1U);
 
     // set priorities of ISRs used in the system
-    // NOTE: all interrupts are "kernel aware" in Cortex-M0+ 
+    // NOTE: all interrupts are "kernel aware" in Cortex-M0+
     NVIC_SetPriority(SysTick_IRQn, 0U);
     // ...
 }

arm-cm/real-time_nucleo-c031c6/qv/bsp.c

@@ -291,7 +291,7 @@ void QF_onStartup(void) {
     SysTick_Config((SystemCoreClock / BSP_TICKS_PER_SEC) + 1U);
 
     // set priorities of ISRs used in the system
-    // NOTE: all interrupts are "kernel aware" in Cortex-M0+ 
+    // NOTE: all interrupts are "kernel aware" in Cortex-M0+
     NVIC_SetPriority(SysTick_IRQn, 0U);
     // ...
 }

arm-cm/real-time_nucleo-l053r8/qk/bsp.c

@@ -289,7 +289,7 @@ void QF_onStartup(void) {
     SysTick_Config((SystemCoreClock / BSP_TICKS_PER_SEC) + 1U);
 
     // set priorities of ISRs used in the system
-    // NOTE: all interrupts are "kernel aware" in Cortex-M0+ 
+    // NOTE: all interrupts are "kernel aware" in Cortex-M0+
     NVIC_SetPriority(SysTick_IRQn, 0U);
     // ...
 }

freertos/arm-cm/dpp_ek-tm4c123gxl/gnu/Makefile

@@ -44,9 +44,8 @@
 #
 # NOTE:
 # To use this Makefile on Windows, you will need the GNU make utility, which
-# is included in the Qtools collection for Windows, see:
-#    https://sourceforge.net/projects/qpc/files/QTools/
-#
+# is included in the QTools collection for Windows, see:
+#    https://github.com/QuantumLeaps/qtools
 
 #-----------------------------------------------------------------------------
 # project name
@@ -176,18 +175,19 @@ BIN   := $(GNU_ARM)/bin/arm-none-eabi-objcopy
 ##############################################################################
 # Typically, you should not need to change anything below this line
 
-# basic utilities (included in Qtools for Windows), see:
-#    http://sourceforge.net/projects/qpc/files/Qtools
+# basic utilities (included in QTools for Windows), see:
+#     https://www.state-machine.com/qtools
 
 MKDIR := mkdir
 RM    := rm
 
 #-----------------------------------------------------------------------------
-# build options for various configurations for ARM Cortex-M4F
+# build options for various configurations for ARM Cortex-M
 #
 
 # combine all the sources...
-C_SRCS += $(QP_SRCS) $(RTOS_SRCS)
+C_SRCS   += $(QP_SRCS)
+C_SRCS   += $(RTOS_SRCS)
 ASM_SRCS += $(QP_ASMS)
 
 ifeq (rel, $(CONF)) # Release configuration ..................................
@@ -198,11 +198,11 @@ ASFLAGS = $(ARM_CPU) $(ARM_FPU) $(ASM_CPU) $(ASM_FPU)
 
 CFLAGS = -c $(ARM_CPU) $(ARM_FPU) $(FLOAT_ABI) -mthumb -Wall \
 	-ffunction-sections -fdata-sections \
-	-O1 $(INCLUDES) $(DEFINES) -DNDEBUG
+	-O2 $(INCLUDES) $(DEFINES) -DNDEBUG
 
 CPPFLAGS = -c $(ARM_CPU) $(ARM_FPU) $(FLOAT_ABI) -mthumb -Wall \
 	-ffunction-sections -fdata-sections -fno-rtti -fno-exceptions \
-	-O1 $(INCLUDES) $(DEFINES) -DNDEBUG
+	-O2 $(INCLUDES) $(DEFINES) -DNDEBUG
 
 else ifeq (spy, $(CONF))  # Spy configuration ................................
 
@@ -241,7 +241,6 @@ LINKFLAGS = -T$(LD_SCRIPT) $(ARM_CPU) $(ARM_FPU) $(FLOAT_ABI) -mthumb \
 	-specs=nosys.specs -specs=nano.specs \
 	-Wl,-Map,$(BIN_DIR)/$(OUTPUT).map,--cref,--gc-sections $(LIB_DIRS)
 
-
 ASM_OBJS     := $(patsubst %.s,%.o,  $(notdir $(ASM_SRCS)))
 C_OBJS       := $(patsubst %.c,%.o,  $(notdir $(C_SRCS)))
 CPP_OBJS     := $(patsubst %.cpp,%.o,$(notdir $(CPP_SRCS)))
@@ -263,8 +262,14 @@ endif
 # rules
 #
 
-all: $(TARGET_BIN)
-#all: $(TARGET_ELF)
+.PHONY : run norun flash
+
+ifeq ($(MAKECMDGOALS),norun)
+all : $(TARGET_BIN)
+norun : all
+else
+all : $(TARGET_BIN) run
+endif
 
 $(TARGET_BIN): $(TARGET_ELF)
 	$(BIN) -O binary $< $@
@@ -288,6 +293,8 @@ $(BIN_DIR)/%.o : %.c
 $(BIN_DIR)/%.o : %.cpp
 	$(CPP) $(CPPFLAGS) $< -o $@
 
+.PHONY : clean show
+
 # include dependency files only if our goal depends on their existence
 ifneq ($(MAKECMDGOALS),clean)
   ifneq ($(MAKECMDGOALS),show)
@@ -296,7 +303,6 @@ ifneq ($(MAKECMDGOALS),clean)
 endif
 
 
-.PHONY : clean
 clean:
 	-$(RM) $(BIN_DIR)/*.o \
 	$(BIN_DIR)/*.d \

freertos/arm-cm/dpp_nucleo-f401re/armclang/dpp.uvoptx

@@ -135,7 +135,7 @@
         <SetRegEntry>
           <Number>0</Number>
           <Key>DLGTARM</Key>
-          <Name>(1010=1444,525,1894,1082,1)(1007=-1,-1,-1,-1,0)(1008=-1,-1,-1,-1,0)(1009=-1,-1,-1,-1,0)(1012=-1,-1,-1,-1,0)</Name>
+          <Name>(1010=1186,187,1636,744,1)(1007=-1,-1,-1,-1,0)(1008=-1,-1,-1,-1,0)(1009=-1,-1,-1,-1,0)(1012=-1,-1,-1,-1,0)</Name>
         </SetRegEntry>
         <SetRegEntry>
           <Number>0</Number>

freertos/arm-cm/dpp_nucleo-f401re/bsp.c

@@ -348,7 +348,6 @@ uint32_t BSP_random(void) { // a very cheap pseudo-random-number generator
     vTaskSuspendAll(); // lock FreeRTOS scheduler
     // "Super-Duper" Linear Congruential Generator (LCG)
     // LCG(2^32, 3*7*11*13*23, 0, seed)
-    //
     uint32_t rnd = l_rndSeed * (3U*7U*11U*13U*23U);
     l_rndSeed = rnd; // set for the next time
     xTaskResumeAll(); // unlock the FreeRTOS scheduler

freertos/arm-cm/dpp_nucleo-f401re/gnu/Makefile

@@ -1,5 +1,5 @@
 ##############################################################################
-# Product: Makefile for QP/C on STM32 NUCLEO-F401RE, QK kernel, GNU-ARM
+# Product: Makefile for QP/C on STM32 NUCLEO-F401RE, FreeRTOS kernel, GNU-ARM
 # Last Updated for Version: 8.0.0
 # Date of the Last Update:  2024-11-08
 #
@@ -50,7 +50,7 @@
 #-----------------------------------------------------------------------------
 # project name
 #
-PROJECT     := dpp-qk
+PROJECT     := dpp
 
 #-----------------------------------------------------------------------------
 # project directories
@@ -61,25 +61,32 @@ ifeq ($(QPC),)
 QPC := ../../../../..
 endif
 
+# location of the FREERTOS (if not provided in an environment var.)
+ifeq ($(FREERTOS),)
+FREERTOS := $(QPC)/3rd_party/FreeRTOS-Kernel
+endif
+
 # QP port used in this project
-QP_PORT_DIR := $(QPC)/ports/arm-cm/qk/gnu
+QP_PORT_DIR := $(QPC)/ports/freertos
 
 # list of all source directories used by this project
 VPATH = \
 	.. \
-	../.. \
 	$(QPC)/src/qf \
-	$(QPC)/src/qk \
 	$(QPC)/src/qs \
 	$(QP_PORT_DIR) \
+	$(FREERTOS) \
+	$(FREERTOS)/portable/GCC/ARM_CM4F \
 	$(QPC)/3rd_party/nucleo-f401re \
 	$(QPC)/3rd_party/nucleo-f401re/gnu
 
 # list of all include directories needed by this project
 INCLUDES  = \
-	-I../.. \
+	-I.. \
 	-I$(QPC)/include \
 	-I$(QP_PORT_DIR) \
+	-I$(FREERTOS)/include \
+	-I$(FREERTOS)/portable/GCC/ARM_CM4F \
 	-I$(QPC)/3rd_party/CMSIS/Include \
 	-I$(QPC)/3rd_party/nucleo-f401re
 
@@ -109,7 +116,6 @@ QP_SRCS := \
 	qep_hsm.c \
 	qep_msm.c \
 	qf_act.c \
-	qf_actq.c \
 	qf_defer.c \
 	qf_dyn.c \
 	qf_mem.c \
@@ -118,10 +124,13 @@ QP_SRCS := \
 	qf_qeq.c \
 	qf_qmact.c \
 	qf_time.c \
-	qk.c \
-	qk_port.c
+	qf_port.c
 
-QP_ASMS :=
+RTOS_SRCS := \
+	tasks.c \
+	queue.c \
+	list.c \
+	port.c
 
 QS_SRCS := \
 	qs.c \
@@ -163,6 +172,7 @@ AS    := $(GNU_ARM)/bin/arm-none-eabi-as
 LINK  := $(GNU_ARM)/bin/arm-none-eabi-gcc
 BIN   := $(GNU_ARM)/bin/arm-none-eabi-objcopy
 
+
 ##############################################################################
 # Typically, you should not need to change anything below this line
 
@@ -177,7 +187,8 @@ RM    := rm
 #
 
 # combine all the sources...
-C_SRCS += $(QP_SRCS)
+C_SRCS   += $(QP_SRCS)
+C_SRCS   += $(RTOS_SRCS)
 ASM_SRCS += $(QP_ASMS)
 
 ifeq (rel, $(CONF)) # Release configuration ..................................