From 75ef6eea184330f298be02040a726e0ea2395fb1 Mon Sep 17 00:00:00 2001 From: Quantum Leaps Date: Thu, 5 May 2016 12:22:15 -0400 Subject: [PATCH] 5.6.4b --- doxygen/metrics.dox | 18 +-- doxygen/snippets/qk_mux.cpp | 2 +- doxygen/struct.dox | 2 +- .../blinky_ek-tm4c123gxl/win32-qv/Makefile | 6 +- .../blinky_ek-tm4c123gxl/win32/Makefile | 6 +- .../dpp_ek-tm4c123gxl/lint/lint_out.txt | 92 ++++++++-------- examples/arm-cm/dpp_ek-tm4c123gxl/qk/bsp.cpp | 6 +- .../dpp_ek-tm4c123gxl/win32-qv/Makefile | 6 +- .../arm-cm/dpp_ek-tm4c123gxl/win32-qv/bsp.cpp | 6 +- .../win32-qv/dpp-gui.vcxproj | 8 +- .../arm-cm/dpp_ek-tm4c123gxl/win32/Makefile | 6 +- .../arm-cm/dpp_ek-tm4c123gxl/win32/bsp.cpp | 6 +- .../dpp_ek-tm4c123gxl/win32/dpp-gui.vcxproj | 8 +- examples/arm-cm/dpp_nucleo-l053r8/qk/bsp.cpp | 6 +- .../arm-cm/game_ek-lm3s811/win32-qv/Makefile | 6 +- .../arm-cm/game_ek-lm3s811/win32-qv/bsp.cpp | 6 +- .../game_ek-lm3s811/win32-qv/game-gui.vcxproj | 6 +- .../arm-cm/game_ek-lm3s811/win32/Makefile | 6 +- examples/arm-cm/game_ek-lm3s811/win32/bsp.cpp | 2 +- .../game_ek-lm3s811/win32/game-gui.vcxproj | 8 +- examples/win32-qv/dpp/Makefile | 6 +- examples/win32-qv/reminder2/Makefile | 6 +- examples/win32/calc/Makefile | 6 +- examples/win32/calc2/Makefile | 6 +- examples/win32/comp/Makefile | 6 +- examples/win32/comp_qm/Makefile | 6 +- examples/win32/defer/Makefile | 6 +- examples/win32/dpp/Makefile | 6 +- examples/win32/history_qhsm/Makefile | 6 +- examples/win32/history_qmsm/Makefile | 6 +- examples/win32/qhsmtst/Makefile | 6 +- examples/win32/qmsmtst/Makefile | 6 +- examples/win32/reminder/Makefile | 6 +- examples/win32/reminder2/Makefile | 6 +- include/qf.h | 6 +- include/qk.h | 8 +- ports/qt/qf_port.cpp | 10 +- ports/qt/qf_port.h | 13 ++- ports/qt/vc/qp.pro | 104 ++++++++++++++++++ ports/win32-qv/Makefile | 12 +- ports/win32-qv/QSpy/qp.tlog/CL.read.1.tlog | Bin 209664 -> 0 bytes ports/win32-qv/QSpy/qp.tlog/CL.write.1.tlog | Bin 5568 -> 0 bytes .../QSpy/qp.tlog/Lib-link.read.1.tlog | Bin 3332 -> 0 bytes .../QSpy/qp.tlog/Lib-link.write.1.tlog | Bin 1650 -> 0 bytes ports/win32-qv/QSpy/qp.tlog/cl.command.1.tlog | Bin 9854 -> 0 bytes .../win32-qv/QSpy/qp.tlog/lib.command.1.tlog | Bin 2238 -> 0 bytes ports/win32-qv/QSpy/qp.tlog/qp.lastbuildstate | 2 - ports/win32-qv/QSpy/vc120.pdb | Bin 143360 -> 143360 bytes ports/win32-qv/qf_port.h | 8 +- ports/win32-qv/qp.vcxproj | 12 +- .../win32_gui.cpp => win32-qv/qwin_gui.cpp} | 14 +-- ports/win32-qv/{win32_gui.h => qwin_gui.h} | 22 ++-- ports/win32/Makefile | 10 +- ports/win32/QSpy/qp.tlog/CL.read.1.tlog | Bin 209358 -> 0 bytes ports/win32/QSpy/qp.tlog/CL.write.1.tlog | Bin 5322 -> 0 bytes ports/win32/QSpy/qp.tlog/Lib-link.read.1.tlog | Bin 3116 -> 0 bytes .../win32/QSpy/qp.tlog/Lib-link.write.1.tlog | Bin 1536 -> 0 bytes ports/win32/QSpy/qp.tlog/cl.command.1.tlog | Bin 9830 -> 0 bytes ports/win32/QSpy/qp.tlog/lib.command.1.tlog | Bin 2124 -> 0 bytes ports/win32/QSpy/qp.tlog/qp.lastbuildstate | 2 - ports/win32/QSpy/vc120.pdb | Bin 143360 -> 143360 bytes ports/win32/qf_port.h | 8 +- ports/win32/qp.vcxproj | 12 +- .../win32_gui.cpp => win32/qwin_gui.cpp} | 14 +-- ports/win32/{win32_gui.h => qwin_gui.h} | 22 ++-- source/qk_mutex.cpp | 26 ++--- 66 files changed, 351 insertions(+), 250 deletions(-) create mode 100644 ports/qt/vc/qp.pro delete mode 100644 ports/win32-qv/QSpy/qp.tlog/CL.read.1.tlog delete mode 100644 ports/win32-qv/QSpy/qp.tlog/CL.write.1.tlog delete mode 100644 ports/win32-qv/QSpy/qp.tlog/Lib-link.read.1.tlog delete mode 100644 ports/win32-qv/QSpy/qp.tlog/Lib-link.write.1.tlog delete mode 100644 ports/win32-qv/QSpy/qp.tlog/cl.command.1.tlog delete mode 100644 ports/win32-qv/QSpy/qp.tlog/lib.command.1.tlog delete mode 100644 ports/win32-qv/QSpy/qp.tlog/qp.lastbuildstate rename ports/{win32/win32_gui.cpp => win32-qv/qwin_gui.cpp} (96%) rename ports/win32-qv/{win32_gui.h => qwin_gui.h} (89%) delete mode 100644 ports/win32/QSpy/qp.tlog/CL.read.1.tlog delete mode 100644 ports/win32/QSpy/qp.tlog/CL.write.1.tlog delete mode 100644 ports/win32/QSpy/qp.tlog/Lib-link.read.1.tlog delete mode 100644 ports/win32/QSpy/qp.tlog/Lib-link.write.1.tlog delete mode 100644 ports/win32/QSpy/qp.tlog/cl.command.1.tlog delete mode 100644 ports/win32/QSpy/qp.tlog/lib.command.1.tlog delete mode 100644 ports/win32/QSpy/qp.tlog/qp.lastbuildstate rename ports/{win32-qv/win32_gui.cpp => win32/qwin_gui.cpp} (96%) rename ports/win32/{win32_gui.h => qwin_gui.h} (89%) diff --git a/doxygen/metrics.dox b/doxygen/metrics.dox index 17318c31..0f73e54f 100644 --- a/doxygen/metrics.dox +++ b/doxygen/metrics.dox @@ -9,7 +9,7 @@ License Type: Windows Single User License Licensed To : Quantum Leaps, LLC License No. : WS2975 License Date: Dec 15, 2013 - Build Date : Sep 2 2009 Run Date: Apr 24, 2016 + Build Date : Sep 2 2009 Run Date: May 04, 2016 (C)1996-2009 M Squared Technologies LLC ________________________________________________________________________ @@ -150,7 +150,7 @@ ~~ Total File Summary ~~ - LOC 250 eLOC 218 lLOC 127 Comment 307 Lines 640 + LOC 250 eLOC 218 lLOC 127 Comment 307 Lines 641 ------------------------------------------------------------------------ ~~ File Functional Summary ~~ @@ -1666,12 +1666,12 @@ File: ..\source\qk_mutex.cpp ________________________________________________________________________ - Function: QP::QMutex::init + Function: QP::QKMutex::init Parameters: (uint_fast8_t const prio) Complexity Param 1 Return 1 Cyclo Vg 1 Total 3 LOC 4 eLOC 3 lLOC 2 Comment 15 Lines 4 - Function: QP::QMutex::lock + Function: QP::QKMutex::lock Parameters: (void) Cyclomatic Complexity Vg Detail Function Base : 1 @@ -1680,7 +1680,7 @@ Complexity Param 0 Return 1 Cyclo Vg 3 Total 4 LOC 17 eLOC 15 lLOC 7 Comment 24 Lines 23 - Function: QP::QMutex::unlock + Function: QP::QKMutex::unlock Parameters: (void) Cyclomatic Complexity Vg Detail Function Base : 1 @@ -2513,7 +2513,7 @@ ~~ Total Project Summary ~~ - LOC 5576 eLOC 4898 lLOC 2256 Comment 6448 Lines 12366 + LOC 5576 eLOC 4898 lLOC 2256 Comment 6448 Lines 12367 Average per File, metric/41 files LOC 136 eLOC 119 lLOC 55 Comment 157 Lines 301 @@ -3154,17 +3154,17 @@ Complexity Param 1 Return 1 Cyclo Vg 6 Total 8 LOC 54 eLOC 47 lLOC 24 Comment 46 Lines 77 - Function: QP::QMutex::init + Function: QP::QKMutex::init Parameters: (uint_fast8_t const prio) Complexity Param 1 Return 1 Cyclo Vg 1 Total 3 LOC 4 eLOC 3 lLOC 2 Comment 15 Lines 4 - Function: QP::QMutex::lock + Function: QP::QKMutex::lock Parameters: (void) Complexity Param 0 Return 1 Cyclo Vg 3 Total 4 LOC 17 eLOC 15 lLOC 7 Comment 24 Lines 23 - Function: QP::QMutex::unlock + Function: QP::QKMutex::unlock Parameters: (void) Complexity Param 0 Return 1 Cyclo Vg 4 Total 5 LOC 22 eLOC 19 lLOC 10 Comment 26 Lines 28 diff --git a/doxygen/snippets/qk_mux.cpp b/doxygen/snippets/qk_mux.cpp index b785cd5f..c16faa08 100644 --- a/doxygen/snippets/qk_mux.cpp +++ b/doxygen/snippets/qk_mux.cpp @@ -1,4 +1,4 @@ -QMutex l_rndMutex; // mutex to protect the random number generator +QKMutex l_rndMutex; // mutex to protect the random number generator void BSP::randomSeed(uint32_t seed) { diff --git a/doxygen/struct.dox b/doxygen/struct.dox index 096fc01d..e5e2e6e9 100644 --- a/doxygen/struct.dox +++ b/doxygen/struct.dox @@ -99,7 +99,7 @@ The Quantum Leaps Application Note @note -The hallmark of the QP/C implementation of UML state machines is **traceability**, which is direct, precise, and unambiguous mapping of every state machine element to human-readable, portable, MISRA-compliant C code. Preserving the traceability from requirements through design to code is essential for mission-critical systems, such as medical devices or avionic systems. +The hallmark of the QP/C++ implementation of UML state machines is **traceability**, which is direct, precise, and unambiguous mapping of every state machine element to human readable, portable, MISRA compliant C++ code. Preserving the traceability from requirements through design to code is essential for mission-critical systems, such as medical devices or avionic systems. ------------------------------------------------------------------------------ diff --git a/examples/arm-cm/blinky_ek-tm4c123gxl/win32-qv/Makefile b/examples/arm-cm/blinky_ek-tm4c123gxl/win32-qv/Makefile index 30f3eeb9..f48bda51 100644 --- a/examples/arm-cm/blinky_ek-tm4c123gxl/win32-qv/Makefile +++ b/examples/arm-cm/blinky_ek-tm4c123gxl/win32-qv/Makefile @@ -1,7 +1,7 @@ ############################################################################## # Product: Makefile for QP/C++, Blinky console, Win32-QV, MinGW -# Last updated for version 5.6.2 -# Last updated on 2016-03-31 +# Last updated for version 5.6.4 +# Last updated on 2016-05-04 # # Q u a n t u m L e a P s # --------------------------- @@ -168,7 +168,7 @@ LINKFLAGS := -Wl,-Map,$(BIN_DIR)/$(PROJECT).map,--cref,--gc-sections # is it a GUI application (any GUI resources provided?) ... ifneq (,$(RC_SRCS)) LINKFLAGS += -mwindows -DEFINES += -DWIN32_GUI +DEFINES += -DQWIN_GUI endif #----------------------------------------------------------------------------- diff --git a/examples/arm-cm/blinky_ek-tm4c123gxl/win32/Makefile b/examples/arm-cm/blinky_ek-tm4c123gxl/win32/Makefile index a81fe8fd..3c643946 100644 --- a/examples/arm-cm/blinky_ek-tm4c123gxl/win32/Makefile +++ b/examples/arm-cm/blinky_ek-tm4c123gxl/win32/Makefile @@ -1,7 +1,7 @@ ############################################################################## # Product: Makefile for QP/C++, Blinky console, Win32, MinGW -# Last updated for version 5.5.0 -# Last updated on 2015-09-25 +# Last updated for version 5.6.4 +# Last updated on 2016-05-04 # # Q u a n t u m L e a P s # --------------------------- @@ -168,7 +168,7 @@ LINKFLAGS := -Wl,-Map,$(BIN_DIR)/$(PROJECT).map,--cref,--gc-sections # is it a GUI application (any GUI resources provided?) ... ifneq (,$(RC_SRCS)) LINKFLAGS += -mwindows -DEFINES += -DWIN32_GUI +DEFINES += -DQWIN_GUI endif #----------------------------------------------------------------------------- diff --git a/examples/arm-cm/dpp_ek-tm4c123gxl/lint/lint_out.txt b/examples/arm-cm/dpp_ek-tm4c123gxl/lint/lint_out.txt index 8e0dcaa3..57fbb570 100644 --- a/examples/arm-cm/dpp_ek-tm4c123gxl/lint/lint_out.txt +++ b/examples/arm-cm/dpp_ek-tm4c123gxl/lint/lint_out.txt @@ -94,48 +94,48 @@ --- Global Wrap-up "C:\qp\qpcpp\include\qassert.h" 223 1 Warning 526: Symbol 'Q_onAssert(const char *, int)' (line 223, file C:\qp\qpcpp\include\qassert.h, module C:\qp\qpcpp\examples\arm-cm\dpp_ek-tm4c123gxl\philo.cpp) not defined -"C:\qp\qpcpp\include\qep.h" 450 1 Info 758: global enum 'QP::QMsm::ReservedHsmSignals' (line 450, file C:\qp\qpcpp\include\qep.h) not referenced [MISRA C++ Rule 0-1-5] +"C:\qp\qpcpp\include\qep.h" 451 1 Info 758: global enum 'QP::QMsm::ReservedHsmSignals' (line 451, file C:\qp\qpcpp\include\qep.h) not referenced [MISRA C++ Rule 0-1-5] "C:\qp\qpcpp\include\qs.h" 341 1 Info 758: global enum 'QP::QS::QSType' (line 341, file C:\qp\qpcpp\include\qs.h) not referenced [MISRA C++ Rule 0-1-5] "C:\qp\qpcpp\include\qs.h" 394 1 Info 758: global enum 'QP::QSpyRxRecords' (line 394, file C:\qp\qpcpp\include\qs.h) not referenced [MISRA C++ Rule 0-1-5] -"C:\qp\qpcpp\include\qep.h" 320 1 Warning 1526: Member function 'QP::QMsm::init(const struct QP::QEvt *)' (line 320, file C:\qp\qpcpp\include\qep.h) not defined -"C:\qp\qpcpp\include\qep.h" 321 1 Info 1716: Virtual member function 'QP::QMsm::init(void)' (line 321, file C:\qp\qpcpp\include\qep.h) not referenced [MISRA C++ Rule 0-1-10] -"C:\qp\qpcpp\include\qep.h" 324 1 Info 1716: Virtual member function 'QP::QMsm::dispatch(const struct QP::QEvt *)' (line 324, file C:\qp\qpcpp\include\qep.h) not referenced [MISRA C++ Rule 0-1-10] -"C:\qp\qpcpp\include\qep.h" 324 1 Warning 1526: Member function 'QP::QMsm::dispatch(const struct QP::QEvt *)' (line 324, file C:\qp\qpcpp\include\qep.h) not defined -"C:\qp\qpcpp\include\qep.h" 327 1 Info 1714: Member function 'QP::QMsm::isInState(const struct QP::QMState *) const' (line 327, file C:\qp\qpcpp\include\qep.h) not referenced [MISRA C++ Rule 0-1-10] -"C:\qp\qpcpp\include\qep.h" 327 1 Warning 1526: Member function 'QP::QMsm::isInState(const struct QP::QMState *) const' (line 327, file C:\qp\qpcpp\include\qep.h) not defined -"C:\qp\qpcpp\include\qep.h" 330 1 Info 1714: Member function 'QP::QMsm::stateObj(void) const' (line 330, file C:\qp\qpcpp\include\qep.h) not referenced [MISRA C++ Rule 0-1-10] -"C:\qp\qpcpp\include\qep.h" 335 1 Info 1714: Member function 'QP::QMsm::childStateObj(const struct QP::QMState *) const' (line 335, file C:\qp\qpcpp\include\qep.h) not referenced [MISRA C++ Rule 0-1-10] -"C:\qp\qpcpp\include\qep.h" 335 1 Warning 1526: Member function 'QP::QMsm::childStateObj(const struct QP::QMState *) const' (line 335, file C:\qp\qpcpp\include\qep.h) not defined -"C:\qp\qpcpp\include\qep.h" 339 1 Info 1714: Member function 'QP::QMsm::QMsm(unsigned int (*)(void *, const struct QP::QEvt *))' (line 339, file C:\qp\qpcpp\include\qep.h) not referenced [MISRA C++ Rule 0-1-10] -"C:\qp\qpcpp\include\qep.h" 339 1 Warning 1526: Member function 'QP::QMsm::QMsm(unsigned int (*)(void *, const struct QP::QEvt *))' (line 339, file C:\qp\qpcpp\include\qep.h) not defined -"C:\qp\qpcpp\include\qep.h" 349 1 Info 1714: Member function 'QP::QMsm::qm_tran_hist_(const struct QP::QMState *, const struct QP::QMTranActTable *)' (line 349, file C:\qp\qpcpp\include\qep.h) not referenced [MISRA C++ Rule 0-1-10] -"C:\qp\qpcpp\include\qep.h" 365 1 Info 1714: Member function 'QP::QMsm::qm_tran_ep_(const struct QP::QMTranActTable *)' (line 365, file C:\qp\qpcpp\include\qep.h) not referenced [MISRA C++ Rule 0-1-10] -"C:\qp\qpcpp\include\qep.h" 372 1 Info 1714: Member function 'QP::QMsm::qm_tran_xp_(unsigned int (*)(void *), const struct QP::QMTranActTable *)' (line 372, file C:\qp\qpcpp\include\qep.h) not referenced [MISRA C++ Rule 0-1-10] -"C:\qp\qpcpp\include\qep.h" 394 1 Info 1714: Member function 'QP::QMsm::qm_super_sub_(const struct QP::QMState *)' (line 394, file C:\qp\qpcpp\include\qep.h) not referenced [MISRA C++ Rule 0-1-10] -"C:\qp\qpcpp\include\qep.h" 420 1 Info 1714: Member function 'QP::QMsm::Q_HANDLED(void)' (line 420, file C:\qp\qpcpp\include\qep.h) not referenced [MISRA C++ Rule 0-1-10] -"C:\qp\qpcpp\include\qep.h" 428 1 Info 1714: Member function 'QP::QMsm::Q_UNHANDLED(void)' (line 428, file C:\qp\qpcpp\include\qep.h) not referenced [MISRA C++ Rule 0-1-10] -"C:\qp\qpcpp\include\qep.h" 433 1 Info 1714: Member function 'QP::QMsm::tran_(unsigned int (*)(void *, const struct QP::QEvt *))' (line 433, file C:\qp\qpcpp\include\qep.h) not referenced [MISRA C++ Rule 0-1-10] -"C:\qp\qpcpp\include\qep.h" 439 1 Info 1714: Member function 'QP::QMsm::tran_hist_(unsigned int (*)(void *, const struct QP::QEvt *))' (line 439, file C:\qp\qpcpp\include\qep.h) not referenced [MISRA C++ Rule 0-1-10] -"C:\qp\qpcpp\include\qep.h" 445 1 Info 1714: Member function 'QP::QMsm::super_(unsigned int (*)(void *, const struct QP::QEvt *))' (line 445, file C:\qp\qpcpp\include\qep.h) not referenced [MISRA C++ Rule 0-1-10] -"C:\qp\qpcpp\include\qep.h" 451 1 Info 769: global enumeration constant 'QP::QMsm::ReservedHsmSignals::Q_ENTRY_SIG' (line 451, file C:\qp\qpcpp\include\qep.h) not referenced -"C:\qp\qpcpp\include\qep.h" 452 1 Info 769: global enumeration constant 'QP::QMsm::ReservedHsmSignals::Q_EXIT_SIG' (line 452, file C:\qp\qpcpp\include\qep.h) not referenced -"C:\qp\qpcpp\include\qep.h" 453 1 Info 769: global enumeration constant 'QP::QMsm::ReservedHsmSignals::Q_INIT_SIG' (line 453, file C:\qp\qpcpp\include\qep.h) not referenced -"C:\qp\qpcpp\include\qep.h" 467 1 Info 1715: static member 'QP::QMsm::MAX_ENTRY_DEPTH_' (line 467, file C:\qp\qpcpp\include\qep.h) not referenced -"C:\qp\qpcpp\include\qep.h" 470 1 Info 1715: static member 'QP::QMsm::msm_top_s' (line 470, file C:\qp\qpcpp\include\qep.h) not referenced -"C:\qp\qpcpp\include\qep.h" 470 1 Warning 1527: static member 'QP::QMsm::msm_top_s' (line 470, file C:\qp\qpcpp\include\qep.h) not defined -"C:\qp\qpcpp\include\qep.h" 506 1 Warning 1526: Member function 'QP::QHsm::init(const struct QP::QEvt *)' (line 506, file C:\qp\qpcpp\include\qep.h) not defined -"C:\qp\qpcpp\include\qep.h" 510 1 Info 1716: Virtual member function 'QP::QHsm::dispatch(const struct QP::QEvt *)' (line 510, file C:\qp\qpcpp\include\qep.h) not referenced [MISRA C++ Rule 0-1-10] -"C:\qp\qpcpp\include\qep.h" 510 1 Warning 1526: Member function 'QP::QHsm::dispatch(const struct QP::QEvt *)' (line 510, file C:\qp\qpcpp\include\qep.h) not defined -"C:\qp\qpcpp\include\qep.h" 514 1 Info 1714: Member function 'QP::QHsm::isIn(unsigned int (*)(void *, const struct QP::QEvt *))' (line 514, file C:\qp\qpcpp\include\qep.h) not referenced [MISRA C++ Rule 0-1-10] -"C:\qp\qpcpp\include\qep.h" 514 1 Warning 1526: Member function 'QP::QHsm::isIn(unsigned int (*)(void *, const struct QP::QEvt *))' (line 514, file C:\qp\qpcpp\include\qep.h) not defined -"C:\qp\qpcpp\include\qep.h" 517 1 Warning 1526: Member function 'QP::QHsm::top(void *, const struct QP::QEvt *)' (line 517, file C:\qp\qpcpp\include\qep.h) not defined -"C:\qp\qpcpp\include\qep.h" 520 1 Info 1714: Member function 'QP::QHsm::state(void) const' (line 520, file C:\qp\qpcpp\include\qep.h) not referenced [MISRA C++ Rule 0-1-10] -"C:\qp\qpcpp\include\qep.h" 525 1 Info 1714: Member function 'QP::QHsm::childState(unsigned int (*)(void *, const struct QP::QEvt *))' (line 525, file C:\qp\qpcpp\include\qep.h) not referenced [MISRA C++ Rule 0-1-10] -"C:\qp\qpcpp\include\qep.h" 525 1 Warning 1526: Member function 'QP::QHsm::childState(unsigned int (*)(void *, const struct QP::QEvt *))' (line 525, file C:\qp\qpcpp\include\qep.h) not defined -"C:\qp\qpcpp\include\qep.h" 529 1 Info 1714: Member function 'QP::QHsm::QHsm(unsigned int (*)(void *, const struct QP::QEvt *))' (line 529, file C:\qp\qpcpp\include\qep.h) not referenced [MISRA C++ Rule 0-1-10] -"C:\qp\qpcpp\include\qep.h" 529 1 Warning 1526: Member function 'QP::QHsm::QHsm(unsigned int (*)(void *, const struct QP::QEvt *))' (line 529, file C:\qp\qpcpp\include\qep.h) not defined -"C:\qp\qpcpp\include\qep.h" 544 1 Warning 526: Symbol 'QP::versionStr' (line 544, file C:\qp\qpcpp\include\qep.h) not defined -"C:\qp\qpcpp\include\qep.h" 551 1 Info 1714: Member function 'QP::QEP::getVersion(void)' (line 551, file C:\qp\qpcpp\include\qep.h) not referenced [MISRA C++ Rule 0-1-10] +"C:\qp\qpcpp\include\qep.h" 321 1 Warning 1526: Member function 'QP::QMsm::init(const struct QP::QEvt *)' (line 321, file C:\qp\qpcpp\include\qep.h) not defined +"C:\qp\qpcpp\include\qep.h" 322 1 Info 1716: Virtual member function 'QP::QMsm::init(void)' (line 322, file C:\qp\qpcpp\include\qep.h) not referenced [MISRA C++ Rule 0-1-10] +"C:\qp\qpcpp\include\qep.h" 325 1 Info 1716: Virtual member function 'QP::QMsm::dispatch(const struct QP::QEvt *)' (line 325, file C:\qp\qpcpp\include\qep.h) not referenced [MISRA C++ Rule 0-1-10] +"C:\qp\qpcpp\include\qep.h" 325 1 Warning 1526: Member function 'QP::QMsm::dispatch(const struct QP::QEvt *)' (line 325, file C:\qp\qpcpp\include\qep.h) not defined +"C:\qp\qpcpp\include\qep.h" 328 1 Info 1714: Member function 'QP::QMsm::isInState(const struct QP::QMState *) const' (line 328, file C:\qp\qpcpp\include\qep.h) not referenced [MISRA C++ Rule 0-1-10] +"C:\qp\qpcpp\include\qep.h" 328 1 Warning 1526: Member function 'QP::QMsm::isInState(const struct QP::QMState *) const' (line 328, file C:\qp\qpcpp\include\qep.h) not defined +"C:\qp\qpcpp\include\qep.h" 331 1 Info 1714: Member function 'QP::QMsm::stateObj(void) const' (line 331, file C:\qp\qpcpp\include\qep.h) not referenced [MISRA C++ Rule 0-1-10] +"C:\qp\qpcpp\include\qep.h" 336 1 Info 1714: Member function 'QP::QMsm::childStateObj(const struct QP::QMState *) const' (line 336, file C:\qp\qpcpp\include\qep.h) not referenced [MISRA C++ Rule 0-1-10] +"C:\qp\qpcpp\include\qep.h" 336 1 Warning 1526: Member function 'QP::QMsm::childStateObj(const struct QP::QMState *) const' (line 336, file C:\qp\qpcpp\include\qep.h) not defined +"C:\qp\qpcpp\include\qep.h" 340 1 Info 1714: Member function 'QP::QMsm::QMsm(unsigned int (*)(void *, const struct QP::QEvt *))' (line 340, file C:\qp\qpcpp\include\qep.h) not referenced [MISRA C++ Rule 0-1-10] +"C:\qp\qpcpp\include\qep.h" 340 1 Warning 1526: Member function 'QP::QMsm::QMsm(unsigned int (*)(void *, const struct QP::QEvt *))' (line 340, file C:\qp\qpcpp\include\qep.h) not defined +"C:\qp\qpcpp\include\qep.h" 350 1 Info 1714: Member function 'QP::QMsm::qm_tran_hist_(const struct QP::QMState *, const struct QP::QMTranActTable *)' (line 350, file C:\qp\qpcpp\include\qep.h) not referenced [MISRA C++ Rule 0-1-10] +"C:\qp\qpcpp\include\qep.h" 366 1 Info 1714: Member function 'QP::QMsm::qm_tran_ep_(const struct QP::QMTranActTable *)' (line 366, file C:\qp\qpcpp\include\qep.h) not referenced [MISRA C++ Rule 0-1-10] +"C:\qp\qpcpp\include\qep.h" 373 1 Info 1714: Member function 'QP::QMsm::qm_tran_xp_(unsigned int (*)(void *), const struct QP::QMTranActTable *)' (line 373, file C:\qp\qpcpp\include\qep.h) not referenced [MISRA C++ Rule 0-1-10] +"C:\qp\qpcpp\include\qep.h" 395 1 Info 1714: Member function 'QP::QMsm::qm_super_sub_(const struct QP::QMState *)' (line 395, file C:\qp\qpcpp\include\qep.h) not referenced [MISRA C++ Rule 0-1-10] +"C:\qp\qpcpp\include\qep.h" 421 1 Info 1714: Member function 'QP::QMsm::Q_HANDLED(void)' (line 421, file C:\qp\qpcpp\include\qep.h) not referenced [MISRA C++ Rule 0-1-10] +"C:\qp\qpcpp\include\qep.h" 429 1 Info 1714: Member function 'QP::QMsm::Q_UNHANDLED(void)' (line 429, file C:\qp\qpcpp\include\qep.h) not referenced [MISRA C++ Rule 0-1-10] +"C:\qp\qpcpp\include\qep.h" 434 1 Info 1714: Member function 'QP::QMsm::tran_(unsigned int (*)(void *, const struct QP::QEvt *))' (line 434, file C:\qp\qpcpp\include\qep.h) not referenced [MISRA C++ Rule 0-1-10] +"C:\qp\qpcpp\include\qep.h" 440 1 Info 1714: Member function 'QP::QMsm::tran_hist_(unsigned int (*)(void *, const struct QP::QEvt *))' (line 440, file C:\qp\qpcpp\include\qep.h) not referenced [MISRA C++ Rule 0-1-10] +"C:\qp\qpcpp\include\qep.h" 446 1 Info 1714: Member function 'QP::QMsm::super_(unsigned int (*)(void *, const struct QP::QEvt *))' (line 446, file C:\qp\qpcpp\include\qep.h) not referenced [MISRA C++ Rule 0-1-10] +"C:\qp\qpcpp\include\qep.h" 452 1 Info 769: global enumeration constant 'QP::QMsm::ReservedHsmSignals::Q_ENTRY_SIG' (line 452, file C:\qp\qpcpp\include\qep.h) not referenced +"C:\qp\qpcpp\include\qep.h" 453 1 Info 769: global enumeration constant 'QP::QMsm::ReservedHsmSignals::Q_EXIT_SIG' (line 453, file C:\qp\qpcpp\include\qep.h) not referenced +"C:\qp\qpcpp\include\qep.h" 454 1 Info 769: global enumeration constant 'QP::QMsm::ReservedHsmSignals::Q_INIT_SIG' (line 454, file C:\qp\qpcpp\include\qep.h) not referenced +"C:\qp\qpcpp\include\qep.h" 468 1 Info 1715: static member 'QP::QMsm::MAX_ENTRY_DEPTH_' (line 468, file C:\qp\qpcpp\include\qep.h) not referenced +"C:\qp\qpcpp\include\qep.h" 471 1 Info 1715: static member 'QP::QMsm::msm_top_s' (line 471, file C:\qp\qpcpp\include\qep.h) not referenced +"C:\qp\qpcpp\include\qep.h" 471 1 Warning 1527: static member 'QP::QMsm::msm_top_s' (line 471, file C:\qp\qpcpp\include\qep.h) not defined +"C:\qp\qpcpp\include\qep.h" 507 1 Warning 1526: Member function 'QP::QHsm::init(const struct QP::QEvt *)' (line 507, file C:\qp\qpcpp\include\qep.h) not defined +"C:\qp\qpcpp\include\qep.h" 511 1 Info 1716: Virtual member function 'QP::QHsm::dispatch(const struct QP::QEvt *)' (line 511, file C:\qp\qpcpp\include\qep.h) not referenced [MISRA C++ Rule 0-1-10] +"C:\qp\qpcpp\include\qep.h" 511 1 Warning 1526: Member function 'QP::QHsm::dispatch(const struct QP::QEvt *)' (line 511, file C:\qp\qpcpp\include\qep.h) not defined +"C:\qp\qpcpp\include\qep.h" 515 1 Info 1714: Member function 'QP::QHsm::isIn(unsigned int (*)(void *, const struct QP::QEvt *))' (line 515, file C:\qp\qpcpp\include\qep.h) not referenced [MISRA C++ Rule 0-1-10] +"C:\qp\qpcpp\include\qep.h" 515 1 Warning 1526: Member function 'QP::QHsm::isIn(unsigned int (*)(void *, const struct QP::QEvt *))' (line 515, file C:\qp\qpcpp\include\qep.h) not defined +"C:\qp\qpcpp\include\qep.h" 518 1 Warning 1526: Member function 'QP::QHsm::top(void *, const struct QP::QEvt *)' (line 518, file C:\qp\qpcpp\include\qep.h) not defined +"C:\qp\qpcpp\include\qep.h" 521 1 Info 1714: Member function 'QP::QHsm::state(void) const' (line 521, file C:\qp\qpcpp\include\qep.h) not referenced [MISRA C++ Rule 0-1-10] +"C:\qp\qpcpp\include\qep.h" 526 1 Info 1714: Member function 'QP::QHsm::childState(unsigned int (*)(void *, const struct QP::QEvt *))' (line 526, file C:\qp\qpcpp\include\qep.h) not referenced [MISRA C++ Rule 0-1-10] +"C:\qp\qpcpp\include\qep.h" 526 1 Warning 1526: Member function 'QP::QHsm::childState(unsigned int (*)(void *, const struct QP::QEvt *))' (line 526, file C:\qp\qpcpp\include\qep.h) not defined +"C:\qp\qpcpp\include\qep.h" 530 1 Info 1714: Member function 'QP::QHsm::QHsm(unsigned int (*)(void *, const struct QP::QEvt *))' (line 530, file C:\qp\qpcpp\include\qep.h) not referenced [MISRA C++ Rule 0-1-10] +"C:\qp\qpcpp\include\qep.h" 530 1 Warning 1526: Member function 'QP::QHsm::QHsm(unsigned int (*)(void *, const struct QP::QEvt *))' (line 530, file C:\qp\qpcpp\include\qep.h) not defined +"C:\qp\qpcpp\include\qep.h" 545 1 Warning 526: Symbol 'QP::versionStr' (line 545, file C:\qp\qpcpp\include\qep.h) not defined +"C:\qp\qpcpp\include\qep.h" 552 1 Info 1714: Member function 'QP::QEP::getVersion(void)' (line 552, file C:\qp\qpcpp\include\qep.h) not referenced [MISRA C++ Rule 0-1-10] "C:\qp\qpcpp\include\qequeue.h" 161 1 Warning 1526: Member function 'QP::QEQueue::QEQueue(void)' (line 161, file C:\qp\qpcpp\include\qequeue.h) not defined "C:\qp\qpcpp\include\qequeue.h" 171 1 Info 1714: Member function 'QP::QEQueue::init(const struct QP::QEvt **, unsigned int)' (line 171, file C:\qp\qpcpp\include\qequeue.h) not referenced [MISRA C++ Rule 0-1-10] "C:\qp\qpcpp\include\qequeue.h" 171 1 Warning 1526: Member function 'QP::QEQueue::init(const struct QP::QEvt **, unsigned int)' (line 171, file C:\qp\qpcpp\include\qequeue.h) not defined @@ -174,12 +174,12 @@ "C:\qp\qpcpp\include\qk.h" 88 1 Info 1714: Member function 'QP::QK::getVersion(void)' (line 88, file C:\qp\qpcpp\include\qk.h) not referenced [MISRA C++ Rule 0-1-10] "C:\qp\qpcpp\include\qk.h" 102 1 Info 1714: Member function 'QP::QK::onIdle(void)' (line 102, file C:\qp\qpcpp\include\qk.h) not referenced [MISRA C++ Rule 0-1-10] "C:\qp\qpcpp\include\qk.h" 102 1 Warning 1526: Member function 'QP::QK::onIdle(void)' (line 102, file C:\qp\qpcpp\include\qk.h) not defined -"C:\qp\qpcpp\include\qk.h" 108 1 Info 1714: Member function 'QP::QMutex::init(unsigned int)' (line 108, file C:\qp\qpcpp\include\qk.h) not referenced [MISRA C++ Rule 0-1-10] -"C:\qp\qpcpp\include\qk.h" 108 1 Warning 1526: Member function 'QP::QMutex::init(unsigned int)' (line 108, file C:\qp\qpcpp\include\qk.h) not defined -"C:\qp\qpcpp\include\qk.h" 109 1 Info 1714: Member function 'QP::QMutex::lock(void)' (line 109, file C:\qp\qpcpp\include\qk.h) not referenced [MISRA C++ Rule 0-1-10] -"C:\qp\qpcpp\include\qk.h" 109 1 Warning 1526: Member function 'QP::QMutex::lock(void)' (line 109, file C:\qp\qpcpp\include\qk.h) not defined -"C:\qp\qpcpp\include\qk.h" 110 1 Info 1714: Member function 'QP::QMutex::unlock(void)' (line 110, file C:\qp\qpcpp\include\qk.h) not referenced [MISRA C++ Rule 0-1-10] -"C:\qp\qpcpp\include\qk.h" 110 1 Warning 1526: Member function 'QP::QMutex::unlock(void)' (line 110, file C:\qp\qpcpp\include\qk.h) not defined +"C:\qp\qpcpp\include\qk.h" 108 1 Info 1714: Member function 'QP::QKMutex::init(unsigned int)' (line 108, file C:\qp\qpcpp\include\qk.h) not referenced [MISRA C++ Rule 0-1-10] +"C:\qp\qpcpp\include\qk.h" 108 1 Warning 1526: Member function 'QP::QKMutex::init(unsigned int)' (line 108, file C:\qp\qpcpp\include\qk.h) not defined +"C:\qp\qpcpp\include\qk.h" 109 1 Info 1714: Member function 'QP::QKMutex::lock(void)' (line 109, file C:\qp\qpcpp\include\qk.h) not referenced [MISRA C++ Rule 0-1-10] +"C:\qp\qpcpp\include\qk.h" 109 1 Warning 1526: Member function 'QP::QKMutex::lock(void)' (line 109, file C:\qp\qpcpp\include\qk.h) not defined +"C:\qp\qpcpp\include\qk.h" 110 1 Info 1714: Member function 'QP::QKMutex::unlock(void)' (line 110, file C:\qp\qpcpp\include\qk.h) not referenced [MISRA C++ Rule 0-1-10] +"C:\qp\qpcpp\include\qk.h" 110 1 Warning 1526: Member function 'QP::QKMutex::unlock(void)' (line 110, file C:\qp\qpcpp\include\qk.h) not defined "C:\qp\qpcpp\include\qf.h" 182 1 Warning 1526: Member function 'QP::QMActive::QMActive(unsigned int (*)(void *, const struct QP::QEvt *))' (line 182, file C:\qp\qpcpp\include\qf.h) not defined "C:\qp\qpcpp\include\qf.h" 187 1 Warning 1526: Member function 'QP::QMActive::start(unsigned int, const struct QP::QEvt **, unsigned int, void *, unsigned int, const struct QP::QEvt *)' (line 187, file C:\qp\qpcpp\include\qf.h) not defined "C:\qp\qpcpp\include\qf.h" 193 1 Info 1716: Virtual member function 'QP::QMActive::start(unsigned int, const struct QP::QEvt **, unsigned int, void *, unsigned int)' (line 193, file C:\qp\qpcpp\include\qf.h) not referenced [MISRA C++ Rule 0-1-10] diff --git a/examples/arm-cm/dpp_ek-tm4c123gxl/qk/bsp.cpp b/examples/arm-cm/dpp_ek-tm4c123gxl/qk/bsp.cpp index 17db4245..258471c4 100644 --- a/examples/arm-cm/dpp_ek-tm4c123gxl/qk/bsp.cpp +++ b/examples/arm-cm/dpp_ek-tm4c123gxl/qk/bsp.cpp @@ -1,7 +1,7 @@ ///*************************************************************************** // Product: DPP example, EK-TM4C123GXL board, preemptive QK kernel -// Last updated for version 5.6.0 -// Last updated on 2015-12-26 +// Last updated for version 5.6.4 +// Last updated on 2016-05-04 // // Q u a n t u m L e a P s // --------------------------- @@ -76,7 +76,7 @@ Q_ASSERT_COMPILE(MAX_KERNEL_AWARE_CMSIS_PRI <= (0xFF >>(8-__NVIC_PRIO_BITS))); #define BTN_SW2 (1U << 0) static uint32_t l_rnd; // random seed -static QP::QMutex l_rndMutex; // to protect the random number generator +static QP::QKMutex l_rndMutex; // to protect the random number generator #ifdef Q_SPY diff --git a/examples/arm-cm/dpp_ek-tm4c123gxl/win32-qv/Makefile b/examples/arm-cm/dpp_ek-tm4c123gxl/win32-qv/Makefile index 2057e665..a867f8b2 100644 --- a/examples/arm-cm/dpp_ek-tm4c123gxl/win32-qv/Makefile +++ b/examples/arm-cm/dpp_ek-tm4c123gxl/win32-qv/Makefile @@ -1,7 +1,7 @@ ############################################################################## # Product: Makefile for QP/C++, DPP-GUI, Win32-QV, MinGW -# Last updated for version 5.5.0 -# Last updated on 2015-09-25 +# Last updated for version 5.6.4 +# Last updated on 2016-05-04 # # Q u a n t u m L e a P s # --------------------------- @@ -172,7 +172,7 @@ LINKFLAGS := -Wl,-Map,$(BIN_DIR)/$(PROJECT).map,--cref,--gc-sections # is it a GUI application (any GUI resources provided?) ... ifneq (,$(RC_SRCS)) LINKFLAGS += -mwindows -DEFINES += -DWIN32_GUI +DEFINES += -DQWIN_GUI endif #----------------------------------------------------------------------------- diff --git a/examples/arm-cm/dpp_ek-tm4c123gxl/win32-qv/bsp.cpp b/examples/arm-cm/dpp_ek-tm4c123gxl/win32-qv/bsp.cpp index d7c32e12..c79b014b 100644 --- a/examples/arm-cm/dpp_ek-tm4c123gxl/win32-qv/bsp.cpp +++ b/examples/arm-cm/dpp_ek-tm4c123gxl/win32-qv/bsp.cpp @@ -1,7 +1,7 @@ //**************************************************************************** // Product: DPP example with Win32-GUI -// Last updated for version 5.6.0 -// Last updated on 2015-12-30 +// Last updated for version 5.6.4 +// Last updated on 2016-05-04 // // Q u a n t u m L e a P s // --------------------------- @@ -35,7 +35,7 @@ #include "dpp.h" #include "bsp.h" -#include "win32_gui.h" // Win32 GUI elements for embedded front panels +#include "qwin_gui.h" // QWIN GUI #include "resource.h" // GUI resource IDs generated by the resource editior #include // for snprintf() diff --git a/examples/arm-cm/dpp_ek-tm4c123gxl/win32-qv/dpp-gui.vcxproj b/examples/arm-cm/dpp_ek-tm4c123gxl/win32-qv/dpp-gui.vcxproj index 02242fcc..a05bf52a 100644 --- a/examples/arm-cm/dpp_ek-tm4c123gxl/win32-qv/dpp-gui.vcxproj +++ b/examples/arm-cm/dpp_ek-tm4c123gxl/win32-qv/dpp-gui.vcxproj @@ -1,4 +1,4 @@ - + @@ -82,7 +82,7 @@ MaxSpeed OnlyExplicitInline .;..;../../../../include;../../../../ports/win32-qv;%(AdditionalIncludeDirectories) - NDEBUG;WIN32_GUI;_WINDOWS;%(PreprocessorDefinitions) + NDEBUG;QWIN_GUI;_WINDOWS;%(PreprocessorDefinitions) false @@ -133,7 +133,7 @@ Disabled .;..;../../../../include;../../../../ports/win32-qv;%(AdditionalIncludeDirectories) - Q_SPY;WIN32_GUI;snprintf=_snprintf;_CRT_SECURE_NO_WARNINGS;_DEBUG;_WINDOWS;%(PreprocessorDefinitions) + Q_SPY;QWIN_GUI;snprintf=_snprintf;_CRT_SECURE_NO_WARNINGS;_DEBUG;_WINDOWS;%(PreprocessorDefinitions) false @@ -190,7 +190,7 @@ Disabled .;..;../../../../include;../../../../ports/win32-qv;%(AdditionalIncludeDirectories) - WIN32_GUI;_DEBUG;_WINDOWS;%(PreprocessorDefinitions) + QWIN_GUI;_DEBUG;_WINDOWS;%(PreprocessorDefinitions) false diff --git a/examples/arm-cm/dpp_ek-tm4c123gxl/win32/Makefile b/examples/arm-cm/dpp_ek-tm4c123gxl/win32/Makefile index 6c8b97ec..8d54141b 100644 --- a/examples/arm-cm/dpp_ek-tm4c123gxl/win32/Makefile +++ b/examples/arm-cm/dpp_ek-tm4c123gxl/win32/Makefile @@ -1,7 +1,7 @@ ############################################################################## # Product: Makefile for QP/C++, DPP-GUI, Win32, MinGW -# Last updated for version 5.6.0 -# Last updated on 2015-12-30 +# Last updated for version 5.6.4 +# Last updated on 2016-05-04 # # Q u a n t u m L e a P s # --------------------------- @@ -172,7 +172,7 @@ LINKFLAGS := -Wl,-Map,$(BIN_DIR)/$(PROJECT).map,--cref,--gc-sections # is it a GUI application (any GUI resources provided?) ... ifneq (,$(RC_SRCS)) LINKFLAGS += -mwindows -DEFINES += -DWIN32_GUI +DEFINES += -DQWIN_GUI endif #----------------------------------------------------------------------------- diff --git a/examples/arm-cm/dpp_ek-tm4c123gxl/win32/bsp.cpp b/examples/arm-cm/dpp_ek-tm4c123gxl/win32/bsp.cpp index d7c32e12..c79b014b 100644 --- a/examples/arm-cm/dpp_ek-tm4c123gxl/win32/bsp.cpp +++ b/examples/arm-cm/dpp_ek-tm4c123gxl/win32/bsp.cpp @@ -1,7 +1,7 @@ //**************************************************************************** // Product: DPP example with Win32-GUI -// Last updated for version 5.6.0 -// Last updated on 2015-12-30 +// Last updated for version 5.6.4 +// Last updated on 2016-05-04 // // Q u a n t u m L e a P s // --------------------------- @@ -35,7 +35,7 @@ #include "dpp.h" #include "bsp.h" -#include "win32_gui.h" // Win32 GUI elements for embedded front panels +#include "qwin_gui.h" // QWIN GUI #include "resource.h" // GUI resource IDs generated by the resource editior #include // for snprintf() diff --git a/examples/arm-cm/dpp_ek-tm4c123gxl/win32/dpp-gui.vcxproj b/examples/arm-cm/dpp_ek-tm4c123gxl/win32/dpp-gui.vcxproj index 891b5bc0..c6c67b3b 100644 --- a/examples/arm-cm/dpp_ek-tm4c123gxl/win32/dpp-gui.vcxproj +++ b/examples/arm-cm/dpp_ek-tm4c123gxl/win32/dpp-gui.vcxproj @@ -1,4 +1,4 @@ - + @@ -82,7 +82,7 @@ MaxSpeed OnlyExplicitInline .;..;../../../../include;../../../../ports/win32;%(AdditionalIncludeDirectories) - NDEBUG;WIN32_GUI;_WINDOWS;%(PreprocessorDefinitions) + NDEBUG;QWIN_GUI;_WINDOWS;%(PreprocessorDefinitions) false @@ -133,7 +133,7 @@ Disabled .;..;../../../../include;../../../../ports/win32;%(AdditionalIncludeDirectories) - Q_SPY;WIN32_GUI;snprintf=_snprintf;_CRT_SECURE_NO_WARNINGS;_DEBUG;_WINDOWS;%(PreprocessorDefinitions) + Q_SPY;QWIN_GUI;snprintf=_snprintf;_CRT_SECURE_NO_WARNINGS;_DEBUG;_WINDOWS;%(PreprocessorDefinitions) false @@ -190,7 +190,7 @@ Disabled .;..;../../../../include;../../../../ports/win32;%(AdditionalIncludeDirectories) - WIN32_GUI;_DEBUG;_WINDOWS;%(PreprocessorDefinitions) + QWIN_GUI;_DEBUG;_WINDOWS;%(PreprocessorDefinitions) false diff --git a/examples/arm-cm/dpp_nucleo-l053r8/qk/bsp.cpp b/examples/arm-cm/dpp_nucleo-l053r8/qk/bsp.cpp index 9cce35b0..7de507a3 100644 --- a/examples/arm-cm/dpp_nucleo-l053r8/qk/bsp.cpp +++ b/examples/arm-cm/dpp_nucleo-l053r8/qk/bsp.cpp @@ -1,7 +1,7 @@ ///*************************************************************************** // Product: DPP example, STM32 NUCLEO-L053R8 board, preemptive QK kernel -// Last updated for version 5.6.0 -// Last updated on 2015-12-30 +// Last updated for version 5.6.4 +// Last updated on 2016-05-04 // // Q u a n t u m L e a P s // --------------------------- @@ -71,7 +71,7 @@ Q_ASSERT_COMPILE(MAX_KERNEL_AWARE_CMSIS_PRI <= (0xFF >>(8-__NVIC_PRIO_BITS))); #define BTN_B1 (1U << 13) static unsigned l_rnd; // random seed -static QP::QMutex l_rndMutex; // to protect the random number generator +static QP::QKMutex l_rndMutex; // to protect the random number generator #ifdef Q_SPY diff --git a/examples/arm-cm/game_ek-lm3s811/win32-qv/Makefile b/examples/arm-cm/game_ek-lm3s811/win32-qv/Makefile index 61a74a7b..5f9ee95f 100644 --- a/examples/arm-cm/game_ek-lm3s811/win32-qv/Makefile +++ b/examples/arm-cm/game_ek-lm3s811/win32-qv/Makefile @@ -1,7 +1,7 @@ ############################################################################## # Product: Makefile for QP/C++, "Fly 'n' Shoot" Game GUI, Win32-QV, MinGW -# Last updated for version 5.5.0 -# Last updated on 2015-09-25 +# Last updated for version 5.6.4 +# Last updated on 2016-05-04 # # Q u a n t u m L e a P s # --------------------------- @@ -175,7 +175,7 @@ LINKFLAGS := -Wl,-Map,$(BIN_DIR)/$(PROJECT).map,--cref,--gc-sections # is it a GUI application (any GUI resources provided?) ... ifneq (,$(RC_SRCS)) LINKFLAGS += -mwindows -DEFINES += -DWIN32_GUI +DEFINES += -DQWIN_GUI endif #----------------------------------------------------------------------------- diff --git a/examples/arm-cm/game_ek-lm3s811/win32-qv/bsp.cpp b/examples/arm-cm/game_ek-lm3s811/win32-qv/bsp.cpp index 591b373f..3c84db44 100644 --- a/examples/arm-cm/game_ek-lm3s811/win32-qv/bsp.cpp +++ b/examples/arm-cm/game_ek-lm3s811/win32-qv/bsp.cpp @@ -1,7 +1,7 @@ //**************************************************************************** // Product: "Fly 'n' Shoot" game example for Win32-GUI -// Last updated for version 5.6.0 -// Last updated on 2015-12-26 +// Last updated for version 5.6.4 +// Last updated on 2016-05-04 // // Q u a n t u m L e a P s // --------------------------- @@ -35,7 +35,7 @@ #include "game.h" #include "bsp.h" -#include "win32_gui.h" // Win32 GUI elements for embedded front panels +#include "qwin_gui.h" // QWIN GUI #include "resource.h" // GUI resource IDs generated by the resource editior #include // for _snprintf_s() diff --git a/examples/arm-cm/game_ek-lm3s811/win32-qv/game-gui.vcxproj b/examples/arm-cm/game_ek-lm3s811/win32-qv/game-gui.vcxproj index 8a65eed6..385d887d 100644 --- a/examples/arm-cm/game_ek-lm3s811/win32-qv/game-gui.vcxproj +++ b/examples/arm-cm/game_ek-lm3s811/win32-qv/game-gui.vcxproj @@ -82,7 +82,7 @@ MaxSpeed OnlyExplicitInline .;..;../../../../include;../../../../ports/win32-qv;%(AdditionalIncludeDirectories) - NDEBUG;WIN32_GUI;_WINDOWS;%(PreprocessorDefinitions) + NDEBUG;QWIN_GUI;_WINDOWS;%(PreprocessorDefinitions) false @@ -133,7 +133,7 @@ Disabled .;..;../../../../include;../../../../ports/win32-qv;%(AdditionalIncludeDirectories) - Q_SPY;WIN32_GUI;snprintf=_snprintf;_CRT_SECURE_NO_WARNINGS;_DEBUG;_WINDOWS;%(PreprocessorDefinitions) + Q_SPY;QWIN_GUI;snprintf=_snprintf;_CRT_SECURE_NO_WARNINGS;_DEBUG;_WINDOWS;%(PreprocessorDefinitions) false @@ -190,7 +190,7 @@ Disabled .;..;../../../../include;../../../../ports/win32-qv;%(AdditionalIncludeDirectories) - WIN32_GUI;_DEBUG;_WINDOWS;%(PreprocessorDefinitions) + QWIN_GUI;_DEBUG;_WINDOWS;%(PreprocessorDefinitions) false diff --git a/examples/arm-cm/game_ek-lm3s811/win32/Makefile b/examples/arm-cm/game_ek-lm3s811/win32/Makefile index 33954e44..66c36abb 100644 --- a/examples/arm-cm/game_ek-lm3s811/win32/Makefile +++ b/examples/arm-cm/game_ek-lm3s811/win32/Makefile @@ -1,7 +1,7 @@ ############################################################################## # Product: Makefile for QP/C++, "Fly 'n' Shoot" Game GUI, Win32, MinGW -# Last updated for version 5.5.0 -# Last updated on 2015-09-25 +# Last updated for version 5.6.4 +# Last updated on 2016-05-04 # # Q u a n t u m L e a P s # --------------------------- @@ -175,7 +175,7 @@ LINKFLAGS := -Wl,-Map,$(BIN_DIR)/$(PROJECT).map,--cref,--gc-sections # is it a GUI application (any GUI resources provided?) ... ifneq (,$(RC_SRCS)) LINKFLAGS += -mwindows -DEFINES += -DWIN32_GUI +DEFINES += -DQWIN_GUI endif #----------------------------------------------------------------------------- diff --git a/examples/arm-cm/game_ek-lm3s811/win32/bsp.cpp b/examples/arm-cm/game_ek-lm3s811/win32/bsp.cpp index 591b373f..2ead5138 100644 --- a/examples/arm-cm/game_ek-lm3s811/win32/bsp.cpp +++ b/examples/arm-cm/game_ek-lm3s811/win32/bsp.cpp @@ -35,7 +35,7 @@ #include "game.h" #include "bsp.h" -#include "win32_gui.h" // Win32 GUI elements for embedded front panels +#include "qwin_gui.h" // QWIN GUI #include "resource.h" // GUI resource IDs generated by the resource editior #include // for _snprintf_s() diff --git a/examples/arm-cm/game_ek-lm3s811/win32/game-gui.vcxproj b/examples/arm-cm/game_ek-lm3s811/win32/game-gui.vcxproj index 6b8b2f26..33606ec7 100644 --- a/examples/arm-cm/game_ek-lm3s811/win32/game-gui.vcxproj +++ b/examples/arm-cm/game_ek-lm3s811/win32/game-gui.vcxproj @@ -1,4 +1,4 @@ - + @@ -82,7 +82,7 @@ MaxSpeed OnlyExplicitInline .;..;../../../../include;../../../../ports/win32;%(AdditionalIncludeDirectories) - NDEBUG;WIN32_GUI;_WINDOWS;%(PreprocessorDefinitions) + NDEBUG;QWIN_GUI;_WINDOWS;%(PreprocessorDefinitions) false @@ -133,7 +133,7 @@ Disabled .;..;../../../../include;../../../../ports/win32;%(AdditionalIncludeDirectories) - Q_SPY;WIN32_GUI;snprintf=_snprintf;_CRT_SECURE_NO_WARNINGS;_DEBUG;_WINDOWS;%(PreprocessorDefinitions) + Q_SPY;QWIN_GUI;snprintf=_snprintf;_CRT_SECURE_NO_WARNINGS;_DEBUG;_WINDOWS;%(PreprocessorDefinitions) false @@ -190,7 +190,7 @@ Disabled .;..;../../../../include;../../../../ports/win32;%(AdditionalIncludeDirectories) - WIN32_GUI;_DEBUG;_WINDOWS;%(PreprocessorDefinitions) + QWIN_GUI;_DEBUG;_WINDOWS;%(PreprocessorDefinitions) false diff --git a/examples/win32-qv/dpp/Makefile b/examples/win32-qv/dpp/Makefile index d324573f..6e8a41c5 100644 --- a/examples/win32-qv/dpp/Makefile +++ b/examples/win32-qv/dpp/Makefile @@ -1,7 +1,7 @@ ############################################################################## # Product: Makefile for QP/C++, DPP console, Win32-QV, MinGW -# Last updated for version 5.5.0 -# Last updated on 2015-09-25 +# Last updated for version 5.6.4 +# Last updated on 2016-05-04 # # Q u a n t u m L e a P s # --------------------------- @@ -176,7 +176,7 @@ LINKFLAGS := -Wl,-Map,$(BIN_DIR)/$(PROJECT).map,--cref,--gc-sections # is it a GUI application (any GUI resources provided?) ... ifneq (,$(RC_SRCS)) LINKFLAGS += -mwindows -DEFINES += -DWIN32_GUI +DEFINES += -DQWIN_GUI endif #----------------------------------------------------------------------------- diff --git a/examples/win32-qv/reminder2/Makefile b/examples/win32-qv/reminder2/Makefile index 49530399..c315047a 100644 --- a/examples/win32-qv/reminder2/Makefile +++ b/examples/win32-qv/reminder2/Makefile @@ -1,7 +1,7 @@ ############################################################################## # Product: Makefile for QP/C++, Reminder2 pattern console, Win32-QV, MinGW -# Last updated for version 5.5.0 -# Last updated on 2015-09-25 +# Last updated for version 5.6.4 +# Last updated on 2016-05-04 # # Q u a n t u m L e a P s # --------------------------- @@ -174,7 +174,7 @@ LINKFLAGS := -Wl,-Map,$(BIN_DIR)/$(PROJECT).map,--cref,--gc-sections # is it a GUI application (any GUI resources provided?) ... ifneq (,$(RC_SRCS)) LINKFLAGS += -mwindows -DEFINES += -DWIN32_GUI +DEFINES += -DQWIN_GUI endif #----------------------------------------------------------------------------- diff --git a/examples/win32/calc/Makefile b/examples/win32/calc/Makefile index 7e9be5f3..8954a270 100644 --- a/examples/win32/calc/Makefile +++ b/examples/win32/calc/Makefile @@ -1,7 +1,7 @@ ############################################################################## # Product: Makefile for QP/C++, Calc console, Win32, MinGW -# Last updated for version 5.5.0 -# Last updated on 2015-09-25 +# Last updated for version 5.6.4 +# Last updated on 2016-05-04 # # Q u a n t u m L e a P s # --------------------------- @@ -175,7 +175,7 @@ LINKFLAGS := -Wl,-Map,$(BIN_DIR)/$(PROJECT).map,--cref,--gc-sections # is it a GUI application (any GUI resources provided?) ... ifneq (,$(RC_SRCS)) LINKFLAGS += -mwindows -DEFINES += -DWIN32_GUI +DEFINES += -DQWIN_GUI endif #----------------------------------------------------------------------------- diff --git a/examples/win32/calc2/Makefile b/examples/win32/calc2/Makefile index 2bcf8693..3b6eee7c 100644 --- a/examples/win32/calc2/Makefile +++ b/examples/win32/calc2/Makefile @@ -1,7 +1,7 @@ ############################################################################## # Product: Makefile for QP/C++, Calc2 console, Win32, MinGW -# Last updated for version 5.5.0 -# Last updated on 2015-09-25 +# Last updated for version 5.6.4 +# Last updated on 2016-05-04 # # Q u a n t u m L e a P s # --------------------------- @@ -175,7 +175,7 @@ LINKFLAGS := -Wl,-Map,$(BIN_DIR)/$(PROJECT).map,--cref,--gc-sections # is it a GUI application (any GUI resources provided?) ... ifneq (,$(RC_SRCS)) LINKFLAGS += -mwindows -DEFINES += -DWIN32_GUI +DEFINES += -DQWIN_GUI endif #----------------------------------------------------------------------------- diff --git a/examples/win32/comp/Makefile b/examples/win32/comp/Makefile index bb792275..935421f4 100644 --- a/examples/win32/comp/Makefile +++ b/examples/win32/comp/Makefile @@ -1,7 +1,7 @@ ############################################################################## # Product: Makefile for QP/C++, Orthogonal Component console, Win32, MinGW -# Last updated for version 5.5.0 -# Last updated on 2015-09-25 +# Last updated for version 5.6.4 +# Last updated on 2016-05-04 # # Q u a n t u m L e a P s # --------------------------- @@ -175,7 +175,7 @@ LINKFLAGS := -Wl,-Map,$(BIN_DIR)/$(PROJECT).map,--cref,--gc-sections # is it a GUI application (any GUI resources provided?) ... ifneq (,$(RC_SRCS)) LINKFLAGS += -mwindows -DEFINES += -DWIN32_GUI +DEFINES += -DQWIN_GUI endif #----------------------------------------------------------------------------- diff --git a/examples/win32/comp_qm/Makefile b/examples/win32/comp_qm/Makefile index ce9b33e4..8db0d578 100644 --- a/examples/win32/comp_qm/Makefile +++ b/examples/win32/comp_qm/Makefile @@ -1,7 +1,7 @@ ############################################################################## # Product: QP/C++, Orthogonal Component with QM console, Win32, MinGW -# Last updated for version 5.5.0 -# Last updated on 2015-09-25 +# Last updated for version 5.6.4 +# Last updated on 2016-05-04 # # Q u a n t u m L e a P s # --------------------------- @@ -176,7 +176,7 @@ LINKFLAGS := -Wl,-Map,$(BIN_DIR)/$(PROJECT).map,--cref,--gc-sections # is it a GUI application (any GUI resources provided?) ... ifneq (,$(RC_SRCS)) LINKFLAGS += -mwindows -DEFINES += -DWIN32_GUI +DEFINES += -DQWIN_GUI endif #----------------------------------------------------------------------------- diff --git a/examples/win32/defer/Makefile b/examples/win32/defer/Makefile index 45189ffe..b4910676 100644 --- a/examples/win32/defer/Makefile +++ b/examples/win32/defer/Makefile @@ -1,7 +1,7 @@ ############################################################################## # Product: Makefile for QP/C++, Deferred Event console, Win32, MinGW -# Last updated for version 5.5.0 -# Last updated on 2015-09-25 +# Last updated for version 5.6.4 +# Last updated on 2016-05-04 # # Q u a n t u m L e a P s # --------------------------- @@ -174,7 +174,7 @@ LINKFLAGS := -Wl,-Map,$(BIN_DIR)/$(PROJECT).map,--cref,--gc-sections # is it a GUI application (any GUI resources provided?) ... ifneq (,$(RC_SRCS)) LINKFLAGS += -mwindows -DEFINES += -DWIN32_GUI +DEFINES += -DQWIN_GUI endif #----------------------------------------------------------------------------- diff --git a/examples/win32/dpp/Makefile b/examples/win32/dpp/Makefile index b5a7a201..fe5efbd1 100644 --- a/examples/win32/dpp/Makefile +++ b/examples/win32/dpp/Makefile @@ -1,7 +1,7 @@ ############################################################################## # Product: Makefile for QP/C++, DPP console, Win32, MinGW -# Last updated for version 5.5.0 -# Last updated on 2015-09-25 +# Last updated for version 5.6.4 +# Last updated on 2016-05-04 # # Q u a n t u m L e a P s # --------------------------- @@ -176,7 +176,7 @@ LINKFLAGS := -Wl,-Map,$(BIN_DIR)/$(PROJECT).map,--cref,--gc-sections # is it a GUI application (any GUI resources provided?) ... ifneq (,$(RC_SRCS)) LINKFLAGS += -mwindows -DEFINES += -DWIN32_GUI +DEFINES += -DQWIN_GUI endif #----------------------------------------------------------------------------- diff --git a/examples/win32/history_qhsm/Makefile b/examples/win32/history_qhsm/Makefile index 0d8e3364..8db2a9db 100644 --- a/examples/win32/history_qhsm/Makefile +++ b/examples/win32/history_qhsm/Makefile @@ -1,7 +1,7 @@ ############################################################################## # Product: Makefile for QP/C++, History for QHsm console, Win32, MinGW -# Last updated for version 5.5.0 -# Last updated on 2015-09-25 +# Last updated for version 5.6.4 +# Last updated on 2016-05-04 # # Q u a n t u m L e a P s # --------------------------- @@ -174,7 +174,7 @@ LINKFLAGS := -Wl,-Map,$(BIN_DIR)/$(PROJECT).map,--cref,--gc-sections # is it a GUI application (any GUI resources provided?) ... ifneq (,$(RC_SRCS)) LINKFLAGS += -mwindows -DEFINES += -DWIN32_GUI +DEFINES += -DQWIN_GUI endif #----------------------------------------------------------------------------- diff --git a/examples/win32/history_qmsm/Makefile b/examples/win32/history_qmsm/Makefile index a36dc024..ae7f8c55 100644 --- a/examples/win32/history_qmsm/Makefile +++ b/examples/win32/history_qmsm/Makefile @@ -1,7 +1,7 @@ ############################################################################## # Product: Makefile for QP/C++, History for QMsm console, Win32, MinGW -# Last updated for version 5.5.0 -# Last updated on 2015-09-25 +# Last updated for version 5.6.4 +# Last updated on 2016-05-04 # # Q u a n t u m L e a P s # --------------------------- @@ -174,7 +174,7 @@ LINKFLAGS := -Wl,-Map,$(BIN_DIR)/$(PROJECT).map,--cref,--gc-sections # is it a GUI application (any GUI resources provided?) ... ifneq (,$(RC_SRCS)) LINKFLAGS += -mwindows -DEFINES += -DWIN32_GUI +DEFINES += -DQWIN_GUI endif #----------------------------------------------------------------------------- diff --git a/examples/win32/qhsmtst/Makefile b/examples/win32/qhsmtst/Makefile index 466fdf62..2a1cefac 100644 --- a/examples/win32/qhsmtst/Makefile +++ b/examples/win32/qhsmtst/Makefile @@ -1,7 +1,7 @@ ############################################################################## # Product: Makefile for QP/C++, QHsmTst console, Win32, MinGW -# Last updated for version 5.5.0 -# Last updated on 2015-09-25 +# Last updated for version 5.6.4 +# Last updated on 2016-05-04 # # Q u a n t u m L e a P s # --------------------------- @@ -174,7 +174,7 @@ LINKFLAGS := -Wl,-Map,$(BIN_DIR)/$(PROJECT).map,--cref,--gc-sections # is it a GUI application (any GUI resources provided?) ... ifneq (,$(RC_SRCS)) LINKFLAGS += -mwindows -DEFINES += -DWIN32_GUI +DEFINES += -DQWIN_GUI endif #----------------------------------------------------------------------------- diff --git a/examples/win32/qmsmtst/Makefile b/examples/win32/qmsmtst/Makefile index b0075e52..c2dc7788 100644 --- a/examples/win32/qmsmtst/Makefile +++ b/examples/win32/qmsmtst/Makefile @@ -1,7 +1,7 @@ ############################################################################## # Product: Makefile for QP/C++, QMsmTst console, Win32, MinGW -# Last updated for version 5.5.0 -# Last updated on 2015-09-25 +# Last updated for version 5.6.4 +# Last updated on 2016-05-04 # # Q u a n t u m L e a P s # --------------------------- @@ -174,7 +174,7 @@ LINKFLAGS := -Wl,-Map,$(BIN_DIR)/$(PROJECT).map,--cref,--gc-sections # is it a GUI application (any GUI resources provided?) ... ifneq (,$(RC_SRCS)) LINKFLAGS += -mwindows -DEFINES += -DWIN32_GUI +DEFINES += -DQWIN_GUI endif #----------------------------------------------------------------------------- diff --git a/examples/win32/reminder/Makefile b/examples/win32/reminder/Makefile index 65895d3c..e6bc6881 100644 --- a/examples/win32/reminder/Makefile +++ b/examples/win32/reminder/Makefile @@ -1,7 +1,7 @@ ############################################################################## # Product: Makefile for QP/C++, Reminder pattern console, Win32, MinGW -# Last updated for version 5.5.0 -# Last updated on 2015-09-25 +# Last updated for version 5.6.4 +# Last updated on 2016-05-04 # # Q u a n t u m L e a P s # --------------------------- @@ -174,7 +174,7 @@ LINKFLAGS := -Wl,-Map,$(BIN_DIR)/$(PROJECT).map,--cref,--gc-sections # is it a GUI application (any GUI resources provided?) ... ifneq (,$(RC_SRCS)) LINKFLAGS += -mwindows -DEFINES += -DWIN32_GUI +DEFINES += -DQWIN_GUI endif #----------------------------------------------------------------------------- diff --git a/examples/win32/reminder2/Makefile b/examples/win32/reminder2/Makefile index 697b564f..d60b04b9 100644 --- a/examples/win32/reminder2/Makefile +++ b/examples/win32/reminder2/Makefile @@ -1,7 +1,7 @@ ############################################################################## # Product: Makefile for QP/C++, Reminder2 pattern console, Win32, MinGW -# Last updated for version 5.5.0 -# Last updated on 2015-09-25 +# Last updated for version 5.6.4 +# Last updated on 2016-05-04 # # Q u a n t u m L e a P s # --------------------------- @@ -174,7 +174,7 @@ LINKFLAGS := -Wl,-Map,$(BIN_DIR)/$(PROJECT).map,--cref,--gc-sections # is it a GUI application (any GUI resources provided?) ... ifneq (,$(RC_SRCS)) LINKFLAGS += -mwindows -DEFINES += -DWIN32_GUI +DEFINES += -DQWIN_GUI endif #----------------------------------------------------------------------------- diff --git a/include/qf.h b/include/qf.h index 20f28092..2cfef690 100644 --- a/include/qf.h +++ b/include/qf.h @@ -3,8 +3,8 @@ /// @ingroup qf /// @cond ///*************************************************************************** -/// Last updated for version 5.6.2 -/// Last updated on 2016-03-30 +/// Last updated for version 5.6.4 +/// Last updated on 2016-05-04 /// /// Q u a n t u m L e a P s /// --------------------------- @@ -260,7 +260,7 @@ public: friend class QF; friend class QTimeEvt; - friend class QMutex; + friend class QKMutex; friend class QXK; friend class QXThread; friend class QXMutex; diff --git a/include/qk.h b/include/qk.h index f154b7eb..66e670d8 100644 --- a/include/qk.h +++ b/include/qk.h @@ -3,8 +3,8 @@ /// @ingroup qk /// @cond ///*************************************************************************** -/// Last updated for version 5.6.2 -/// Last updated on 2016-03-31 +/// Last updated for version 5.6.4 +/// Last updated on 2016-05-04 /// /// Q u a n t u m L e a P s /// --------------------------- @@ -103,7 +103,7 @@ public: }; /*! Priority-ceiling Mutex the QK preemptive kernel */ -class QMutex { +class QKMutex { public: void init(uint_fast8_t const prio); void lock(void); @@ -161,7 +161,7 @@ extern uint_fast8_t volatile QK_lockPrio_; //!< lock prio (0 == no-lock) // QF-specific scheduler locking //! Internal port-specific macro to represent the scheduler lock status // that needs to be preserved to allow nesting of locks. - #define QF_SCHED_STAT_TYPE_ QMutex + #define QF_SCHED_STAT_TYPE_ QKMutex //! Internal port-specific macro for selective scheduler locking. #define QF_SCHED_LOCK_(pLockStat_, prio_) do { \ diff --git a/ports/qt/qf_port.cpp b/ports/qt/qf_port.cpp index eef05dc8..c9e8e952 100644 --- a/ports/qt/qf_port.cpp +++ b/ports/qt/qf_port.cpp @@ -2,14 +2,14 @@ /// @brief QP/C++ port to Qt /// @cond ///*************************************************************************** -/// Last Updated for Version: QP 5.5.0/Qt 5.x -/// Last updated on 2015-09-26 +/// Last Updated for Version: QP 5.6.4/Qt 5.x +/// Last updated on 2016-05-04 /// /// Q u a n t u m L e a P s /// --------------------------- /// innovating embedded systems /// -/// Copyright (C) Quantum Leaps, www.state-machine.com. +/// Copyright (C) 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 @@ -30,8 +30,8 @@ /// along with this program. If not, see . /// /// Contact information: -/// Web: www.state-machine.com -/// Email: info@state-machine.com +/// http://www.state-machine.com +/// mailtp:info@state-machine.com ///*************************************************************************** /// @endcond diff --git a/ports/qt/qf_port.h b/ports/qt/qf_port.h index 44b04b9b..e6448fee 100644 --- a/ports/qt/qf_port.h +++ b/ports/qt/qf_port.h @@ -2,8 +2,8 @@ /// @brief QP/C++ port to Qt /// @cond ///*************************************************************************** -/// Last Updated for Version: QP 5.6.2/Qt 5.x -/// Last updated on 2016-03-31 +/// Last Updated for Version: QP 5.6.4/Qt 5.x +/// Last updated on 2016-05-04 /// /// Q u a n t u m L e a P s /// --------------------------- @@ -67,6 +67,7 @@ class QWaitCondition; // forward declaration class QThread; // forward declaration +class QMutex; // forward declaration #include "qep_port.h" // QEP port #include "qequeue.h" // Qt port uses event-queue @@ -95,6 +96,10 @@ void QF_setTickRate(uint32_t ticksPerSec); // clock tick callback (provided in the app) void QF_onClockTick(void); +#ifdef QP_IMPL +extern QMutex QF_qtMutex_; +#endif + #ifdef Q_SPY void QS_onEvent(void); #endif @@ -135,10 +140,6 @@ void QS_onEvent(void); #include #include -namespace QP { - extern QMutex QF_qtMutex_; -} // namespace QP - #endif // QP_IMPL // undefine the conflicting Q_ASSERT definition from Qt diff --git a/ports/qt/vc/qp.pro b/ports/qt/vc/qp.pro new file mode 100644 index 00000000..28ead7d6 --- /dev/null +++ b/ports/qt/vc/qp.pro @@ -0,0 +1,104 @@ +#----------------------------------------------------------------------------- +# Product: QP/C++ port to Qt5 +# Last Updated for Version: QP/C++ 5.5.0/Qt 5.x +# Date of the Last Update: 2015-09-26 +# +# Q u a n t u m L e a P s +# --------------------------- +# innovating embedded systems +# +# Copyright (C) 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. +# +# 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 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 . +# +# Contact information: +# http://www.state-machine.com +# mailto:info@state-machine.com +#----------------------------------------------------------------------------- + +# NOTE: +# This project builds QP/C++ library (for Qt5). This libary is needed +# only in projects that link this library. (The example projects in +# the qpcpp/examples/qt/ directory build QP/C++ from sources and actually +# don't need the QP/C++ library). + +# NOTE: +# After you build the QP/C++ library (libqp.a), you should copy the Debug +# version to the debug/ sub-directory and the Release version to the +# release/ sub-directory. + +QT += core gui widgets +TARGET = qp +TEMPLATE = lib +CONFIG += staticlib +DEFINES += QT_NO_STATEMACHINE + +QPCPP = ../../.. + +INCLUDEPATH += .. \ + $$QPCPP/include \ + $$QPCPP/source + +HEADERS += \ + ../qep_port.h \ + ../qf_port.h \ + ../tickerthread.h \ + ../aothread.h \ + ../guiapp.h \ + ../guiactive.h \ + ../pixellabel.h + +SOURCES += \ + ../qf_port.cpp \ + ../guiapp.cpp \ + ../pixellabel.cpp \ + $$QPCPP/source/qep_hsm.cpp \ + $$QPCPP/source/qep_msm.cpp \ + $$QPCPP/source/qf_act.cpp \ + $$QPCPP/source/qf_actq.cpp \ + $$QPCPP/source/qf_defer.cpp \ + $$QPCPP/source/qf_dyn.cpp \ + $$QPCPP/source/qf_mem.cpp \ + $$QPCPP/source/qf_ps.cpp \ + $$QPCPP/source/qf_qact.cpp \ + $$QPCPP/source/qf_qeq.cpp \ + $$QPCPP/source/qf_qmact.cpp \ + $$QPCPP/source/qf_time.cpp + + +CONFIG(debug, debug|release) { + + # NOTE: + # The Debug configuration also uses Q-SPY software tracing. + # The following defines, headers, and sources are needed only for + # the QS target-resident component. + + DEFINES += Q_SPY + + SOURCES += \ + $$QPCPP/source/qs.cpp \ + $$QPCPP/source/qs_rx.cpp \ + $$QPCPP/source/qs_fp.cpp \ + $$QPCPP/source/qs_64bit.cpp + +} else { + + # Release build configuartion + DEFINES += NDEBUG +} diff --git a/ports/win32-qv/Makefile b/ports/win32-qv/Makefile index 0b20ae47..1f54b799 100644 --- a/ports/win32-qv/Makefile +++ b/ports/win32-qv/Makefile @@ -1,7 +1,7 @@ ############################################################################## -# Product: Makefile for QP/C++ port to Win32-QV API, MinGW toolset -# Last Updated for Version: 5.5.0 -# Date of the Last Update: 2015-09-24 +# Product: Makefile for QP/C++ port to Win32 API, MinGW toolset +# Last Updated for Version: 5.6.4 +# Date of the Last Update: 2016-05-04 # # Q u a n t u m L e a P s # --------------------------- @@ -96,8 +96,8 @@ CPP_SRCS := \ qf_qeq.cpp \ qf_qmact.cpp \ qf_time.cpp \ - win32_gui.cpp \ - qf_port.cpp + qf_port.cpp \ + qwin_gui.cpp # C++ QS source files CPP_QS_SRCS := \ @@ -107,7 +107,7 @@ CPP_QS_SRCS := \ qs_64bit.cpp # defines -DEFINES := -DWIN32_GUI +DEFINES := -DQWIN_GUI #----------------------------------------------------------------------------- # MinGW toolset (NOTE: assumed to be on your PATH) diff --git a/ports/win32-qv/QSpy/qp.tlog/CL.read.1.tlog b/ports/win32-qv/QSpy/qp.tlog/CL.read.1.tlog deleted file mode 100644 index 4d3cb028d4f677e012f2549e41fbb44faf116867..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 209664 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 PUW_EU4qZj>B7y%8s^uch diff --git a/ports/win32-qv/QSpy/qp.tlog/CL.write.1.tlog b/ports/win32-qv/QSpy/qp.tlog/CL.write.1.tlog deleted file mode 100644 index aad68df596a525ba042050b2c4dd346b086da5e4..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 5568 zcmd5=%TB{E5S%j-pF+h;9JoQ!@Q^~|CM{G#OTw#JK8q|D##2p@RhEp8z7fgp=8Q8mN7>XF}|I6?8}ax^+?$*?T8wtc@Ccu8rD_L|yC=dx5UU zQl4rfcPofKcBpLnxUuGGBUj9BeecDtq|G*G9rB%0A2)SyZS3GV-|zN=tcx3_xHyMt zGG3n#6Y};6_%{=#MhEKeYeRWO&B7#ZfmfPr3FY zhn{AO)8@ux#e?g+m>pJ|Tb>nWX)d)BUuiS7pi=+NYlT^No3_H~Z}#-<^Ni$6<9}%P MJZ^_4_M?Zr2qf` diff --git a/ports/win32-qv/QSpy/qp.tlog/Lib-link.read.1.tlog b/ports/win32-qv/QSpy/qp.tlog/Lib-link.read.1.tlog deleted file mode 100644 index 07a233a35e49d37ea738091e17acc7247f047c31..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3332 zcmcJS%WlFj5Jm605}#5QrDD-tAdjX>XpGYW6>5HjZ*O}ifNTOQdLsle#5tOb$8*T< z&o`EM!5$9H>2t}EjT^jUjTWBc4N9yq!xJ7k^Ru7nIb+w4GLAaDa%PPwuUg;@2N}1P zb8|+UFuqnAZJ;_iH${e=@AU}e9amPlYLh~G?4V=Ee$Y{4LujbC{(mXR_t>YP rUF<0%;jyH5656NaFDrV;^Jq^k_PkO=-;dobq2DT=o$_qOxpoJC{7dp1 diff --git a/ports/win32-qv/QSpy/qp.tlog/Lib-link.write.1.tlog b/ports/win32-qv/QSpy/qp.tlog/Lib-link.write.1.tlog deleted file mode 100644 index 044919147c40c2db872db8ec4afc35521099b74c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1650 zcmcJP%?^Sv5QOJ!;-lz6jR$Xnpcv7X)*ljMU&LouXNiOt7!D1kYj@< zJly}Av$ERZf(8+R^&J(?SYm-0J8xZQU`N|k1*?PuJ8R7OSB4|rGHxyBmQ=f?z9>~Y zP`#YHLxGZ~8G+n#v&ya69BOLSdcml@Bh_jh9j0dbksRhZS-rnJw>8d-h)fQ1gL1yw uZ3Q}OjTKX?5+{O@OS)Ej_rw%<2$@5+C+u$7Q=lNUs_I}vVyuE8#Qylf&u&6#8z#)2 zW?fbJ@V$R6ukhdMC%zl=Mb zbe^^z3QL1@MvOU;op_(K9241RZE6Egiy9p~dj@Jyw>q|#x3%=6C@EF1u;l)Fp)svA zCeCvrz0~bX(Tuo`izgE9SBP>F;~6cx;-5&U%}e_c zE&P#~*J;HLan_4`t)kXFtgiO=q_=#|Pd+`Q<%YD}gMRamuBHAJ-%y66#*nBPvWV~7 z8ItgZ?83+%tTqL4@9#t@;!u!kbl<~{%=i&u4>RS*EWTk3aea2e(KU`l%8_b>Ls@dd zsLy(ta#S79IMu00gYo?=x?$`{(GQ!jv_>{vuMj2#_jFs2-FD#tvwVa&*E_7d&- zhf|I!d_x)1q!d$+IMpL#+%Su7C_7S9kjNFJ3gIx8^jM>IV;EDBI8~$y-?uZw#-=gO zTV_!WVZ%V%d;zMX8Mdk(Co^6{IE*C;Ukt5BiLXb=nYYYi8^(;T`o@e1*U}v`=COU9 z869>~bm>EK_9RUAOsq2BIr95I-2AxAV>qv=ZDBka7(3Df@4~_=1;o4 BamxSz diff --git a/ports/win32-qv/QSpy/qp.tlog/lib.command.1.tlog b/ports/win32-qv/QSpy/qp.tlog/lib.command.1.tlog deleted file mode 100644 index 622f6314f8cb8e6247d6dbb027c5d920588c4958..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2238 zcmcIl%MOAt5S+7#|6shUi5d^yeBmRaRKQ1KHwbujbg{sm2?t^G2+8 z#`-eVY8|Ul=Urlji0jk<^NlB~d1|%~F>BS;f@Ligsansx zkds-=#HNlv!wN-Wm%N$X)x_d9^0#`*&=j{d7$k~Om-Zoko(9d)BWs0tX zquXBW`G+~#I^;f(eb2S#>QLAJ@01X)-VHwP+_>CLJ?dsj;-Tk;8NPQ)wCaHp^*u*o p(mO)j_ka+Uvn(^@O!~N+t?Jvl8Ic*j)+Od^*2n66-QoYW`2ix3Reb;e diff --git a/ports/win32-qv/QSpy/qp.tlog/qp.lastbuildstate b/ports/win32-qv/QSpy/qp.tlog/qp.lastbuildstate deleted file mode 100644 index 4640ee87..00000000 --- a/ports/win32-qv/QSpy/qp.tlog/qp.lastbuildstate +++ /dev/null @@ -1,2 +0,0 @@ -#TargetFrameworkVersion=v4.0:PlatformToolSet=v120:EnableManagedIncrementalBuild=false:VCToolArchitecture=Native32Bit -QSpy|Win32|C:\qp\qpcpp\ports\win32-qv\| diff --git a/ports/win32-qv/QSpy/vc120.pdb b/ports/win32-qv/QSpy/vc120.pdb index 51ebea1140fdc0ace4a0f6da1a4cc5a1610d120c..461a06bddbc2149b9424a27d1b6e32d2275b462e 100644 GIT binary patch delta 945 zcmb_Z&ubH55Pjb^ja_2XHNuuIh_$9*X%VrO{xE2Z9xRm*6>IchC?Y0U%0?`O)@B2G z5(}k^Y`rQ%PbE@y!P6e{FX%x;1A>lP|U8OD%)$u{A$tIyp@mj+kF^TCm1q>V{f3 z9YY;y#Qo8)-~a9pKV~IHg-dQt^KQuV+t1z4qfl2(n-v=q+ObA`Xnqdst*r~9y{l2$ z!0xn)dCG_ybD5dcz1hskH0KsZP_1%;6T~>j?)s+>*Zi}df6?;?Jb%&ir|7F(4=-fv zq<3^3T;tw-B*^aXN>uFS332&Id_@O(LcoIz@O>2Mz6Lza0-OBbb{F_|ABabRavv}` z4ctrt(H!6qy$e8L4#=DVUK|J7`|ZzZ@hP}cKG@@Gc{>6eK(!iRZ%uiAc>3fTIC#Wp z!&=IUPW!qpHqMJyTP}!@68_1;4#u7^D<<1rj`(oG_`jV3sd*qY37jJy5=+E;s(Urd zm)-Vw`nkA3=Z + @@ -68,7 +68,7 @@ Disabled .;../../include;../../source;%(AdditionalIncludeDirectories) - WIN32_GUI;_DEBUG;%(PreprocessorDefinitions) + QWIN_GUI;_DEBUG;%(PreprocessorDefinitions) MultiThreaded @@ -87,7 +87,7 @@ Full .;../../include;../../source;%(AdditionalIncludeDirectories) - WIN32_GUI;NDEBUG;%(PreprocessorDefinitions) + QWIN_GUI;NDEBUG;%(PreprocessorDefinitions) MultiThreaded @@ -108,7 +108,7 @@ Disabled .;../../include;../../source;%(AdditionalIncludeDirectories) - Q_SPY;WIN32_GUI;_DEBUG;%(PreprocessorDefinitions) + Q_SPY;QWIN_GUI;_DEBUG;%(PreprocessorDefinitions) MultiThreaded @@ -173,7 +173,7 @@ true - + @@ -183,7 +183,7 @@ - + diff --git a/ports/win32/win32_gui.cpp b/ports/win32-qv/qwin_gui.cpp similarity index 96% rename from ports/win32/win32_gui.cpp rename to ports/win32-qv/qwin_gui.cpp index b2906742..dbe4b20c 100644 --- a/ports/win32/win32_gui.cpp +++ b/ports/win32-qv/qwin_gui.cpp @@ -1,15 +1,15 @@ /// \file -/// \brief Win32 GUI facilities for building realistic embedded front panels +/// \brief QWIN GUI facilities for building realistic embedded front panels /// \cond ///*************************************************************************** -/// Last updated for version 5.4.2 -/// Last updated on 2015-06-05 +/// Last updated for version 5.6.4 +/// Last updated on 2016-05-04 /// /// Q u a n t u m L e a P s /// --------------------------- /// innovating embedded systems /// -/// Copyright (C) Quantum Leaps, www.state-machine.com. +/// Copyright (C) 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 @@ -30,12 +30,12 @@ /// along with this program. If not, see . /// /// Contact information: -/// Web: www.state-machine.com -/// Email: info@state-machine.com +/// http://www.state-machine.com +/// mailto:info@state-machine.com ///*************************************************************************** /// \endcond -#include "win32_gui.h" +#include "qwin_gui.h" #include //---------------------------------------------------------------------------- diff --git a/ports/win32-qv/win32_gui.h b/ports/win32-qv/qwin_gui.h similarity index 89% rename from ports/win32-qv/win32_gui.h rename to ports/win32-qv/qwin_gui.h index 0c9eb32d..a009ac1b 100644 --- a/ports/win32-qv/win32_gui.h +++ b/ports/win32-qv/qwin_gui.h @@ -1,15 +1,15 @@ /// \file -/// \brief Win32 GUI facilities for building realistic embedded front panels +/// \brief QWIN GUI facilities for building realistic embedded front panels /// \cond ///*************************************************************************** -/// Last updated for version 5.4.2 -/// Last updated on 2015-06-05 +/// Last updated for version 5.6.4 +/// Last updated on 2016-05-04 /// /// Q u a n t u m L e a P s /// --------------------------- /// innovating embedded systems /// -/// Copyright (C) Quantum Leaps, www.state-machine.com. +/// Copyright (C) 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 @@ -30,16 +30,16 @@ /// along with this program. If not, see . /// /// Contact information: -/// Web: www.state-machine.com -/// Email: info@state-machine.com +/// http://www.state-machine.com +/// mailto:info@state-machine.com ///*************************************************************************** /// \endcond -#ifndef win32_gui_h -#define win32_gui_h +#ifndef qwin_gui_h +#define qwin_gui_h -#ifndef WIN32_GUI - #error The pre-processor macro WIN32_GUI must be defined +#ifndef QWIN_GUI + #error The pre-processor macro QWIN_GUI must be defined #endif #define WIN32_LEAN_AND_MEAN @@ -111,4 +111,4 @@ public: // useful helper functions ................................................... void DrawBitmap(HDC hdc, HBITMAP hBitmap, int xStart, int yStart); -#endif // win32_gui_h +#endif // qwin_gui_h diff --git a/ports/win32/Makefile b/ports/win32/Makefile index eaf39385..1f54b799 100644 --- a/ports/win32/Makefile +++ b/ports/win32/Makefile @@ -1,7 +1,7 @@ ############################################################################## # Product: Makefile for QP/C++ port to Win32 API, MinGW toolset -# Last Updated for Version: 5.5.0 -# Date of the Last Update: 2015-09-24 +# Last Updated for Version: 5.6.4 +# Date of the Last Update: 2016-05-04 # # Q u a n t u m L e a P s # --------------------------- @@ -96,8 +96,8 @@ CPP_SRCS := \ qf_qeq.cpp \ qf_qmact.cpp \ qf_time.cpp \ - win32_gui.cpp \ - qf_port.cpp + qf_port.cpp \ + qwin_gui.cpp # C++ QS source files CPP_QS_SRCS := \ @@ -107,7 +107,7 @@ CPP_QS_SRCS := \ qs_64bit.cpp # defines -DEFINES := -DWIN32_GUI +DEFINES := -DQWIN_GUI #----------------------------------------------------------------------------- # MinGW toolset (NOTE: assumed to be on your PATH) diff --git a/ports/win32/QSpy/qp.tlog/CL.read.1.tlog b/ports/win32/QSpy/qp.tlog/CL.read.1.tlog deleted file mode 100644 index d2e57546b19796bf30f2167f277a7c309928b3f6..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 209358 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 Mjs2n7vM&1fe{(+gf&c&j diff --git a/ports/win32/QSpy/qp.tlog/CL.write.1.tlog b/ports/win32/QSpy/qp.tlog/CL.write.1.tlog deleted file mode 100644 index 24c99b433e74825e33a5b3c9edf17d159126786d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 5322 zcmd5=%TB{E5S%j-zf$oM2X2rwJfu*&Nr6g;{0QF;jB8w{B@x)!Vjo&rYIb%qyWU4X zKi*K_3a`*m-`@pK=B%*55-l2@pK*^zoa1csOoeXy>x}m1`S)NPkJ;fCD|+}Ht0AWq zSrwRXn9S+9!yP%+(bjdOwNc@kOxg&~-d0CimsFtQXBln3W<JJ zHE;J5ZBJQoPKc*a@_nY^4b__kQ6DDaYO2+*hccKZ3RX)wJR4OxyndERq0U(0rDEdm zog8Mr7D%Gn>LiKiDwZ6k;@y;tkLx3H3`&>wXre%NE%ZL(N0!wHj-hv zJFR)l@fq|l^WLDe55w;i84!v2fhy}aQJP2w+TnCj_i2MlO4%~5C*-g8uud3E=;~tIenPdO` zeq)7ae8FKje6HBD{(yIEFv7FHMT;H}xDR7IpY1}gVsFAL$8@;k_!qq4M?ma^#F`Nn zjA;}_7S_gVX=@EL^|gk$G`51ebapN?T05U~$=eEQYHkHDb$2fB((NXXdCiH?(D-&IFW9y` k3kseNEr02GclT`Vc5nCkCiy=5sNk8i4(Dvo)`xTBA0BzsO8@`> diff --git a/ports/win32/QSpy/qp.tlog/Lib-link.write.1.tlog b/ports/win32/QSpy/qp.tlog/Lib-link.write.1.tlog deleted file mode 100644 index b059bfa200181741e5940d5bcd728fd9672b01e1..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1536 zcmb`H!3x4K5JcxJ_$wY%Jb1IU)r!%iiD;piAMxAO*<$GjIER*nERWgDY(DQNN^H?1 z!2kXwE2}-OXpsj`~zS8*faQPN8RRbhIGPP2deGQxoWiI@^i6Zcc0NQRPQuUN%_s pg=u7)Y|NS|R85+>y$=a(dT%ohxN+uD;~cZU-dCIUOkM#aeF3i{?Z5y4 diff --git a/ports/win32/QSpy/qp.tlog/cl.command.1.tlog b/ports/win32/QSpy/qp.tlog/cl.command.1.tlog deleted file mode 100644 index 48e71c106688516879718963096ce0d2110613ed..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 9830 zcmeI2TW`}q5QWb(68{19os>%jQs0^;4t+3*<3KN}h@#L!rBb36RFxkOe6z8eCUsF3 zo>+|{Uv_4_ncZ`I_Tv5Z^MiJ^tz#7$ROemp?7mcA?=-~U4W2I6vEE?M)xv7I9_x`d zHPsW&dsyphi*$?Mrp|PM|6JeoQ6~-lD}BXxNuIg)h$pO+3+(3{pExYNudV8Opr_%k zPl@K~>!z}FNEgId64_z!nPs2I-s+`Z;OSALy<5*%9qQJ`)(f_tzEmaU8da7uTu(Kl zm1e|wLZoN9x{Y><{Tkb6P4JHOE#yDKvaM5Mza*L|*ID&M#{C9S&SN~LWjDeT8MV1< ze@_cPC+26g;($2YRlZ(T>k(F~{Wa;Wkn?p&PiVObEq9|I{G+whzv3IqklY!PG(+y= zyFNoQ-jE#_IfB)$Aol*wl_CuVX-4;N*ikq?66|3X{8+{}jv>}(XB5NlNMLLY{m(h)5M~;5@EGETSjIrZBx^e6nFoSXBNK-jhv5jL!;j@=y z*FQ`-n(&QfNS9JvJJxyjjgm4^7GQJpkkCI-GQZjE@#Ws!^LmfCX5?o6+W~^fS yFf#`1q!`kNlu&bS! z>*W_YmiU1~{rAmz^YM-y*A>#*DD0mK1&J(w$*^8gLVt=YVd%i(ox(;jVM#tvlx^a9#rD`1aq1JXw zulr4F-chxWhI)C!f(f&gIoWd-RH16pj_&=Iu!X$su*Q)y4?RBO0WVD2BVS>Or+;Ow zpS&b@MxGg2_v9^k);u%n^nT8#_&Bv=JY?oD$21zeVevE{(~3ClEIQ6Ei^jQOF`EJ@ l9(y`PtwU{v^;?Vw_l*BedBIl1%C=an(-@md<$&K;eH1 zCYRRMNboVRh%qrRFxUt&FiaI-U~pq#6|)7hCo={}Po5hfIoY9(CqRmUS&Wt8s31@n zsAL8Zp9He)fXY67M3q~FM{WgNZc@Dzlbz6HnR=;uY=)eKE5x+m93Hu=c;ud8mzzBE z0j~`LM!7o!gQPhFgM2LmLk!Tp+`$YC>nngM z$C7~|!j*yHdn^OPjuHlj&p`R@l?)8$lNcDzq%kn~0p(_EGB8|M-2Tpj@etcK2Sy$R zRghoq08M3Q`2U{;=r-mCkP8_Y95^8u7|aX-+YJ*Kulq9!Z|B^=$SuGt0`#mTP#ly9 z1GXz3U_7spMO_y%F#IlLV9*a^U~mHB3LxG9#M|N-7@o<1T)&KM+6P7+)o`HWYk-bH ncYF-c@gNLxe9m^m4~*CO8HKlUG6CJb1+Z6?v?#lxJTJF$c delta 226 zcmZp8z|ru4V?zL^l)`@oh8~7&CJ?rOVg`Y1CWZ$a9jCKxW)ygSefx`cMjiIeBJb~b zZg;R`JisYlu5PaZ(U;z+kyI}(3b$>>o z?VKAJxdnJ%0M$zZg=c^yw<{iCJg)&ab=n6;9%2psz<8aXQD`eC6Q-F0O!wshK07zj diff --git a/ports/win32/qf_port.h b/ports/win32/qf_port.h index 42bb12cd..581020b2 100644 --- a/ports/win32/qf_port.h +++ b/ports/win32/qf_port.h @@ -2,8 +2,8 @@ /// \brief QF/C++ port to Win32 API /// \cond ///*************************************************************************** -/// Last updated for version 5.6.2 -/// Last updated on 2016-03-31 +/// Last updated for version 5.6.4 +/// Last updated on 2016-05-04 /// /// Q u a n t u m L e a P s /// --------------------------- @@ -90,8 +90,8 @@ void QF_onClockTick(void); } // namespace QP -// special adaptations for Win32 GUI applications -#ifdef WIN32_GUI +// special adaptations for QWIN GUI applications +#ifdef QWIN_GUI // replace main() with main_gui() as the entry point to a GUI app. #define main() main_gui() int_t main_gui(); // prototype of the GUI application entry point diff --git a/ports/win32/qp.vcxproj b/ports/win32/qp.vcxproj index 078e7a8e..11fcabb6 100644 --- a/ports/win32/qp.vcxproj +++ b/ports/win32/qp.vcxproj @@ -1,4 +1,4 @@ - + @@ -68,7 +68,7 @@ Disabled .;../../include;../../source;%(AdditionalIncludeDirectories) - WIN32_GUI;_DEBUG;%(PreprocessorDefinitions) + QWIN_GUI;_DEBUG;%(PreprocessorDefinitions) MultiThreaded @@ -87,7 +87,7 @@ Full .;../../include;../../source;%(AdditionalIncludeDirectories) - WIN32_GUI;NDEBUG;%(PreprocessorDefinitions) + QWIN_GUI;NDEBUG;%(PreprocessorDefinitions) MultiThreaded @@ -108,7 +108,7 @@ Disabled .;../../include;../../source;%(AdditionalIncludeDirectories) - Q_SPY;WIN32_GUI;_DEBUG;%(PreprocessorDefinitions) + Q_SPY;QWIN_GUI;_DEBUG;%(PreprocessorDefinitions) MultiThreaded @@ -173,7 +173,7 @@ true - + @@ -183,7 +183,7 @@ - + diff --git a/ports/win32-qv/win32_gui.cpp b/ports/win32/qwin_gui.cpp similarity index 96% rename from ports/win32-qv/win32_gui.cpp rename to ports/win32/qwin_gui.cpp index b2906742..dbe4b20c 100644 --- a/ports/win32-qv/win32_gui.cpp +++ b/ports/win32/qwin_gui.cpp @@ -1,15 +1,15 @@ /// \file -/// \brief Win32 GUI facilities for building realistic embedded front panels +/// \brief QWIN GUI facilities for building realistic embedded front panels /// \cond ///*************************************************************************** -/// Last updated for version 5.4.2 -/// Last updated on 2015-06-05 +/// Last updated for version 5.6.4 +/// Last updated on 2016-05-04 /// /// Q u a n t u m L e a P s /// --------------------------- /// innovating embedded systems /// -/// Copyright (C) Quantum Leaps, www.state-machine.com. +/// Copyright (C) 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 @@ -30,12 +30,12 @@ /// along with this program. If not, see . /// /// Contact information: -/// Web: www.state-machine.com -/// Email: info@state-machine.com +/// http://www.state-machine.com +/// mailto:info@state-machine.com ///*************************************************************************** /// \endcond -#include "win32_gui.h" +#include "qwin_gui.h" #include //---------------------------------------------------------------------------- diff --git a/ports/win32/win32_gui.h b/ports/win32/qwin_gui.h similarity index 89% rename from ports/win32/win32_gui.h rename to ports/win32/qwin_gui.h index 0c9eb32d..a009ac1b 100644 --- a/ports/win32/win32_gui.h +++ b/ports/win32/qwin_gui.h @@ -1,15 +1,15 @@ /// \file -/// \brief Win32 GUI facilities for building realistic embedded front panels +/// \brief QWIN GUI facilities for building realistic embedded front panels /// \cond ///*************************************************************************** -/// Last updated for version 5.4.2 -/// Last updated on 2015-06-05 +/// Last updated for version 5.6.4 +/// Last updated on 2016-05-04 /// /// Q u a n t u m L e a P s /// --------------------------- /// innovating embedded systems /// -/// Copyright (C) Quantum Leaps, www.state-machine.com. +/// Copyright (C) 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 @@ -30,16 +30,16 @@ /// along with this program. If not, see . /// /// Contact information: -/// Web: www.state-machine.com -/// Email: info@state-machine.com +/// http://www.state-machine.com +/// mailto:info@state-machine.com ///*************************************************************************** /// \endcond -#ifndef win32_gui_h -#define win32_gui_h +#ifndef qwin_gui_h +#define qwin_gui_h -#ifndef WIN32_GUI - #error The pre-processor macro WIN32_GUI must be defined +#ifndef QWIN_GUI + #error The pre-processor macro QWIN_GUI must be defined #endif #define WIN32_LEAN_AND_MEAN @@ -111,4 +111,4 @@ public: // useful helper functions ................................................... void DrawBitmap(HDC hdc, HBITMAP hBitmap, int xStart, int yStart); -#endif // win32_gui_h +#endif // qwin_gui_h diff --git a/source/qk_mutex.cpp b/source/qk_mutex.cpp index 927a2036..bd5a1247 100644 --- a/source/qk_mutex.cpp +++ b/source/qk_mutex.cpp @@ -1,12 +1,12 @@ /// @file -/// @brief QP::QMutex::init(), QP::QMutex::lock(), and QP::QMutex::unlock() +/// @brief QP::QKMutex::init(), QP::QKMutex::lock(), and QP::QKMutex::unlock() /// definitions. /// @ingroup qk /// @cond ///*************************************************************************** /// Product: QK/C++ -/// Last updated for version 5.6.2 -/// Last updated on 2016-03-31 +/// Last updated for version 5.6.4 +/// Last updated on 2016-05-04 /// /// Q u a n t u m L e a P s /// --------------------------- @@ -70,13 +70,13 @@ enum { /// @note /// A mutex must be initialized before it can be locked or unlocked. /// -/// @sa QP::QMutex::lock(), QP::QMutex::unlock() +/// @sa QP::QKMutex::lock(), QP::QKMutex::unlock() /// /// @usage /// The following example shows how to initialize, lock and unlock QK mutex: /// @include qk_mux.cpp /// -void QMutex::init(uint_fast8_t const prio) { +void QKMutex::init(uint_fast8_t const prio) { m_lockPrio = prio; m_prevPrio = static_cast(MUTEX_UNUSED); } @@ -89,16 +89,16 @@ void QMutex::init(uint_fast8_t const prio) { /// A mutex must be initialized before it can be locked or unlocked. /// /// @note -/// QP::QMutex::lock() must be always followed by the corresponding -/// QP::QMutex::unlock(). +/// QP::QKMutex::lock() must be always followed by the corresponding +/// QP::QKMutex::unlock(). /// -/// @sa QP::QMutex::init(), QP::QMutex::unlock() +/// @sa QP::QKMutex::init(), QP::QKMutex::unlock() /// /// @usage /// The following example shows how to initialize, lock and unlock QK mutex: /// @include qk_mux.cpp /// -void QMutex::lock(void) { +void QKMutex::lock(void) { QF_CRIT_STAT_ QF_CRIT_ENTRY_(); @@ -130,16 +130,16 @@ void QMutex::lock(void) { /// A mutex must be initialized before it can be locked or unlocked. /// /// @note -/// QP::QMutex::unlock() must always follow the corresponding -/// QP::QMutex::lock(). +/// QP::QKMutex::unlock() must always follow the corresponding +/// QP::QKMutex::lock(). /// -/// @sa QP::QMutex::init(), QP::QMutex::lock() +/// @sa QP::QKMutex::init(), QP::QKMutex::lock() /// /// @usage /// The following example shows how to initialize, lock and unlock QK mutex: /// @include qk_mux.cpp /// -void QMutex::unlock(void) { +void QKMutex::unlock(void) { QF_CRIT_STAT_ QF_CRIT_ENTRY_();