Просмотр исходного кода

重新处理106的硬件版本

Signed-off-by: huhui <huhui@sharkgulf.com>
huhui 2 лет назад
Родитель
Сommit
8e1667a395

+ 0 - 1
Applications/bsp/gd32/board_mc100_v1.h

@@ -288,7 +288,6 @@
 #define CAN_IRQ0     CAN0_RX0_IRQn
 #define CAN_RX0_IRQHandler  CAN0_RX0_IRQHandler
 #else
-#define CAN_REMAP    GPIO_CAN_PARTIAL_REMAP
 #define CAN_IRQ0     USBD_LP_CAN0_RX0_IRQn
 #define CAN_RX0_IRQHandler  USBD_LP_CAN0_RX0_IRQHandler
 #endif

+ 5 - 1
Applications/bsp/gd32/uart.h

@@ -10,9 +10,13 @@
 #define CH_ESC_START					0x05
 #define CH_ESC_END						0x06
 #define CH_ESC_ESC						0x07
-
+#if (CONFIG_MC105_HW_VERSION==2)
+#define SHARK_UART_TX_MEM_SIZE			(256)
+#define SHARK_UART_RX_MEM_SIZE			256
+#else
 #define SHARK_UART_TX_MEM_SIZE			(5 * 1024)
 #define SHARK_UART_RX_MEM_SIZE			512
+#endif
 #define RX_FRAME_MAX_LEN 260
 #define RX_OLD_FRAME_MAX_LEN 256
 

+ 5 - 0
Applications/os/heap_4.c

@@ -35,10 +35,15 @@
  */
 #include <stdlib.h>
 #include <stdint.h>
+#include "bsp/bsp.h"
 
 #define portBYTE_ALIGNMENT			8
 #define portBYTE_ALIGNMENT_MASK 	0x0007
+#if (CONFIG_MC105_HW_VERSION==2)
+#define configTOTAL_HEAP_SIZE    (3*1024)
+#else
 #define configTOTAL_HEAP_SIZE    (14*1024)
+#endif
 #define configASSERT(x)
 /* Block sizes must not get too small. */
 #define heapMINIMUM_BLOCK_SIZE	( ( size_t ) ( xHeapStructSize << 1 ) )

+ 9 - 14
Project/MC100.uvoptx

@@ -103,7 +103,7 @@
         <bEvRecOn>1</bEvRecOn>
         <bSchkAxf>0</bSchkAxf>
         <bTchkAxf>0</bTchkAxf>
-        <nTsel>4</nTsel>
+        <nTsel>3</nTsel>
         <sDll></sDll>
         <sDllPa></sDllPa>
         <sDlgDll></sDlgDll>
@@ -114,9 +114,14 @@
         <tDlgDll></tDlgDll>
         <tDlgPa></tDlgPa>
         <tIfile></tIfile>
-        <pMon>Segger\JL2CM3.dll</pMon>
+        <pMon>BIN\CMSIS_AGDI.dll</pMon>
       </DebugOpt>
       <TargetDriverDllRegistry>
+        <SetRegEntry>
+          <Number>0</Number>
+          <Key>CMSIS_AGDI</Key>
+          <Name>-X"CMSIS-DAP" -UE8CF104040D05595EB1425DDBA2E4925 -O462 -S0 -C0 -P00000000 -N00("ARM CoreSight SW-DP") -D00(2BA01477) -L00(0) -TO65554 -TC10000000 -TT10000000 -TP20 -TDS8007 -TDT0 -TDC1F -TIEFFFFFFFF -TIP8 -FO7 -FD20000000 -FCF00 -FN1 -FF0GD32F30x_HD.FLM -FS08000000 -FL080000 -FP0($$Device:GD32F303RC$Flash\GD32F30x_HD.FLM)</Name>
+        </SetRegEntry>
         <SetRegEntry>
           <Number>0</Number>
           <Key>ARMRTXEVENTFLAGS</Key>
@@ -135,7 +140,7 @@
         <SetRegEntry>
           <Number>0</Number>
           <Key>DLGUARM</Key>
-          <Name>U</Name>
+          <Name></Name>
         </SetRegEntry>
         <SetRegEntry>
           <Number>0</Number>
@@ -191,16 +196,6 @@
       <pszMrulep></pszMrulep>
       <pSingCmdsp></pSingCmdsp>
       <pMultCmdsp></pMultCmdsp>
-      <SystemViewers>
-        <Entry>
-          <Name>System Viewer\ADC0</Name>
-          <WinId>35904</WinId>
-        </Entry>
-        <Entry>
-          <Name>System Viewer\ADC1</Name>
-          <WinId>35905</WinId>
-        </Entry>
-      </SystemViewers>
     </TargetOption>
   </Target>
 
@@ -922,7 +917,7 @@
 
   <Group>
     <GroupName>OS</GroupName>
-    <tvExp>0</tvExp>
+    <tvExp>1</tvExp>
     <tvExpOptDlg>0</tvExpOptDlg>
     <cbSel>0</cbSel>
     <RteFlg>0</RteFlg>

+ 1 - 1
Project/MC100.uvprojx

@@ -301,7 +301,7 @@
               <OCR_RVCT9>
                 <Type>0</Type>
                 <StartAddress>0x20000000</StartAddress>
-                <Size>0x18000</Size>
+                <Size>0xc000</Size>
               </OCR_RVCT9>
               <OCR_RVCT10>
                 <Type>0</Type>