1.cmd的APP地址修改

2.12管采样最大相电流修改
3.灯控12Vdc增加宏定义

3.BasicFunction/Source/bikelight.c

@@ -201,37 +201,15 @@ void bikelight_voBikeLightCoef(UWORD volt)
 
    if( BikeLedCheck_F.uwBike_LedVolt == 12) //拉低短路
     {
-//        BikeLedCheck_F.uwLedOnVoltMin = ((ULONG)LIGHT_ERR_VOLTAGE_MIN << 15) / VBASE;
-//        BikeLedCheck_F.uwLedOnVoltMax  =  ((ULONG)LIGHT_ERR_VOLTAGE_MAX << 15) / VBASE;
-//        DL_GPIO_initDigitalOutputFeatures(LED_6or12EN_PIN_LPCHOISE_IOMUX,
-//                       DL_GPIO_INVERSION_DISABLE, DL_GPIO_RESISTOR_NONE,
-//                       DL_GPIO_DRIVE_STRENGTH_LOW, DL_GPIO_HIZ_DISABLE);
-//        DL_GPIO_initDigitalOutput(LED_6or12EN_PIN_LPCHOISE_IOMUX);
-        IO_LED_6or12V_Choise_H(); //12V使能
 
-    }
+        IO_LED_6or12V_Choise_H(); //12V使能
+   }
    else //高阻
    {
-//       BikeLedCheck_F.uwLedOnVoltMin = ((ULONG)LIGHT_ERR_VOLTAGE_MIN << 14) / VBASE;
-//       BikeLedCheck_F.uwLedOnVoltMax = ((ULONG)LIGHT_ERR_VOLTAGE_MAX << 14) / VBASE;
+
        IO_LED_6or12V_Choise_L();//6V输出使能
-//       DL_GPIO_initDigitalOutputFeatures(LED_6or12EN_PIN_LPCHOISE_IOMUX,
-//                      DL_GPIO_INVERSION_DISABLE, DL_GPIO_RESISTOR_NONE,
-//                      DL_GPIO_DRIVE_STRENGTH_LOW, DL_GPIO_HIZ_ENABLE);
-   }
-//
-//   if( BikeLedCheck_B.uwBike_LedVolt == 12)
-//   {
-//        BikeLedCheck_B.uwLedOnVoltMin = ((ULONG)LIGHT_ERR_VOLTAGE_MIN << 15) / VBASE;
-//        BikeLedCheck_B.uwLedOnVoltMax  =  ((ULONG)LIGHT_ERR_VOLTAGE_MAX << 15) / VBASE;
-//        IO_LED_6or12V_Choise_H();//12V选择
-//    }
-//   else
-//   {
-//       BikeLedCheck_B.uwLedOnVoltMin = ((ULONG)LIGHT_ERR_VOLTAGE_MIN << 14) / VBASE;
-//       BikeLedCheck_B.uwLedOnVoltMax = ((ULONG)LIGHT_ERR_VOLTAGE_MAX << 14) / VBASE;
-//       IO_LED_6or12V_Choise_L();//6V选择
-//   }
+    }
+
 
 
 }
@@ -262,6 +240,9 @@ if( power_stPowStateOut.blPowerStartupFlg  ==FALSE)
 }
 else
 {
+#if((DCDC_12S6V_SEL_EN==0)||(DCDC_12S6V_SEL_EN==3))
+      IO_LED_6or12V_EN_H();
+#endif
 #if(BIKELEDOPEN_R_ENABLE!=0)
     // ---------------尾灯7个状态处理------------
    // BikeLedCheck_B.uwBike_LedMode=two_byte;
@@ -424,7 +405,9 @@ else
   //            BikeLedCheck_B.uwBike_OpenPreTime=0; //开灯瞬间5ms内处理计数
   //            BikeLedGloFun.blBike_BackLedStart=TRUE;//尾灯允许开灯启动
           }
-
+#if(DCDC_12S6V_SEL_EN==2)
+      IO_LED_6or12V_EN_H();
+#endif
           if((BikeLedCheck_B.uwBike_OpenLedEn==0) &&(BikeLedCheck_B.blBike_ForwardLedStart==TRUE)) //开灯检测，过流后每隔10秒检测1次
           {
            LED_EnableDeal(&BikeLedCheck_B,switchAction,B_PWM_byte);
@@ -446,6 +429,9 @@ else
                BikeLedCheck_B.uwBikeLight_PWM=0;
                DL_TimerG_setCaptureCompareValue(PWM_B_L_INST, BikeLedCheck_B.uwBikeLight_PWM, GPIO_PWM_B_L_C1_IDX);//max=2304
            }
+#if(DCDC_12S6V_SEL_EN==2)
+      IO_LED_6or12V_EN_L();
+#endif
     }
 
 
@@ -473,7 +459,9 @@ else
 //            BikeLedCheck_B.uwBike_LedOffErrCnt=0;  //10秒一检测计时
 //            BikeLedCheck_B.uwBike_OpenPreTime=0; //开灯瞬间5ms内处理计数
 //            BikeLedGloFun.blBike_BackLedStart=TRUE;//尾灯允许开灯启动
+#if(DCDC_12S6V_SEL_EN==1)
             IO_LED_6or12V_EN_H();
+#endif
         }
 
         if((BikeLedCheck_F.uwBike_OpenLedEn==0) &&(BikeLedCheck_F.blBike_ForwardLedStart==TRUE)) //开灯检测，过流后每隔10秒检测1次
@@ -482,8 +470,11 @@ else
         }
         else
          {
+#if(DCDC_12S6V_SEL_EN!=3)
              DL_COMP_setDACCode0(COMP_FLEDCHECK_INST, 0x4f);
+#endif
          }
+
         BikeLedCheck_F.uwBike_keyLedLowSta=1;
     }
     else
@@ -495,7 +486,9 @@ else
             BikeLedCheck_F.uwBikeLight_PWM=0;
             DL_TimerG_setCaptureCompareValue(PWM_F_INST, BikeLedCheck_F.uwBikeLight_PWM, GPIO_PWM_F_C1_IDX);//max=2304
             BikeLedGloFun.blBike_ForwardLedFlag=FALSE; //开前灯标志
+#if(DCDC_12S6V_SEL_EN==1)
             IO_LED_6or12V_EN_L();
+#endif
         }
     }
 #endif

4.BasicHardwSoftwLayer/2.BasicSoftwLayer/Include/syspar.h

@@ -157,7 +157,19 @@ Update Time
         #define GEAR_CURVALUT_FOR          73
         #define GEAR_CURVALUT_FIV          100
      //-----
-    #define  GEAR_CUR_UART5S       1
+    #define  GEAR_CUR_UART5S       0
+
+/*======================================================================*
+
+    DCDC12/6V电压端口配置  DCDC_12S6V_SEL_EN
+   0-DC to DC端口 固定使能打开
+   1-DC to DC端口 做前灯控制
+   2-DC to DC端口 做尾灯控制
+   3-DC to DC端口 前后灯12/6V用PWM控制
+*=======================================================================*/
+#define DCDC_12S6V_SEL_EN          3
+
+
 /*======================================================================*
  1-第3版本  2- 第4版本  3-第5版本
 硬件版本选择
@@ -228,7 +240,7 @@ Update Time
 /*======================================================================*
    ADC Maximum Value
 *=======================================================================*/
-#if ((IPM_POWER_SEL == IPM_POWER_250W_6G)||(IPM_POWER_SEL == IPM_POWER_350W_6G))
+#if ((IPM_POWER_SEL == IPM_POWER_250W_6G)||(IPM_POWER_SEL == IPM_POWER_350W_6G)||(IPM_POWER_SEL == IPM_POWER_500W_6G))
 
 
     #define ADC_IPHASE_CUR_MAX_AP   16500//10200//5500  //unit:0.01A, double resistance
@@ -250,25 +262,25 @@ Update Time
     #define ADC_VDC_MAX_VT         690//641// 693//723     //643   //unit:0.1V,vdc
 #define RMOSOFFSETVLAUE         3000//unit:0.001
 #elif ((IPM_POWER_SEL == IPM_POWER_500W_12G) ||(IPM_POWER_SEL ==IPM_POWER_750W_MINI_12G))
-       #define ADC_IPHASE_CUR_MAX_AP   16500//10200//5500  //unit:0.01A, double resistance
+       #define ADC_IPHASE_CUR_MAX_AP   16900//10200//5500  //unit:0.01A, double resistance
     #define ADC_IDC_CUR_AVG_MAX_AP  18600//19335//11420//13750 //unit:0.01A,idc average
     #define ADC_IDC_CUR_MAX_AP      18600//19335//11420//13750   //15216 //unit:0.01A,idc
     #define ADC_VDC_MAX_VT         690//641// 693//723     //643   //unit:0.1V,vdc
 #define RMOSOFFSETVLAUE         3000//unit:0.001
 #elif (IPM_POWER_SEL ==IPM_POWER_350W_MINI_12G)
-       #define ADC_IPHASE_CUR_MAX_AP   16500//10200//5500  //unit:0.01A, double resistance
+       #define ADC_IPHASE_CUR_MAX_AP   16900//10200//5500  //unit:0.01A, double resistance
     #define ADC_IDC_CUR_AVG_MAX_AP  18600//19335//11420//13750 //unit:0.01A,idc average
     #define ADC_IDC_CUR_MAX_AP      18600//19335//11420//13750   //15216 //unit:0.01A,idc
     #define ADC_VDC_MAX_VT         690//641// 693//723     //643   //unit:0.1V,vdc
 #define RMOSOFFSETVLAUE         3000//unit:0.001
 #elif (IPM_POWER_SEL == IPM_POWER_750W_12G)
-      #define ADC_IPHASE_CUR_MAX_AP   16500//10200//5500  //unit:0.01A, double resistance
+      #define ADC_IPHASE_CUR_MAX_AP   16900//10200//5500  //unit:0.01A, double resistance
     #define ADC_IDC_CUR_AVG_MAX_AP  18600//19335//11420//13750 //unit:0.01A,idc average
     #define ADC_IDC_CUR_MAX_AP      18600//19335//11420//13750   //15216 //unit:0.01A,idc
     #define ADC_VDC_MAX_VT         690//641// 693//723     //643   //unit:0.1V,vdc
 #define RMOSOFFSETVLAUE         3000//unit:0.001
 #elif ((IPM_POWER_SEL == IPM_POWER_1000W_12G) ||(IPM_POWER_SEL ==IPM_POWER_1000W_MINI_12G))
-      #define ADC_IPHASE_CUR_MAX_AP  13200// 16500//10200//5500  //unit:0.01A, double resistance
+      #define ADC_IPHASE_CUR_MAX_AP  16900// 16500//10200//5500  //unit:0.01A, double resistance
     #define ADC_IDC_CUR_AVG_MAX_AP  18600//19335//11420//13750 //unit:0.01A,idc average
     #define ADC_IDC_CUR_MAX_AP      18600//19335//11420//13750   //15216 //unit:0.01A,idc
     #define ADC_VDC_MAX_VT         690//641// 693//723     //643   //unit:0.1V,vdc

device_linker.cmd

@@ -36,7 +36,7 @@
 
 MEMORY
 {
-    FLASH           (RX)  : origin = 0x00006000, length = 0x0001A000
+    FLASH           (RX)  : origin = 0x00007000, length = 0x00019000
     SRAM            (RWX) : origin = 0x20202000, length = 0x00006000
     BCR_CONFIG      (R)   : origin = 0x41C00000, length = 0x00000080
     BSL_CONFIG      (R)   : origin = 0x41C00100, length = 0x00000080
@@ -44,7 +44,7 @@ MEMORY
 
 SECTIONS
 {
-    .intvecs:   > 0x00006000
+    .intvecs:   > 0x00007000
     .text   : palign(8) {} > FLASH
     .const  : palign(8) {} > FLASH
     .cinit  : palign(8) {} > FLASH