Переглянути джерело

Merge remote-tracking branch 'origin/Sim' into Assist_VoltLimt

Ye Jin 1 рік тому
батько
коміт
c14888919d

+ 1 - 0
User project/1.FrameLayer/Source/app.c

@@ -221,6 +221,7 @@ void PeripheralInit()
     iCap_EnableDeviceInterrupt(0);
     iCap_EnableChannelInterrupt(0,CAP_CH(2));
     iCap_EnableChannelInterrupt(0,CAP_CH(3));
+
 }
 
 void PeripheralStart()

+ 1 - 1
User project/2.MotorDrive/Source/packed

@@ -1 +1 @@
-Subproject commit 658c0be0c2234c4c1a8ede5edb87e178ed843552
+Subproject commit 06bfb0cb963b8440fb7b29c7c6413b4242d90014

+ 1 - 0
User project/3.BasicFunction/Include/InputCapture.h

@@ -8,6 +8,7 @@
  * @copyright Copyright (c) 2023
  *
  */
+#include "typedefine.h"
 
 #ifndef _INPUTCAPTURE_H_
 #define _INPUTCAPTURE_H_

+ 1 - 1
User project/3.BasicFunction/Source/spi_master.c

@@ -1,4 +1,4 @@
-/************************************************************************
+ /************************************************************************
  Project:               Welling Motor Control Paltform
  Filename:              spi_master.c
  Partner Filename:      spi_master.h

+ 1 - 0
User project/4.BasicHardwSoftwLayer/1.BasicHardwLayer/Include/board_config.h

@@ -142,4 +142,5 @@
 #define HW_GPIO_CADDIR_PIN         14 ///> GPIOB  PIN2
 #define HW_GPIO_CADENCE_PIN        15 ///> GPIOB  PIN10
 
+
 /* Api Device Index Definations */

+ 3 - 3
User project/4.BasicHardwSoftwLayer/1.BasicHardwLayer/Source/hwsetup.c

@@ -287,13 +287,13 @@ void hw_voInitGPIO(void)
 #endif
 //    gpio_init(GPIOC,GPIO_MODE_OUT_PP,GPIO_OSPEED_50MHZ, GPIO_PIN_10);  // test       
 //    
-//    gpio_init(GPIOC,GPIO_MODE_OUT_PP,GPIO_OSPEED_50MHZ, GPIO_PIN_11);  // test   
-    
     gpio_init(GPIOC,GPIO_MODE_OUT_PP,GPIO_OSPEED_50MHZ, GPIO_PIN_12);  /* I2C0 Write Protect*/   
+    
+    gpio_init(GPIOC,GPIO_MODE_OUT_PP,GPIO_OSPEED_50MHZ, GPIO_PIN_13); /* F_6V_12V_Enable */
 
     gpio_init(GPIOC,GPIO_MODE_IPD,GPIO_OSPEED_50MHZ,GPIO_PIN_14); /* Bike Brake */
 
-    gpio_init(GPIOC,GPIO_MODE_OUT_PP,GPIO_OSPEED_50MHZ, GPIO_PIN_13|GPIO_PIN_15); /* Light Enable */
+    gpio_init(GPIOC,GPIO_MODE_OUT_PP,GPIO_OSPEED_50MHZ, GPIO_PIN_15); /* Light Enable */
 
     /*=======================================================================
                                     GPIO D

+ 1 - 1
tests/sim/sim_board/peripheral

@@ -1 +1 @@
-Subproject commit ea3b4bc25355340267fde8c7f9a5878a426f06b2
+Subproject commit ed5ae538b4ff00d9ebaad085da03062f60558d9b

+ 1 - 0
xmake.lua

@@ -19,6 +19,7 @@ target("unittest")
     add_files("User project/4.BasicHardwSoftwLayer/2.BasicSoftwLayer/Source/CodePara.c", "User project/4.BasicHardwSoftwLayer/2.BasicSoftwLayer/Source/mathtool.c")
     add_files("User project/4.BasicHardwSoftwLayer/2.BasicSoftwLayer/Source/macroequ.c","User project/4.BasicHardwSoftwLayer/2.BasicSoftwLayer/Source/glbcof.c")
     add_files("User project/3.BasicFunction/Source/Cadence.c", "User project/3.BasicFunction/Source/bikespeed.c", "User project/3.BasicFunction/Source/torquesensor.c")
+    add_files("User project/3.BasicFunction/Source/InputCapture.c")
     add_files("User project/2.MotorDrive/Source/adc.c", "User project/2.MotorDrive/Source/pwm.c", "User project/2.MotorDrive/Source/packed/torqobs.c")
     add_files("User project/2.MotorDrive/Source/packed/pwrlim.c", "User project/2.MotorDrive/Source/packed/asr.c", "User project/2.MotorDrive/Source/packed/brake.c")
     add_files("User project/3.BasicFunction/Source/Temp.c")