Release version 3.0.1

Merge branch 'development' into 'master'
malikalhack · Aug 9, 2022 · eeab0a0 · eeab0a0
2 parents 74f5bec + 08459ac
commit eeab0a0
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 57 deletions.
diff --git a/User/src/main.c b/User/src/main.c
@@ -20,6 +20,12 @@ typedef enum {
 
 #endif
 
+typedef enum {
+    FORBIDDEN_PRIORITY = 0,
+    BLINK_PRIORITY,
+    ACTOR_PRIORITY_MAX
+} actor_priority_t;
+
 int main(void) {
     static QEvt const *blink_queueSto[10];
     extern QActive * const AO_Blink;
@@ -28,7 +34,7 @@ int main(void) {
 
     QACTIVE_START(
         AO_Blink,
-        1U,                     /* priority */
+        BLINK_PRIORITY,         /* priority */
         blink_queueSto,         /* queue storage */
         Q_DIM(blink_queueSto),  /* queue storage size */
         (void *)0, 0U,          /* no stack */
@@ -70,33 +76,33 @@ void Q_onAssert(char const * const module, int loc) {
         switch(cmdId) {    
             case dummy: break;
             case print_param_1:
-                QS_BEGIN_ID(BLINK, 0U)
+                QS_BEGIN_ID(BLINK, BLINK_PRIORITY)
                     QS_STR("Print parameter #1:");
                     QS_U32(8, param1);
                 QS_END()
                 break;
             case print_param_2:
-                QS_BEGIN_ID(BLINK, 0U)
+                QS_BEGIN_ID(BLINK, BLINK_PRIORITY)
                     QS_STR("Print parameter #2:");
                     QS_U32(8, param2);
                 QS_END()
                 break;
             case print_param_3:
-                QS_BEGIN_ID(BLINK, 0U)
+                QS_BEGIN_ID(BLINK, BLINK_PRIORITY)
                     QS_STR("Print parameter #3:");
                     QS_U32(8, param3);
                 QS_END()
                 break;
             case print_all_param:
-                QS_BEGIN_ID(BLINK, 0U)
+                QS_BEGIN_ID(BLINK, BLINK_PRIORITY)
                     QS_STR("Print all parameters:\n");
                     QS_U32(8, param1);
                     QS_U32(8, param2);
                     QS_U32(8, param3);
                 QS_END()
                 break;
             case throw_error:
-                QS_BEGIN_ID(BLINK, 0U)
+                QS_BEGIN_ID(BLINK, BLINK_PRIORITY)
                     QS_STR("Throw ERROR!\n");
                 QS_END()
             default: Q_ERROR();

diff --git a/blink_stm32f103c8.uvoptx b/blink_stm32f103c8.uvoptx
@@ -363,64 +363,15 @@
         <SetRegEntry>
           <Number>0</Number>
           <Key>ST-LINKIII-KEIL_SWO</Key>
-          <Name>-U52FF6C064987494853251887 -O206 -SF10000 -C0 -A0 -I0 -HNlocalhost -HP7184 -P1 -N00("ARM CoreSight SW-DP (ARM Core") -D00(1BA01477) -L00(0) -TO131090 -TC10000000 -TT10000000 -TP21 -TDS8000 -TDT0 -TDC1F -TIEFFFFFFFF -TIP8 -FO7 -FD20000000 -FC1000 -FN1 -FF0STM32F10x_128.FLM -FS08000000 -FL020000 -FP0($$Device:STM32F103C8$Flash\STM32F10x_128.FLM)</Name>
+          <Name>-U52FF6C064987494853251887 -O206 -SF10000 -C0 -A0 -I0 -HNlocalhost -HP7184 -P1 -N00("ARM CoreSight SW-DP (ARM Core") -D00(1BA01477) -L00(0) -TO131090 -TC10000000 -TT10000000 -TP21 -TDS8000 -TDT0 -TDC1F -TIEFFFFFFFF -TIP8 -FO23 -FD20000000 -FC1000 -FN1 -FF0STM32F10x_128.FLM -FS08000000 -FL020000 -FP0($$Device:STM32F103C8$Flash\STM32F10x_128.FLM)</Name>
         </SetRegEntry>
         <SetRegEntry>
           <Number>0</Number>
           <Key>UL2CM3</Key>
           <Name>UL2CM3(-S0 -C0 -P0 -FD20000000 -FC1000 -FN1 -FF0STM32F10x_128 -FS08000000 -FL020000 -FP0($$Device:STM32F103C8$Flash\STM32F10x_128.FLM))</Name>
         </SetRegEntry>
       </TargetDriverDllRegistry>
-      <Breakpoint>
-        <Bp>
-          <Number>0</Number>
-          <Type>0</Type>
-          <LineNumber>105</LineNumber>
-          <EnabledFlag>1</EnabledFlag>
-          <Address>0</Address>
-          <ByteObject>0</ByteObject>
-          <HtxType>0</HtxType>
-          <ManyObjects>0</ManyObjects>
-          <SizeOfObject>0</SizeOfObject>
-          <BreakByAccess>0</BreakByAccess>
-          <BreakIfRCount>0</BreakIfRCount>
-          <Filename>.\User\src\main.c</Filename>
-          <ExecCommand></ExecCommand>
-          <Expression></Expression>
-        </Bp>
-        <Bp>
-          <Number>1</Number>
-          <Type>0</Type>
-          <LineNumber>65</LineNumber>
-          <EnabledFlag>1</EnabledFlag>
-          <Address>134225238</Address>
-          <ByteObject>0</ByteObject>
-          <HtxType>0</HtxType>
-          <ManyObjects>0</ManyObjects>
-          <SizeOfObject>0</SizeOfObject>
-          <BreakByAccess>0</BreakByAccess>
-          <BreakIfRCount>1</BreakIfRCount>
-          <Filename>.\User\src\main.c</Filename>
-          <ExecCommand></ExecCommand>
-          <Expression>\\blink_stm32f103c8\User/src/main.c\65</Expression>
-        </Bp>
-        <Bp>
-          <Number>2</Number>
-          <Type>0</Type>
-          <LineNumber>13</LineNumber>
-          <EnabledFlag>1</EnabledFlag>
-          <Address>134231008</Address>
-          <ByteObject>0</ByteObject>
-          <HtxType>0</HtxType>
-          <ManyObjects>0</ManyObjects>
-          <SizeOfObject>0</SizeOfObject>
-          <BreakByAccess>0</BreakByAccess>
-          <BreakIfRCount>1</BreakIfRCount>
-          <Filename>.\User\src\main.c</Filename>
-          <ExecCommand></ExecCommand>
-          <Expression>\\blink_stm32f103c8\User/src/main.c\13</Expression>
-        </Bp>
-      </Breakpoint>
+      <Breakpoint/>
       <WatchWindow1>
         <Ww>
           <count>0</count>

diff --git a/blink_stm32f103c8.uvprojx b/blink_stm32f103c8.uvprojx
@@ -187,6 +187,7 @@
             <RvdsVP>0</RvdsVP>
             <RvdsMve>0</RvdsMve>
             <RvdsCdeCp>0</RvdsCdeCp>
+            <nBranchProt>0</nBranchProt>
             <hadIRAM2>0</hadIRAM2>
             <hadIROM2>0</hadIROM2>
             <StupSel>8</StupSel>
@@ -852,6 +853,7 @@
             <RvdsVP>0</RvdsVP>
             <RvdsMve>0</RvdsMve>
             <RvdsCdeCp>0</RvdsCdeCp>
+            <nBranchProt>0</nBranchProt>
             <hadIRAM2>0</hadIRAM2>
             <hadIROM2>0</hadIROM2>
             <StupSel>8</StupSel>