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

增加前灯控制,电压选择正常。

dd 3 месяцев назад
Родитель
Сommit
0faa62ca48

+ 8 - 8
4.BasicHardwSoftwLayer/1.BasicHardwLayer/Include/UserGpio_Config.h

@@ -42,16 +42,16 @@
 
 
 //DC1灯
-#define IO_LED1_6or12V_EN_H()          1//DL_GPIO_setPins(GPIO_12V6_PORT, GPIO_12V6_PIN_EN_PIN)//
-#define IO_LED1_6or12V_EN_L()          1//DL_GPIO_clearPins(GPIO_12V6_PORT, GPIO_12V6_PIN_EN_PIN)//
-#define IO_LED1_6or12V_Choise_H()      1//DL_GPIO_setPins(GPIO_12V6_PORT, GPIO_12V6_PIN_SEL_PIN)//
-#define IO_LED1_6or12V_Choise_L()      1//DL_GPIO_clearPins(GPIO_12V6_PORT, GPIO_12V6_PIN_SEL_PIN)//
+#define IO_LED1_6or12V_EN_H()          DL_GPIO_setPins(GPIO_F_LED_PORT, GPIO_F_LED_PIN_LED_F_EN_PIN)//
+#define IO_LED1_6or12V_EN_L()          DL_GPIO_clearPins(GPIO_F_LED_PORT, GPIO_F_LED_PIN_LED_F_EN_PIN)//
+#define IO_LED1_6or12V_Choise_H()      DL_GPIO_setPins(GPIO_F_LED_PORT, GPIO_F_LED_PIN_LED_F_SEL_PIN)//
+#define IO_LED1_6or12V_Choise_L()      DL_GPIO_clearPins(GPIO_F_LED_PORT, GPIO_F_LED_PIN_LED_F_SEL_PIN)//
 
 //DC2灯
-#define IO_LED2_6or12V_EN_H()          DL_GPIO_setPins(GPIO_B_LED_PORT, GPIO_B_LED_PIN_EN_PIN)//
-#define IO_LED2_6or12V_EN_L()          DL_GPIO_clearPins(GPIO_B_LED_PORT, GPIO_B_LED_PIN_EN_PIN)//
-#define IO_LED2_6or12V_Choise_H()      DL_GPIO_setPins(GPIO_B_LED_PORT, GPIO_B_LED_PIN_SEL_PIN)//
-#define IO_LED2_6or12V_Choise_L()      DL_GPIO_clearPins(GPIO_B_LED_PORT, GPIO_B_LED_PIN_SEL_PIN)//
+#define IO_LED2_6or12V_EN_H()          DL_GPIO_setPins(GPIO_B_LED_PORT, GPIO_B_LED_PIN_LED_B_EN_PIN)//
+#define IO_LED2_6or12V_EN_L()          DL_GPIO_clearPins(GPIO_B_LED_PORT, GPIO_B_LED_PIN_LED_B_EN_PIN)//
+#define IO_LED2_6or12V_Choise_H()      DL_GPIO_setPins(GPIO_B_LED_PORT, GPIO_B_LED_PIN_LED_B_SEL_PIN)//
+#define IO_LED2_6or12V_Choise_L()      DL_GPIO_clearPins(GPIO_B_LED_PORT, GPIO_B_LED_PIN_LED_B_SEL_PIN)//
 
 #define IO_FORWARDLEDCHECK_PORT()      1// DL_GPIO_readPins(LIGHT_DETECT_FRONT_PORT, LIGHT_DETECT_FRONT_PIN)// (GPIO_PINS_0 & GPIOF->idt)  //PF0 杩囨祦妫�娴�
 #define Get_F_LEDCHECK_PORT()          DL_GPIO_readPins(GPIO_COMP_FLEDCHECK_IN0P_PORT, GPIO_COMP_FLEDCHECK_IN0P_PIN)

+ 14 - 5
mspm0g3507.syscfg

@@ -21,6 +21,7 @@ const GPIO2         = GPIO.addInstance();
 const GPIO3         = GPIO.addInstance();
 const GPIO4         = GPIO.addInstance();
 const GPIO5         = GPIO.addInstance();
+const GPIO6         = GPIO.addInstance();
 const MATHACL       = scripting.addModule("/ti/driverlib/MATHACL");
 const MCAN          = scripting.addModule("/ti/driverlib/MCAN", {}, false);
 const MCAN1         = MCAN.addInstance();
@@ -134,6 +135,7 @@ ADC122.adcPin5Config.$name        = "ti_driverlib_gpio_GPIOPinGeneric0";
 ADC122.adcPin6Config.$name        = "ti_driverlib_gpio_GPIOPinGeneric23";
 ADC122.adcPin7Config.$name        = "ti_driverlib_gpio_GPIOPinGeneric22";
 
+Board.debugOn            = false;
 Board.peripheral.$assign = "DEBUGSS";
 
 COMP1.$name                          = "COMP_0";
@@ -219,13 +221,21 @@ GPIO4.associatedPins[0].assignedPin  = "23";
 
 GPIO5.$name                          = "GPIO_B_LED";
 GPIO5.associatedPins.create(2);
-GPIO5.associatedPins[0].$name        = "PIN_EN";
 GPIO5.associatedPins[0].assignedPort = "PORTB";
 GPIO5.associatedPins[0].assignedPin  = "16";
-GPIO5.associatedPins[0].pin.$assign  = "PB16";
-GPIO5.associatedPins[1].$name        = "PIN_SEL";
+GPIO5.associatedPins[0].$name        = "PIN_LED_B_EN";
 GPIO5.associatedPins[1].assignedPort = "PORTB";
 GPIO5.associatedPins[1].assignedPin  = "6";
+GPIO5.associatedPins[1].$name        = "PIN_LED_B_SEL";
+
+GPIO6.$name                          = "GPIO_F_LED";
+GPIO6.associatedPins.create(2);
+GPIO6.associatedPins[0].$name        = "PIN_LED_F_EN";
+GPIO6.associatedPins[0].assignedPort = "PORTA";
+GPIO6.associatedPins[0].pin.$assign  = "PA20";
+GPIO6.associatedPins[1].$name        = "PIN_LED_F_SEL";
+GPIO6.associatedPins[1].assignedPort = "PORTA";
+GPIO6.associatedPins[1].pin.$assign  = "PA19";
 
 MCAN1.$name                    = "MCAN0";
 MCAN1.desiredNomRate           = 250;
@@ -437,12 +447,11 @@ scripting.suppress("Migrating requires going through the Switch Board or Device
 pinFunction4.peripheral.$suggestSolution           = "SYSCTL";
 pinFunction4.peripheral.hfxInPin.$suggestSolution  = "PA5";
 pinFunction4.peripheral.hfxOutPin.$suggestSolution = "PA6";
-Board.peripheral.swclkPin.$suggestSolution         = "PA20";
-Board.peripheral.swdioPin.$suggestSolution         = "PA19";
 COMP1.peripheral.$suggestSolution                  = "COMP1";
 GPIO1.associatedPins[1].pin.$suggestSolution       = "PA9";
 GPIO1.associatedPins[2].pin.$suggestSolution       = "PB7";
 GPIO1.associatedPins[4].pin.$suggestSolution       = "PA31";
 GPIO4.associatedPins[0].pin.$suggestSolution       = "PA23";
+GPIO5.associatedPins[0].pin.$suggestSolution       = "PB16";
 GPIO5.associatedPins[1].pin.$suggestSolution       = "PB6";
 WWDT1.peripheral.$suggestSolution                  = "WWDT0";