From a65db05228d1491715b2e81444442aaafae40610 Mon Sep 17 00:00:00 2001
From: strawmanbobi <strawmanbobi@163.com>
Date: Wed, 24 Jan 2018 11:00:46 +0800
Subject: [PATCH] changed UART1 to UART3

---
 stm8-driver/STM8_Driver.dep           | 62 +++++++++++++--------------
 stm8-driver/settings/STM8_Driver.wsdt | 12 +++---
 stm8-driver/src/main.c                |  2 +
 3 files changed, 37 insertions(+), 39 deletions(-)

diff --git a/stm8-driver/STM8_Driver.dep b/stm8-driver/STM8_Driver.dep
index c047357..4984317 100644
--- a/stm8-driver/STM8_Driver.dep
+++ b/stm8-driver/STM8_Driver.dep
@@ -5,41 +5,41 @@
     <configuration>
         <name>Debug</name>
         <outputs>
-            <file>$TOOLKIT_DIR$\inc\c\yvals.h</file>
-            <file>$PROJ_DIR$\Debug\Obj\main.o</file>
-            <file>$TOOLKIT_DIR$\inc\c\ysizet.h</file>
-            <file>$TOOLKIT_DIR$\lib\dlstm8smn.h</file>
-            <file>$TOOLKIT_DIR$\inc\c\xencoding_limits.h</file>
-            <file>$PROJ_DIR$\Debug\Obj\main.pbi</file>
-            <file>$TOOLKIT_DIR$\inc\c\ycheck.h</file>
-            <file>$TOOLKIT_DIR$\inc\c\DLib_Defaults.h</file>
-            <file>$TOOLKIT_DIR$\inc\c\DLib_Threads.h</file>
-            <file>$PROJ_DIR$\Debug\Exe\STM8_Driver.hex</file>
-            <file>$PROJ_DIR$\Debug\Obj\STM8_Driver.pbd</file>
+            <file>$PROJ_DIR$\Debug\Exe\templproj.out</file>
             <file>$TOOLKIT_DIR$\inc\c\DLib_Product.h</file>
             <file>$TOOLKIT_DIR$\inc\c\stdlib.h</file>
-            <file>$PROJ_DIR$\Debug\Exe\templproj.out</file>
-            <file>$TOOLKIT_DIR$\inc\c\intrinsics.h</file>
+            <file>$PROJ_DIR$\Debug\Obj\main.o</file>
+            <file>$TOOLKIT_DIR$\inc\c\xencoding_limits.h</file>
+            <file>$TOOLKIT_DIR$\inc\c\DLib_Threads.h</file>
+            <file>$PROJ_DIR$\Debug\Exe\STM8_Driver.hex</file>
+            <file>$TOOLKIT_DIR$\lib\dlstm8smn.h</file>
+            <file>$PROJ_DIR$\Debug\Obj\main.pbi</file>
+            <file>$TOOLKIT_DIR$\inc\c\DLib_Defaults.h</file>
+            <file>$PROJ_DIR$\Debug\Obj\STM8_Driver.pbd</file>
+            <file>$TOOLKIT_DIR$\inc\c\ycheck.h</file>
+            <file>$TOOLKIT_DIR$\inc\c\ysizet.h</file>
             <file>$PROJ_DIR$\src\main.c</file>
+            <file>$TOOLKIT_DIR$\inc\c\yvals.h</file>
+            <file>$TOOLKIT_DIR$\inc\iostm8s207k8.h</file>
+            <file>$TOOLKIT_DIR$\inc\c\intrinsics.h</file>
             <file>$PROJ_DIR$\Debug\Obj\main.__cstat.et</file>
             <file>$TOOLKIT_DIR$\inc\io_macros.h</file>
-            <file>$TOOLKIT_DIR$\inc\iostm8s207k8.h</file>
         </outputs>
-        <file>
-            <name>[ROOT_NODE]</name>
-            <outputs>
-                <tool>
-                    <name>ILINK</name>
-                    <file> 13</file>
-                </tool>
-            </outputs>
-        </file>
         <file>
             <name>$PROJ_DIR$\Debug\Exe\templproj.out</name>
             <outputs>
                 <tool>
                     <name>OBJCOPY</name>
-                    <file> 9</file>
+                    <file> 6</file>
+                </tool>
+            </outputs>
+        </file>
+        <file>
+            <name>[ROOT_NODE]</name>
+            <outputs>
+                <tool>
+                    <name>ILINK</name>
+                    <file> 0</file>
                 </tool>
             </outputs>
         </file>
@@ -47,22 +47,18 @@
             <name>$PROJ_DIR$\src\main.c</name>
             <outputs>
                 <tool>
-                    <name>BICOMP</name>
-                    <file> 5</file>
+                    <name>__cstat</name>
+                    <file> 17</file>
                 </tool>
                 <tool>
-                    <name>__cstat</name>
-                    <file> 16</file>
+                    <name>BICOMP</name>
+                    <file> 8</file>
                 </tool>
             </outputs>
             <inputs>
-                <tool>
-                    <name>BICOMP</name>
-                    <file> 17 0 14 4 12 6 8 18 2 7 3 11</file>
-                </tool>
                 <tool>
                     <name>ICCSTM8</name>
-                    <file> 18 17 14 12 6 0 7 3 11 4 8 2</file>
+                    <file> 15 18 16 2 11 14 9 7 1 4 5 12</file>
                 </tool>
             </inputs>
         </file>
diff --git a/stm8-driver/settings/STM8_Driver.wsdt b/stm8-driver/settings/STM8_Driver.wsdt
index 640e13f..c005dc8 100644
--- a/stm8-driver/settings/STM8_Driver.wsdt
+++ b/stm8-driver/settings/STM8_Driver.wsdt
@@ -171,7 +171,7 @@
                     <item>33054</item>
                     <item>0</item>
                     <item>33035</item>
-                    <item>33036</item>
+                    <item>33037</item>
                     <item>34399</item>
                     <item>0</item>
                     <item>33038</item>
@@ -210,11 +210,11 @@
                 <RecentlyUsedMenus>1</RecentlyUsedMenus>
                 <MenuShadows>1</MenuShadows>
                 <ShowAllMenusAfterDelay>1</ShowAllMenusAfterDelay>
-                <CommandsUsage>9C0000001D001386000001000000108600000100000029E1000006000000239200000100000020810000010000000F810000050000000C810000030000000D80000001000000EA8000000100000001DE0000010000001781000008000000568600000600000014810000010000002BE100000100000000810000030000005E8600000B0000000E810000780000001F8100000100000003E1000002000000E98000000200000003DE00000200000041E100001000000011860000020000004681000001000000608600000300000005E10000010000005D860000030000000A84000001000000E880000001000000</CommandsUsage>
+                <CommandsUsage>9C0000001D0013860000010000001086000001000000239200000100000029E10000060000000F810000050000002081000001000000EA800000010000000D800000010000000C8100000300000001DE000001000000568600000600000017810000080000002BE10000010000001481000001000000008100000300000003E10000020000001F810000010000000E810000780000005E8600000B00000003DE000002000000E98000000200000041E10000100000001186000002000000468100000100000005E100000100000060860000030000000A840000010000005D86000003000000E880000001000000</CommandsUsage>
             </MFCToolBarParameters>
             <CommandManager>
-                <CommandsWithoutImages>2D00FFFFFFFF0D8400000F8400000884000054840000328100001C810000098400005384000020F1000010F0000000F0000020F0000030F0000060F000001C8F00001D8F00001F8F0000208F0000218F00002AE10000118F00003C8400003D840000408400004C8400003E8400004B8400004D8400003F8400003A8400003B8400005A8400005B840000818400007D840000828400008384000084840000488100001E8F0000E88000000E8400003084000051840000</CommandsWithoutImages>
-                <MenuUserImages>13000484000044000000158100001900000007E100002F00000004E100002D0000000D8000000B00000001E100002A0000000684000046000000178100001B0000001481000018000000008100000D00000003E100002C0000000B8100001300000000E100002900000022E100003000000041E1000039000000168100001A00000005E100002E0000000D8100001500000002E100002B000000</MenuUserImages>
+                <CommandsWithoutImages>2B00FFFFFFFF0D8400000F8400000884000054840000328100001C810000098400005384000020F1000010F0000000F0000020F0000030F0000060F000001C8F00001D8F00001F8F0000208F0000218F00002AE10000118F00003C8400003D840000408400004C8400003E8400004B8400004D8400003F8400003A8400003B8400005A8400005B840000818400007D840000828400008384000084840000488100001E8F0000E880000051840000</CommandsWithoutImages>
+                <MenuUserImages>15000484000044000000158100001900000007E100002F00000004E100002D00000001E100002A0000000D8000000B0000000684000046000000178100001B0000001481000018000000308400004A0000000E84000048000000008100000D00000003E100002C00000022E100003000000000E10000290000000B8100001700000041E1000039000000168100001A00000005E100002E00000002E100002B0000000D81000019000000</MenuUserImages>
             </CommandManager>
             <Pane-59393>
                 <ID>0</ID>
@@ -439,7 +439,7 @@
             </DockingManager-256>
             <MFCToolBar-34048>
                 <Name>Main</Name>
-                <Buttons>00200000010000002000FFFF01001100434D4643546F6F6C426172427574746F6E00E100000000000029000000FFFEFF000000000000000000000000000100000001000000018001E10000000000002A000000FFFEFF000000000000000000000000000100000001000000018003E10000000000002C000000FFFEFF000000000000000000000000000100000001000000018000810000000000000D000000FFFEFF00000000000000000000000000010000000100000001800000000001000000FFFFFFFFFFFEFF000000000000000000000000000100000001000000018007E10000000000002F000000FFFEFF00000000000000000000000000010000000100000001800000000001000000FFFFFFFFFFFEFF000000000000000000000000000100000001000000018023E100000000040031000000FFFEFF000000000000000000000000000100000001000000018022E100000000040030000000FFFEFF000000000000000000000000000100000001000000018025E100000000000033000000FFFEFF00000000000000000000000000010000000100000001800000000001000000FFFFFFFFFFFEFF00000000000000000000000000010000000100000001802BE100000000040036000000FFFEFF00000000000000000000000000010000000100000001802CE100000000040037000000FFFEFF00000000000000000000000000010000000100000001800000000001000000FFFFFFFFFFFEFF000000000000000000000000000100000001000000FFFF01001900434D4643546F6F6C426172436F6D626F426F78427574746F6E4281000000000000FFFFFFFFFFFEFF0001000000000000000100000000000000010000007800000002002050FFFFFFFFFFFEFF0096000000000000000200FFFEFF14490052006500780074005F00700072006F00630065007300730055006100720074004D0073006700FFFEFF0C50006100720073006500530075006D006D0061007200790000000000000000000180218100000000040020000000FFFEFF000000000000000000000000000100000001000000018024E100000000000032000000FFFEFF000000000000000000000000000100000001000000018028E100000000040034000000FFFEFF000000000000000000000000000100000001000000018029E100000000000035000000FFFEFF000000000000000000000000000100000001000000018002810000000000000F000000FFFEFF0000000000000000000000000001000000010000000180298100000000000024000000FFFEFF0000000000000000000000000001000000010000000180278100000000000022000000FFFEFF0000000000000000000000000001000000010000000180288100000000000023000000FFFEFF00000000000000000000000000010000000100000001801D810000000000001C000000FFFEFF00000000000000000000000000010000000100000001801E810000000004001D000000FFFEFF00000000000000000000000000010000000100000001800000000001000000FFFFFFFFFFFEFF00000000000000000000000000010000000100000001800B8100000000000013000000FFFEFF00000000000000000000000000010000000100000001800C8100000000000014000000FFFEFF00000000000000000000000000010000000100000001805F8600000000000028000000FFFEFF00000000000000000000000000010000000100000001800000000001000000FFFFFFFFFFFEFF00000000000000000000000000010000000100000001800E8100000000000016000000FFFEFF00000000000000000000000000010000000100000001800F8100000000000017000000FFFEFF00000000000000000000000000010000000100000000000000FFFEFF044D00610069006E00E8020000</Buttons>
+                <Buttons>00200000010000002000FFFF01001100434D4643546F6F6C426172427574746F6E00E10000000000002D000000FFFEFF000000000000000000000000000100000001000000018001E10000000000002E000000FFFEFF000000000000000000000000000100000001000000018003E100000000040030000000FFFEFF0000000000000000000000000001000000010000000180008100000000000011000000FFFEFF00000000000000000000000000010000000100000001800000000001000000FFFFFFFFFFFEFF000000000000000000000000000100000001000000018007E100000000040033000000FFFEFF00000000000000000000000000010000000100000001800000000001000000FFFFFFFFFFFEFF000000000000000000000000000100000001000000018023E100000000040035000000FFFEFF000000000000000000000000000100000001000000018022E100000000000034000000FFFEFF000000000000000000000000000100000001000000018025E100000000040037000000FFFEFF00000000000000000000000000010000000100000001800000000001000000FFFFFFFFFFFEFF00000000000000000000000000010000000100000001802BE10000000004003A000000FFFEFF00000000000000000000000000010000000100000001802CE10000000004003B000000FFFEFF00000000000000000000000000010000000100000001800000000001000000FFFFFFFFFFFEFF000000000000000000000000000100000001000000FFFF01001900434D4643546F6F6C426172436F6D626F426F78427574746F6E4281000000000400FFFFFFFFFFFEFF0000000000000000000100000000000000010000007800000002002050FFFFFFFFFFFEFF0096000000000000000200FFFEFF14490052006500780074005F00700072006F00630065007300730055006100720074004D0073006700FFFEFF0C50006100720073006500530075006D006D0061007200790000000000000000000180218100000000040024000000FFFEFF000000000000000000000000000100000001000000018024E100000000040036000000FFFEFF000000000000000000000000000100000001000000018028E100000000040038000000FFFEFF000000000000000000000000000100000001000000018029E100000000040039000000FFFEFF0000000000000000000000000001000000010000000180028100000000040013000000FFFEFF0000000000000000000000000001000000010000000180298100000000040028000000FFFEFF0000000000000000000000000001000000010000000180278100000000040026000000FFFEFF0000000000000000000000000001000000010000000180288100000000040027000000FFFEFF00000000000000000000000000010000000100000001801D8100000000040020000000FFFEFF00000000000000000000000000010000000100000001801E8100000000040021000000FFFEFF00000000000000000000000000010000000100000001800000000001000000FFFFFFFFFFFEFF00000000000000000000000000010000000100000001800B8100000000040017000000FFFEFF00000000000000000000000000010000000100000001800D8100000000000019000000FFFEFF00000000000000000000000000010000000100000001805F860000000000002C000000FFFEFF00000000000000000000000000010000000100000001800000000001000000FFFFFFFFFFFEFF00000000000000000000000000010000000100000001800E810000000000001A000000FFFEFF00000000000000000000000000010000000100000001800F810000000000001B000000FFFEFF00000000000000000000000000010000000100000000000000FFFEFF044D00610069006E00E8020000</Buttons>
             </MFCToolBar-34048>
             <Pane-34048>
                 <ID>34048</ID>
@@ -457,7 +457,7 @@
         </Desktop>
         <MDIWindows>
             <MDIClientArea-0>
-                <MDITabsState>010000000300000001000000000000000000000001000000010000000200000000000000010000000100000000000000280000002800000001000000010000000000000001000000FFFEFF132400570053005F0044004900520024005C007300720063005C006D00610069006E002E00630001000000FFFF010014004966436F6E74656E7453746F72616765496D706CFFFEFF00FFFEFFFF2A013C003F0078006D006C002000760065007200730069006F006E003D00220031002E0030002200200065006E0063006F00640069006E0067003D0022005500540046002D00380022003F003E000A003C0052006F006F0074003E000A0020002000200020003C004E0075006D0052006F00770073003E0031003C002F004E0075006D0052006F00770073003E000A0020002000200020003C004E0075006D0043006F006C0073003E0031003C002F004E0075006D0043006F006C0073003E000A0020002000200020003C00580050006F0073003E0030003C002F00580050006F0073003E000A0020002000200020003C00590050006F0073003E0030003C002F00590050006F0073003E000A0020002000200020003C00530065006C00530074006100720074003E0030003C002F00530065006C00530074006100720074003E000A0020002000200020003C00530065006C0045006E0064003E0030003C002F00530065006C0045006E0064003E000A0020002000200020003C00580050006F00730032003E0030003C002F00580050006F00730032003E000A0020002000200020003C00590050006F00730032003E003300360031003C002F00590050006F00730032003E000A0020002000200020003C00530065006C005300740061007200740032003E00310030003600300037003C002F00530065006C005300740061007200740032003E000A0020002000200020003C00530065006C0045006E00640032003E00310030003600300037003C002F00530065006C0045006E00640032003E000A003C002F0052006F006F0074003E000A00FFFEFF066D00610069006E002E00630000000000FFFFFFFFFFFFFFFF0000000010000000C5D4F200FFDC7800BECEA100F0A0A100BCA8E1009CC1B600F7B88600D9ADC200A5C2D700B3A6BE00EAD6A300F6FA7D00B5E99D005FC3CF00C1838300CACAD5000100000001000000020000000A010000490000008007000023030000</MDITabsState>
+                <MDITabsState>010000000300000001000000000000000000000001000000010000000200000000000000010000000100000000000000280000002800000001000000010000000000000001000000FFFEFF132400570053005F0044004900520024005C007300720063005C006D00610069006E002E00630001000000FFFF010014004966436F6E74656E7453746F72616765496D706CFFFEFF00FFFEFFFF22013C003F0078006D006C002000760065007200730069006F006E003D00220031002E0030002200200065006E0063006F00640069006E0067003D0022005500540046002D00380022003F003E000A003C0052006F006F0074003E000A0020002000200020003C004E0075006D0052006F00770073003E0031003C002F004E0075006D0052006F00770073003E000A0020002000200020003C004E0075006D0043006F006C0073003E0031003C002F004E0075006D0043006F006C0073003E000A0020002000200020003C00580050006F0073003E0030003C002F00580050006F0073003E000A0020002000200020003C00590050006F0073003E0030003C002F00590050006F0073003E000A0020002000200020003C00530065006C00530074006100720074003E0030003C002F00530065006C00530074006100720074003E000A0020002000200020003C00530065006C0045006E0064003E0030003C002F00530065006C0045006E0064003E000A0020002000200020003C00580050006F00730032003E0030003C002F00580050006F00730032003E000A0020002000200020003C00590050006F00730032003E003300360031003C002F00590050006F00730032003E000A0020002000200020003C00530065006C005300740061007200740032003E0030003C002F00530065006C005300740061007200740032003E000A0020002000200020003C00530065006C0045006E00640032003E0030003C002F00530065006C0045006E00640032003E000A003C002F0052006F006F0074003E000A00FFFEFF066D00610069006E002E00630000000000FFFFFFFFFFFFFFFF0000000010000000C5D4F200FFDC7800BECEA100F0A0A100BCA8E1009CC1B600F7B88600D9ADC200A5C2D700B3A6BE00EAD6A300F6FA7D00B5E99D005FC3CF00C1838300CACAD5000100000001000000020000000A010000490000008007000023030000</MDITabsState>
             </MDIClientArea-0>
         </MDIWindows>
     </WindowStorage>
diff --git a/stm8-driver/src/main.c b/stm8-driver/src/main.c
index 1cedc35..cc98ecd 100644
--- a/stm8-driver/src/main.c
+++ b/stm8-driver/src/main.c
@@ -391,8 +391,10 @@ void SetupUART()
     UARTPORT(CR2 = 0);
     UARTPORT(CR4 = 0);
     UARTPORT(CR3 = 0);
+#if defined USE_UART1
     UARTPORT(GTR = 0);
     UARTPORT(PSCR = 0);
+#endif
     //
     //  Now setup the port to 57600,n,8,1.
     //