From 7c94e804ed3d64a47f3ffdb58b18cdad7a707152 Mon Sep 17 00:00:00 2001
From: guowenxue <guowenxue@gmail.com>
Date: Tue, 13 Nov 2018 17:26:09 +0800
Subject: [PATCH] Update FreeRTOS Keil Project, add support chinese. and Add File head description for main.c and vport.x code
---
src/STM32L_FreeRTOS/board/stm32_vport.c | 4 +---
src/STM32L_FreeRTOS/STM32L_FreeRTOS.uvoptx | 4 ++--
src/STM32L_FreeRTOS/STM32L_FreeRTOS.uvguix.Think | 22 +++++++++++-----------
src/STM32L_FreeRTOS/main.c | 6 +++---
src/STM32L_FreeRTOS/board/stm32_vport.h | 2 +-
5 files changed, 18 insertions(+), 20 deletions(-)
diff --git a/src/STM32L_FreeRTOS/STM32L_FreeRTOS.uvguix.Think b/src/STM32L_FreeRTOS/STM32L_FreeRTOS.uvguix.Think
index 11ab849..71dce8d 100644
--- a/src/STM32L_FreeRTOS/STM32L_FreeRTOS.uvguix.Think
+++ b/src/STM32L_FreeRTOS/STM32L_FreeRTOS.uvguix.Think
@@ -11,17 +11,17 @@
<View>
<WinId>38003</WinId>
<ViewName>Registers</ViewName>
- <TableColWidths>140 100</TableColWidths>
+ <TableColWidths>140 90</TableColWidths>
</View>
<View>
<WinId>346</WinId>
<ViewName>Code Coverage</ViewName>
- <TableColWidths>1010 656</TableColWidths>
+ <TableColWidths>1010 160</TableColWidths>
</View>
<View>
<WinId>204</WinId>
<ViewName>Performance Analyzer</ViewName>
- <TableColWidths>1170 175 175 146</TableColWidths>
+ <TableColWidths>1170</TableColWidths>
</View>
</SECTreeCtrl>
@@ -89,8 +89,8 @@
<flags>2</flags>
<showCmd>3</showCmd>
<MinPosition>
- <xPos>-32000</xPos>
- <yPos>-32000</yPos>
+ <xPos>-1</xPos>
+ <yPos>-1</yPos>
</MinPosition>
<MaxPosition>
<xPos>-1</xPos>
@@ -107,7 +107,7 @@
<RegID>0</RegID>
<MDITabState>
<Len>250</Len>
- <Data>01000000040000000100000001000000010000000100000000000000020000000000000001000000010000000000000028000000280000000100000001000000000000000100000036453A5C676974626C69745F616C6979756E5C73746D33324C3135315C7372635C53544D33324C5F4672656552544F535C6D61696E2E6300000000066D61696E2E6300000000BECEA100FFFFFFFF0100000010000000C5D4F200FFDC7800BECEA100F0A0A100BCA8E1009CC1B600F7B88600D9ADC200A5C2D700B3A6BE00EAD6A300F6FA7D00B5E99D005FC3CF00C1838300CACAD500010000000000000002000000F4000000660000008007000069030000</Data>
+ <Data>01000000040000000100000001000000010000000100000000000000020000000000000001000000010000000000000028000000280000000100000001000000000000000100000036453A5C676974626C69745F616C6979756E5C73746D33324C3135315C7372635C53544D33324C5F4672656552544F535C6D61696E2E6300000000066D61696E2E6300000000C5D4F200FFFFFFFF0100000010000000C5D4F200FFDC7800BECEA100F0A0A100BCA8E1009CC1B600F7B88600D9ADC200A5C2D700B3A6BE00EAD6A300F6FA7D00B5E99D005FC3CF00C1838300CACAD500010000000000000002000000F4000000660000008007000069030000</Data>
</MDITabState>
</MDIClientArea>
<ViewEx>
@@ -1802,7 +1802,7 @@
<Name>File</Name>
<Buttons>
<Len>2354</Len>
- <Data>00200000010000002800FFFF01001100434D4643546F6F6C426172427574746F6E00E100000000000000000000000000000000000000000000000100000001000000018001E100000000000001000000000000000000000000000000000100000001000000018003E1000000000000020000000000000000000000000000000001000000010000000180CD7F0000000000000300000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000018023E100000000040004000000000000000000000000000000000100000001000000018022E100000000040005000000000000000000000000000000000100000001000000018025E10000000000000600000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001802BE10000000000000700000000000000000000000000000000010000000100000001802CE10000000004000800000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001807A8A0000000000000900000000000000000000000000000000010000000100000001807B8A0000000004000A00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180D3B00000000000000B000000000000000000000000000000000100000001000000018015B10000000004000C0000000000000000000000000000000001000000010000000180F4B00000000004000D000000000000000000000000000000000100000001000000018036B10000000004000E00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180FF88000000000400460000000000000000000000000000000001000000010000000180FE880000000004004500000000000000000000000000000000010000000100000001800B810000000004001300000000000000000000000000000000010000000100000001800C810000000004001400000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180F0880000020000000F000000000000000000000000000000000100000001000000FFFF0100120043555646696E64436F6D626F427574746F6EE8030000000000000000000000000000000000000000000000010000000100000096000000020020500000000014764170706C69636174696F6E5469636B486F6F6B9600000000000000060014764170706C69636174696F6E5469636B486F6F6B1D764170706C69636174696F6E537461636B4F766572666C6F77486F6F6B13636F6E6669675553455F5449434B5F484F4F4B013115636F6E666967544F54414C5F484541505F53495A450130000000000000000000000000000000000000000000000000018024E10000000000001100000000000000000000000000000000010000000100000001800A810000000000001200000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000FFFF01001500434D4643546F6F6C4261724D656E75427574746F6E2280000002000000150000002153746172742F53746F70202644656275672053657373696F6E094374726C2B46350000000000000000000000000100000001000000000000000000000001000000020021802280000000000000150000002153746172742F53746F70202644656275672053657373696F6E094374726C2B4635000000000000000000000000010000000100000000000000000000000100000000002180E0010000000000007500000021456E65726779204D6561737572656D656E742026776974686F75742044656275670000000000000000000000000100000001000000000000000000000001000000000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180C488000000000000160000000000000000000000000000000001000000010000000180C988000000000400180000000000000000000000000000000001000000010000000180C788000000000000190000000000000000000000000000000001000000010000000180C8880000000000001700000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000021804C010000020001001A0000000F2650726F6A6563742057696E646F77000000000000000000000000010000000100000000000000000000000100000008002180DD880000000000001A0000000750726F6A656374000000000000000000000000010000000100000000000000000000000100000000002180DC8B0000000000003A00000005426F6F6B73000000000000000000000000010000000100000000000000000000000100000000002180E18B0000000000003B0000000946756E6374696F6E73000000000000000000000000010000000100000000000000000000000100000000002180E28B000000000000400000000954656D706C6174657300000000000000000000000001000000010000000000000000000000010000000000218018890000000000003D0000000E536F757263652042726F777365720000000000000000000000000100000001000000000000000000000001000000000021800000000000000400FFFFFFFF00000000000000000001000000000000000100000000000000000000000100000000002180D988000000000000390000000C4275696C64204F7574707574000000000000000000000000010000000100000000000000000000000100000000002180E38B000000000000410000000B46696E64204F75747075740000000000000000000000000100000001000000000000000000000001000000000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180FB7F0000000000001B000000000000000000000000000000000100000001000000000000000446696C65B9030000</Data>
+ <Data>00200000010000002800FFFF01001100434D4643546F6F6C426172427574746F6E00E100000000000000000000000000000000000000000000000100000001000000018001E100000000000001000000000000000000000000000000000100000001000000018003E1000000000000020000000000000000000000000000000001000000010000000180CD7F0000000000000300000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000018023E100000000040004000000000000000000000000000000000100000001000000018022E100000000040005000000000000000000000000000000000100000001000000018025E10000000000000600000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001802BE10000000004000700000000000000000000000000000000010000000100000001802CE10000000004000800000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001807A8A0000000004000900000000000000000000000000000000010000000100000001807B8A0000000004000A00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180D3B00000000000000B000000000000000000000000000000000100000001000000018015B10000000004000C0000000000000000000000000000000001000000010000000180F4B00000000004000D000000000000000000000000000000000100000001000000018036B10000000004000E00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180FF88000000000400460000000000000000000000000000000001000000010000000180FE880000000004004500000000000000000000000000000000010000000100000001800B810000000004001300000000000000000000000000000000010000000100000001800C810000000004001400000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180F0880000020000000F000000000000000000000000000000000100000001000000FFFF0100120043555646696E64436F6D626F427574746F6EE8030000000000000000000000000000000000000000000000010000000100000096000000020020500000000014764170706C69636174696F6E5469636B486F6F6B9600000000000000060014764170706C69636174696F6E5469636B486F6F6B1D764170706C69636174696F6E537461636B4F766572666C6F77486F6F6B13636F6E6669675553455F5449434B5F484F4F4B013115636F6E666967544F54414C5F484541505F53495A450130000000000000000000000000000000000000000000000000018024E10000000000001100000000000000000000000000000000010000000100000001800A810000000000001200000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000FFFF01001500434D4643546F6F6C4261724D656E75427574746F6E2280000002000000150000002153746172742F53746F70202644656275672053657373696F6E094374726C2B46350000000000000000000000000100000001000000000000000000000001000000020021802280000000000000150000002153746172742F53746F70202644656275672053657373696F6E094374726C2B4635000000000000000000000000010000000100000000000000000000000100000000002180E0010000000000007500000021456E65726779204D6561737572656D656E742026776974686F75742044656275670000000000000000000000000100000001000000000000000000000001000000000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180C488000000000000160000000000000000000000000000000001000000010000000180C988000000000400180000000000000000000000000000000001000000010000000180C788000000000000190000000000000000000000000000000001000000010000000180C8880000000000001700000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000021804C010000020001001A0000000F2650726F6A6563742057696E646F77000000000000000000000000010000000100000000000000000000000100000008002180DD880000000000001A0000000750726F6A656374000000000000000000000000010000000100000000000000000000000100000000002180DC8B0000000000003A00000005426F6F6B73000000000000000000000000010000000100000000000000000000000100000000002180E18B0000000000003B0000000946756E6374696F6E73000000000000000000000000010000000100000000000000000000000100000000002180E28B000000000000400000000954656D706C6174657300000000000000000000000001000000010000000000000000000000010000000000218018890000000000003D0000000E536F757263652042726F777365720000000000000000000000000100000001000000000000000000000001000000000021800000000000000400FFFFFFFF00000000000000000001000000000000000100000000000000000000000100000000002180D988000000000000390000000C4275696C64204F7574707574000000000000000000000000010000000100000000000000000000000100000000002180E38B000000000000410000000B46696E64204F75747075740000000000000000000000000100000001000000000000000000000001000000000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180FB7F0000000000001B000000000000000000000000000000000100000001000000000000000446696C65B9030000</Data>
</Buttons>
<OriginalItems>
<Len>1423</Len>
@@ -1818,7 +1818,7 @@
<Name>Build</Name>
<Buttons>
<Len>990</Len>
- <Data>00200000010000001000FFFF01001100434D4643546F6F6C426172427574746F6ECF7F0000000000001C0000000000000000000000000000000001000000010000000180D07F0000000000001D000000000000000000000000000000000100000001000000018030800000000000001E000000000000000000000000000000000100000001000000FFFF01001500434D4643546F6F6C4261724D656E75427574746F6EC7040000000000006A0000000C4261746368204275696C2664000000000000000000000000010000000100000000000000000000000100000004000580C7040000000000006A0000000C4261746368204275696C266400000000000000000000000001000000010000000000000000000000010000000000058046070000000000006B0000000D42617463682052656275696C640000000000000000000000000100000001000000000000000000000001000000000005804707000000000000FFFFFFFF0B426174636820436C65616E0000000000000000010000000000000001000000000000000000000001000000000005809E8A0000000000001F0000000F4261746326682053657475702E2E2E000000000000000000000000010000000100000000000000000000000100000000000180D17F0000000004002000000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001804C8A0000000000002100000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000FFFF01001900434D4643546F6F6C426172436F6D626F426F78427574746F6EBA00000000000000000000000000000000000000000000000001000000010000009600000003002050000000000F53544D33324C5F4672656552544F53960000000000000001000F53544D33324C5F4672656552544F53000000000180EB880000000000002200000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180C07F000000000000230000000000000000000000000000000001000000010000000180B08A000000000400240000000000000000000000000000000001000000010000000180A8010000000000004E00000000000000000000000000000000010000000100000001807202000000000000530000000000000000000000000000000001000000010000000180BE010000000000005000000000000000000000000000000000010000000100000000000000054275696C64DC010000</Data>
+ <Data>00200000010000001000FFFF01001100434D4643546F6F6C426172427574746F6ECF7F0000000000001C0000000000000000000000000000000001000000010000000180D07F0000000000001D000000000000000000000000000000000100000001000000018030800000000000001E000000000000000000000000000000000100000001000000FFFF01001500434D4643546F6F6C4261724D656E75427574746F6EC7040000000000006A0000000C4261746368204275696C2664000000000000000000000000010000000100000000000000000000000100000004000580C7040000000000006A0000000C4261746368204275696C266400000000000000000000000001000000010000000000000000000000010000000000058046070000000000006B0000000D42617463682052656275696C640000000000000000000000000100000001000000000000000000000001000000000005804707000000000000FFFFFFFF0B426174636820436C65616E0100000000000000000000000100000001000000000000000000000001000000000005809E8A0000000000001F0000000F4261746326682053657475702E2E2E000000000000000000000000010000000100000000000000000000000100000000000180D17F0000000004002000000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001804C8A0000000000002100000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000FFFF01001900434D4643546F6F6C426172436F6D626F426F78427574746F6EBA00000000000000000000000000000000000000000000000001000000010000009600000003002050000000000F53544D33324C5F4672656552544F53960000000000000001000F53544D33324C5F4672656552544F53000000000180EB880000000000002200000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180C07F000000000000230000000000000000000000000000000001000000010000000180B08A000000000400240000000000000000000000000000000001000000010000000180A8010000000000004E00000000000000000000000000000000010000000100000001807202000000000000530000000000000000000000000000000001000000010000000180BE010000000000005000000000000000000000000000000000010000000100000000000000054275696C64DC010000</Data>
</Buttons>
<OriginalItems>
<Len>583</Len>
@@ -3602,9 +3602,9 @@
<ActiveTab>0</ActiveTab>
<Doc>
<Name>.\main.c</Name>
- <ColumnNumber>2</ColumnNumber>
- <TopLine>12</TopLine>
- <CurrentLine>24</CurrentLine>
+ <ColumnNumber>0</ColumnNumber>
+ <TopLine>14</TopLine>
+ <CurrentLine>32</CurrentLine>
<Folding>1</Folding>
<ContractedFolders></ContractedFolders>
<PaneID>0</PaneID>
diff --git a/src/STM32L_FreeRTOS/STM32L_FreeRTOS.uvoptx b/src/STM32L_FreeRTOS/STM32L_FreeRTOS.uvoptx
index 51b89b1..218875f 100644
--- a/src/STM32L_FreeRTOS/STM32L_FreeRTOS.uvoptx
+++ b/src/STM32L_FreeRTOS/STM32L_FreeRTOS.uvoptx
@@ -560,7 +560,7 @@
<Group>
<GroupName>Board</GroupName>
- <tvExp>0</tvExp>
+ <tvExp>1</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
<cbSel>0</cbSel>
<RteFlg>0</RteFlg>
@@ -696,7 +696,7 @@
<Group>
<GroupName>User</GroupName>
- <tvExp>1</tvExp>
+ <tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
<cbSel>0</cbSel>
<RteFlg>0</RteFlg>
diff --git a/src/STM32L_FreeRTOS/board/stm32_vport.c b/src/STM32L_FreeRTOS/board/stm32_vport.c
index c9dd428..3771570 100644
--- a/src/STM32L_FreeRTOS/board/stm32_vport.c
+++ b/src/STM32L_FreeRTOS/board/stm32_vport.c
@@ -1,7 +1,7 @@
/****************************************************************************
* Copyright: (C)2018 �人���������ǿ�ʵ���� www.iot-yun.com
* Author: GuoWenxue<guowenxue@gmail.com> QQ: 281143292
-* Description: STM32L151C8T6 CubeMX ������ FreeRTOS API
+* Description: STM32L151C8T6 CubeMX ������ FreeRTOS ��ֲ��������
*
* ChangeLog:
* �汾�� ���� ���� ˵��
@@ -10,8 +10,6 @@
#include "stm32l1xx.h"
#include "stm32_vport.h"
-
-
unsigned long ulTIM6_OverflowCount = 0UL;
diff --git a/src/STM32L_FreeRTOS/board/stm32_vport.h b/src/STM32L_FreeRTOS/board/stm32_vport.h
index 6f41742..62c62e5 100644
--- a/src/STM32L_FreeRTOS/board/stm32_vport.h
+++ b/src/STM32L_FreeRTOS/board/stm32_vport.h
@@ -1,7 +1,7 @@
/****************************************************************************
* Copyright: (C)2018 �人���������ǿ�ʵ���� www.iot-yun.com
* Author: GuoWenxue<guowenxue@gmail.com> QQ: 281143292
-* Description: STM32L151C8T6 CubeMX ������ systick ��ʱ������jiffiesʵ�ֺ���
+* Description: STM32L151C8T6 CubeMX ������ FreeRTOS ��ֲ��������
*
* ChangeLog:
* �汾�� ���� ���� ˵��
diff --git a/src/STM32L_FreeRTOS/main.c b/src/STM32L_FreeRTOS/main.c
index 3150700..ed7cc6c 100644
--- a/src/STM32L_FreeRTOS/main.c
+++ b/src/STM32L_FreeRTOS/main.c
@@ -1,7 +1,7 @@
/****************************************************************************
* Copyright: (C)2018 �人���������ǿ�ʵ���� www.iot-yun.com
* Author: GuoWenxue<guowenxue@gmail.com> QQ: 281143292
-* Description: STM32L151C8T6 CubeMX ������ LED�����ڡ�Systick �Ȳ��Գ���
+* Description: STM32L151C8T6 CubeMX ������ FreeRTOS v10.1.1 ʾ������
�������Ա������ַ�� https://item.taobao.com/item.htm?spm=a1z09.2.0.0.6ff42e8dPmfuKR&id=551780894246&_u=41ifnbo379e
*
* ChangeLog:
@@ -30,11 +30,11 @@
printf("Create Serial puts task now.\n");
xTaskCreate( vSerialPutsTask, "TTY", ledSTACK_SIZE, ( void * ) NULL, mainFLASH_TASK_PRIORITY, ( TaskHandle_t * ) NULL );
- /* Start the scheduler. */
printf("FreeRTOS Task Scheduler Start...\n");
vTaskStartScheduler();
- printf("FreeRTOS Task Scheduler End\n");
+ /* !!! Program will stuck in vTaskStartScheduler() and never comes here !!!*/
+ printf("FreeRTOS Task Scheduler End\n");
while(1);
}
--
Gitblit v1.9.1