yf_zjb 4 lat temu
rodzic
commit
a866a99b2d

BIN
Application_BZY/.settings/.rtmenus


+ 1 - 1
Application_BZY/.settings/language.settings.xml

@@ -5,7 +5,7 @@
 			<provider copy-of="extension" id="org.eclipse.cdt.ui.UserLanguageSettingsProvider"/>
 			<provider copy-of="extension" id="org.eclipse.cdt.ui.UserLanguageSettingsProvider"/>
 			<provider-reference id="org.eclipse.cdt.core.ReferencedProjectsLanguageSettingsProvider" ref="shared-provider"/>
 			<provider-reference id="org.eclipse.cdt.core.ReferencedProjectsLanguageSettingsProvider" ref="shared-provider"/>
 			<provider-reference id="org.eclipse.cdt.managedbuilder.core.MBSLanguageSettingsProvider" ref="shared-provider"/>
 			<provider-reference id="org.eclipse.cdt.managedbuilder.core.MBSLanguageSettingsProvider" ref="shared-provider"/>
-			<provider class="org.eclipse.cdt.managedbuilder.language.settings.providers.GCCBuiltinSpecsDetector" console="false" env-hash="1297603847426260181" id="ilg.gnuarmeclipse.managedbuild.cross.GCCBuiltinSpecsDetector" keep-relative-paths="false" name="CDT ARM Cross GCC Built-in Compiler Settings " parameter="${COMMAND} ${FLAGS} ${cross_toolchain_flags} -E -P -v -dD &quot;${INPUTS}&quot;" prefer-non-shared="true">
+			<provider class="org.eclipse.cdt.managedbuilder.language.settings.providers.GCCBuiltinSpecsDetector" console="false" env-hash="1297872936118873969" id="ilg.gnuarmeclipse.managedbuild.cross.GCCBuiltinSpecsDetector" keep-relative-paths="false" name="CDT ARM Cross GCC Built-in Compiler Settings " parameter="${COMMAND} ${FLAGS} ${cross_toolchain_flags} -E -P -v -dD &quot;${INPUTS}&quot;" prefer-non-shared="true">
 				<language-scope id="org.eclipse.cdt.core.gcc"/>
 				<language-scope id="org.eclipse.cdt.core.gcc"/>
 				<language-scope id="org.eclipse.cdt.core.g++"/>
 				<language-scope id="org.eclipse.cdt.core.g++"/>
 			</provider>
 			</provider>

Plik diff jest za duży
+ 229 - 229
Application_CBD/.cproject


BIN
Application_CBD/.settings/.rtmenus


+ 1 - 1
Application_CBD/.settings/language.settings.xml

@@ -5,7 +5,7 @@
 			<provider copy-of="extension" id="org.eclipse.cdt.ui.UserLanguageSettingsProvider"/>
 			<provider copy-of="extension" id="org.eclipse.cdt.ui.UserLanguageSettingsProvider"/>
 			<provider-reference id="org.eclipse.cdt.core.ReferencedProjectsLanguageSettingsProvider" ref="shared-provider"/>
 			<provider-reference id="org.eclipse.cdt.core.ReferencedProjectsLanguageSettingsProvider" ref="shared-provider"/>
 			<provider-reference id="org.eclipse.cdt.managedbuilder.core.MBSLanguageSettingsProvider" ref="shared-provider"/>
 			<provider-reference id="org.eclipse.cdt.managedbuilder.core.MBSLanguageSettingsProvider" ref="shared-provider"/>
-			<provider class="org.eclipse.cdt.managedbuilder.language.settings.providers.GCCBuiltinSpecsDetector" console="false" env-hash="1370330221103438797" id="ilg.gnuarmeclipse.managedbuild.cross.GCCBuiltinSpecsDetector" keep-relative-paths="false" name="CDT ARM Cross GCC Built-in Compiler Settings " parameter="${COMMAND} ${FLAGS} ${cross_toolchain_flags} -E -P -v -dD &quot;${INPUTS}&quot;" prefer-non-shared="true">
+			<provider class="org.eclipse.cdt.managedbuilder.language.settings.providers.GCCBuiltinSpecsDetector" console="false" env-hash="1370599309796052585" id="ilg.gnuarmeclipse.managedbuild.cross.GCCBuiltinSpecsDetector" keep-relative-paths="false" name="CDT ARM Cross GCC Built-in Compiler Settings " parameter="${COMMAND} ${FLAGS} ${cross_toolchain_flags} -E -P -v -dD &quot;${INPUTS}&quot;" prefer-non-shared="true">
 				<language-scope id="org.eclipse.cdt.core.gcc"/>
 				<language-scope id="org.eclipse.cdt.core.gcc"/>
 				<language-scope id="org.eclipse.cdt.core.g++"/>
 				<language-scope id="org.eclipse.cdt.core.g++"/>
 			</provider>
 			</provider>

+ 9 - 13
Application_CBD/applications/control.c

@@ -673,23 +673,16 @@ Others:         NULL
 void ctr_Motor_Driver(uint8_t EN,uint8_t DIR,rt_uint32_t pwm,rt_uint32_t time_out)
 void ctr_Motor_Driver(uint8_t EN,uint8_t DIR,rt_uint32_t pwm,rt_uint32_t time_out)
 {
 {
     beep_init();
     beep_init();
-    rt_pin_mode(Motor_Power, PIN_MODE_OUTPUT);
     rt_pin_mode(LIMIT_UP, PIN_MODE_INPUT);
     rt_pin_mode(LIMIT_UP, PIN_MODE_INPUT);
     rt_pin_mode(LIMIT_DOWN, PIN_MODE_INPUT);
     rt_pin_mode(LIMIT_DOWN, PIN_MODE_INPUT);
     rt_pin_mode(Motor_EN, PIN_MODE_OUTPUT);
     rt_pin_mode(Motor_EN, PIN_MODE_OUTPUT);
     rt_pin_mode(Motor_DIR, PIN_MODE_OUTPUT);
     rt_pin_mode(Motor_DIR, PIN_MODE_OUTPUT);
-    if(EN==2)
-    {
-        rt_pin_write(Motor_EN, 0);
-        rt_pin_write(HK_TAKE, 0);  //使能步进电机2
-    }
-    else if(EN==0)
+    if(EN==0)
     {
     {
         rt_pin_write(Motor_Power,0);
         rt_pin_write(Motor_Power,0);
     }
     }
     else{
     else{
         rt_pin_write(Motor_EN, EN);
         rt_pin_write(Motor_EN, EN);
-        rt_pin_write(Motor_Power,1);
     }
     }
     rt_pin_write(Motor_DIR, DIR);
     rt_pin_write(Motor_DIR, DIR);
     beep_set(pwm, pwm/2);      //200kzh - 50%
     beep_set(pwm, pwm/2);      //200kzh - 50%
@@ -712,7 +705,6 @@ void ctr_Motor_Driver(uint8_t EN,uint8_t DIR,rt_uint32_t pwm,rt_uint32_t time_ou
         time_out --;
         time_out --;
     }
     }
     rt_pin_write(Motor_EN, OFF);
     rt_pin_write(Motor_EN, OFF);
-    rt_pin_write(HK_TAKE,OFF);  //双电机此处ON
     beep_set(0, 0);      //200kzh - 50%
     beep_set(0, 0);      //200kzh - 50%
 }
 }
 /*************************************************
 /*************************************************
@@ -1121,7 +1113,10 @@ void Hk_Take_io(void)
     rt_pin_mode(HK_IO, PIN_MODE_OUTPUT);
     rt_pin_mode(HK_IO, PIN_MODE_OUTPUT);
     rt_pin_write(HK_TAKE, 1);
     rt_pin_write(HK_TAKE, 1);
     rt_pin_write(HK_IO, 0);
     rt_pin_write(HK_IO, 0);
+    if(device_status.dtype==3)
     Beep_Tip(1000);
     Beep_Tip(1000);
+    if(device_status.dtype==7)
+    rt_thread_mdelay(1000);
     rt_pin_write(HK_TAKE, 0);
     rt_pin_write(HK_TAKE, 0);
     rt_pin_write(HK_IO, 1);
     rt_pin_write(HK_IO, 1);
 }
 }
@@ -1287,7 +1282,7 @@ void ResetInit(void)
         //关闭补光灯
         //关闭补光灯
         ctr_led(OFF);
         ctr_led(OFF);
     }
     }
-    if(device_status.version_type!=6)
+    if(device_status.version_type!=6&&device_status.version_type!=7)
     {
     {
         device_status.work_done = 1;
         device_status.work_done = 1;
            //1.打开路由器供电
            //1.打开路由器供电
@@ -1839,7 +1834,7 @@ void WorkTask(void)
 //            rt_kprintf("等待上仓门关闭!!!\n");
 //            rt_kprintf("等待上仓门关闭!!!\n");
 //        }
 //        }
             //5.加热
             //5.加热
-            if(device_status.heat_sw==1)
+            if(device_status.heat_sw==0)
             {
             {
                 calorstat(device_status.heattime*60);
                 calorstat(device_status.heattime*60);
             }
             }
@@ -1963,7 +1958,8 @@ static void Work_Loop_thread_entry(void *parameter)
         {
         {
             WorkTask();
             WorkTask();
         }
         }
-        else {
+        if(device_status.version_type==6)
+        {
             WorkTask_XCT();
             WorkTask_XCT();
         }
         }
         rt_thread_delay(1000);
         rt_thread_delay(1000);
@@ -2035,7 +2031,7 @@ static void Control_Heat_thread_entry(void *parameter)
         }
         }
 
 
         #else
         #else
-        if(device_status.work_status==1&&device_status.heat_sw==0)
+        if(device_status.work_status==1&&device_status.heat_sw==1)
         {
         {
             ctr_lamp(ON, 1);
             ctr_lamp(ON, 1);
             rt_thread_delay(10000);
             rt_thread_delay(10000);

+ 60 - 37
Application_CBD/applications/hmi.c

@@ -470,26 +470,7 @@ static void HMI_Decode(char *cmd,uint8_t cmd_len)
         ctr_Cool_Fan(OFF);
         ctr_Cool_Fan(OFF);
         LOG_I("散热风机已关闭!");
         LOG_I("散热风机已关闭!");
     }
     }
-    //步进上行开始
-    else if(strstr(rx_buffer,"putTest.switchUp=1")!=NULL){
-        ctr_Motor_Driver(1, 0,500000,200);
-        LOG_I("开始步进上行!");
-    }
-    //步进上行停止
-    else if(strstr(rx_buffer,"putTest.switchUp=0")!=NULL){
-        ctr_Motor_Driver(0, 0,0,0);
-        LOG_I("停止步进上行!");
-    }
-    //步进下行
-    else if(strstr(rx_buffer,"putTest.switchDown=1")!=NULL){
-        ctr_Motor_Driver(1, 1,500000,200);
-        rt_kprintf("开始步进下行!\n");
-    }
-    //步进下行停止
-    else if(strstr(rx_buffer,"putTest.switchDown=0")!=NULL){
-        ctr_Motor_Driver(0, 0,0,0);
-        rt_kprintf("停止步进下行!\n");
-    }
+
     //开始对焦拍照
     //开始对焦拍照
     else if(strstr(rx_buffer,"putTest.switchAutopic=1")!=NULL){
     else if(strstr(rx_buffer,"putTest.switchAutopic=1")!=NULL){
         device_status.autotakepic=1;
         device_status.autotakepic=1;
@@ -592,27 +573,66 @@ static void HMI_Decode(char *cmd,uint8_t cmd_len)
     }
     }
     //打开上仓门
     //打开上仓门
     else if(strstr(rx_buffer,"putTest.switchUp=1")!=NULL){
     else if(strstr(rx_buffer,"putTest.switchUp=1")!=NULL){
-        rt_kprintf("Open UP!\n");
-        ctr_cangmen_up(OFF);
-        device_status.ctr_up_motor = 1;
+        if(device_status.dtype==7)
+        {
+            ctr_lamp(ON, 1);
+            ctr_Motor_Driver(1, 0,500000,300);
+            LOG_I("开始步进上行!");
+        }
+        else
+        {
+            rt_kprintf("Open UP!\n");
+            ctr_cangmen_up(OFF);
+            device_status.ctr_up_motor = 1;
+        }
     }
     }
     //关闭上仓门
     //关闭上仓门
     else if(strstr(rx_buffer,"putTest.switchUp=0")!=NULL){
     else if(strstr(rx_buffer,"putTest.switchUp=0")!=NULL){
-        rt_kprintf("CLOSE UP!\n");
-        ctr_cangmen_up(OFF);
-        device_status.ctr_up_motor = 2;
+        if(device_status.dtype==7)
+        {
+            ctr_lamp(OFF, 0);
+            ctr_Motor_Driver(0, 0,0,0);
+            LOG_I("停止步进上行!");
+        }
+        else
+        {
+            rt_kprintf("CLOSE UP!\n");
+            ctr_cangmen_up(OFF);
+            device_status.ctr_up_motor = 2;
+        }
+
     }
     }
     //打开下仓门
     //打开下仓门
     else if(strstr(rx_buffer,"putTest.switchDown=1")!=NULL){
     else if(strstr(rx_buffer,"putTest.switchDown=1")!=NULL){
-        ctr_cangmen_down(OFF);
-        device_status.ctr_down_motor = 1;
-        rt_kprintf("Open down!\n");
+        if(device_status.dtype==7)
+        {
+            ctr_lamp(ON, 1);
+            ctr_Motor_Driver(1, 1,500000,300);
+            rt_kprintf("开始步进下行!\n");
+        }
+        else
+        {
+            ctr_cangmen_down(OFF);
+            device_status.ctr_down_motor = 1;
+            rt_kprintf("Open down!\n");
+        }
+
     }
     }
     //关闭下仓门
     //关闭下仓门
     else if(strstr(rx_buffer,"putTest.switchDown=0")!=NULL){
     else if(strstr(rx_buffer,"putTest.switchDown=0")!=NULL){
-        ctr_cangmen_down(OFF);
-        device_status.ctr_down_motor = 2;
-        rt_kprintf("CLOSE down!\n");
+        if(device_status.dtype==7)
+        {
+            ctr_lamp(OFF, 0);
+            ctr_Motor_Driver(0, 0,0,0);
+            rt_kprintf("停止步进下行!\n");
+        }
+        else
+        {
+            ctr_cangmen_down(OFF);
+            device_status.ctr_down_motor = 2;
+            rt_kprintf("CLOSE down!\n");
+        }
+
     }
     }
     //定时设置
     //定时设置
     else if (strstr(rx_buffer,"saveClockSet=")!=NULL) {
     else if (strstr(rx_buffer,"saveClockSet=")!=NULL) {
@@ -1278,10 +1298,12 @@ static void Ctr_Mortor_entry(void* parameter)
         if(device_status.autotakepic==1)
         if(device_status.autotakepic==1)
         {
         {
             DTU_Write("autotakephoto");
             DTU_Write("autotakephoto");
+            //打开步进电机驱动器电源
+            ctr_lamp(ON, 1);
             //打开补光灯
             //打开补光灯
             ctr_led(ON);
             ctr_led(ON);
             //电机向下运动
             //电机向下运动
-            ctr_Motor_Driver(1, 1, 500000,200);
+            ctr_Motor_Driver(1, 1, 500000,300);
             rt_thread_delay(1000);
             rt_thread_delay(1000);
             LOG_I("电机到达下方!!!");
             LOG_I("电机到达下方!!!");
             Hk_Take_io();
             Hk_Take_io();
@@ -1292,11 +1314,8 @@ static void Ctr_Mortor_entry(void* parameter)
             beep_set(500000, 500000/5);      //2kzh - 50%
             beep_set(500000, 500000/5);      //2kzh - 50%
             while(rt_pin_read(LIMIT_UP)==1)
             while(rt_pin_read(LIMIT_UP)==1)
             {
             {
-                rt_thread_delay(10);
-                photo_setup++;
                 rt_pin_write(Motor_EN, 0); //驱动器失能
                 rt_pin_write(Motor_EN, 0); //驱动器失能
                 Hk_Take_io();
                 Hk_Take_io();
-                rt_thread_delay(1000);
                 rt_pin_write(Motor_EN, 1); //驱动器使能
                 rt_pin_write(Motor_EN, 1); //驱动器使能
                 if(photo_setup>300)
                 if(photo_setup>300)
                 {
                 {
@@ -1307,8 +1326,11 @@ static void Ctr_Mortor_entry(void* parameter)
                     HMI_WRITE("sysTest.switchAutopic.val=%d",0);
                     HMI_WRITE("sysTest.switchAutopic.val=%d",0);
                     break;
                     break;
                 }
                 }
+                photo_setup++;
+                rt_thread_mdelay(100);
                 LOG_I("对焦拍照:%d",photo_setup);
                 LOG_I("对焦拍照:%d",photo_setup);
             }
             }
+            DTU_Write("takephotodone");
             ctr_led(OFF);
             ctr_led(OFF);
             rt_pin_write(Motor_EN, 0); //驱动器失能
             rt_pin_write(Motor_EN, 0); //驱动器失能
             beep_set(500000, 0);      //2kzh - 50%
             beep_set(500000, 0);      //2kzh - 50%
@@ -1321,7 +1343,8 @@ static void Ctr_Mortor_entry(void* parameter)
             device_status.autotakepic=0;
             device_status.autotakepic=0;
             photo_setup = 0;
             photo_setup = 0;
             HMI_WRITE("sysTest.switchAutopic.val=%d",0);
             HMI_WRITE("sysTest.switchAutopic.val=%d",0);
-            DTU_Write("takephotodone");
+            //关闭步进电机驱动器电源
+            ctr_lamp(OFF, 0);
          }
          }
         if(device_status.fsl_sw==1)
         if(device_status.fsl_sw==1)
         {
         {

+ 3 - 0
Application_CBD/applications/main.c

@@ -53,8 +53,10 @@ int main(void)
     LOG_I("PCLK1_Frequency  = %d", HAL_RCC_GetPCLK1Freq());
     LOG_I("PCLK1_Frequency  = %d", HAL_RCC_GetPCLK1Freq());
     LOG_I("PCLK2_Frequency  = %d", HAL_RCC_GetPCLK2Freq());
     LOG_I("PCLK2_Frequency  = %d", HAL_RCC_GetPCLK2Freq());
     Beep_Tip(100);
     Beep_Tip(100);
+
     //读FLASH配置文件,未配置则设置默认配置
     //读FLASH配置文件,未配置则设置默认配置
     Check_ParamConfig();
     Check_ParamConfig();
+    #if ROBOT_EN == 0
     //是否触发固件更新
     //是否触发固件更新
     if(device_status.update_flag==0)
     if(device_status.update_flag==0)
     {
     {
@@ -68,6 +70,7 @@ int main(void)
         Work_Loop_Task();
         Work_Loop_Task();
         /*******************/
         /*******************/
     }
     }
+    #endif
     //看门狗初始化
     //看门狗初始化
      wdt_init();
      wdt_init();
      //打印内存占用
      //打印内存占用

+ 17 - 17
Application_CBD/drivers/board.c

@@ -140,18 +140,18 @@ void HAL_TIM_MspPostInit(TIM_HandleTypeDef* htim)
   /* USER CODE BEGIN TIM3_MspPostInit 0 */
   /* USER CODE BEGIN TIM3_MspPostInit 0 */
 
 
   /* USER CODE END TIM3_MspPostInit 0 */
   /* USER CODE END TIM3_MspPostInit 0 */
-    __HAL_RCC_GPIOB_CLK_ENABLE();
-    /**TIM3 GPIO Configuration
-    PB0     ------> TIM3_CH3
-    PB1     ------> TIM3_CH4
-    PB4     ------> TIM3_CH1
-    */
-    GPIO_InitStruct.Pin = GPIO_PIN_0|GPIO_PIN_1|GPIO_PIN_4;
-    GPIO_InitStruct.Mode = GPIO_MODE_AF_PP;
-    GPIO_InitStruct.Speed = GPIO_SPEED_FREQ_LOW;
-    HAL_GPIO_Init(GPIOB, &GPIO_InitStruct);
+  __HAL_RCC_GPIOC_CLK_ENABLE();
+  /**TIM3 GPIO Configuration
+  PC6     ------> TIM3_CH1
+  PC7     ------> TIM3_CH2
+  PC8     ------> TIM3_CH3
+  */
+  GPIO_InitStruct.Pin = GPIO_PIN_6|GPIO_PIN_7|GPIO_PIN_8;
+  GPIO_InitStruct.Mode = GPIO_MODE_AF_PP;
+  GPIO_InitStruct.Speed = GPIO_SPEED_FREQ_LOW;
+  HAL_GPIO_Init(GPIOC, &GPIO_InitStruct);
 
 
-    __HAL_AFIO_REMAP_TIM3_PARTIAL();
+  __HAL_AFIO_REMAP_TIM3_ENABLE();
 
 
   /* USER CODE BEGIN TIM3_MspPostInit 1 */
   /* USER CODE BEGIN TIM3_MspPostInit 1 */
 
 
@@ -188,7 +188,7 @@ static void MX_TIM3_Init(void)
 {
 {
 
 
   /* USER CODE BEGIN TIM3_Init 0 */
   /* USER CODE BEGIN TIM3_Init 0 */
-    HAL_TIM_Base_MspInit(&htim3);
+
   /* USER CODE END TIM3_Init 0 */
   /* USER CODE END TIM3_Init 0 */
 
 
   TIM_ClockConfigTypeDef sClockSourceConfig = {0};
   TIM_ClockConfigTypeDef sClockSourceConfig = {0};
@@ -199,9 +199,9 @@ static void MX_TIM3_Init(void)
 
 
   /* USER CODE END TIM3_Init 1 */
   /* USER CODE END TIM3_Init 1 */
   htim3.Instance = TIM3;
   htim3.Instance = TIM3;
-  htim3.Init.Prescaler = 72;
+  htim3.Init.Prescaler = 72-1;
   htim3.Init.CounterMode = TIM_COUNTERMODE_UP;
   htim3.Init.CounterMode = TIM_COUNTERMODE_UP;
-  htim3.Init.Period = 1000;
+  htim3.Init.Period = 500-1;
   htim3.Init.ClockDivision = TIM_CLOCKDIVISION_DIV1;
   htim3.Init.ClockDivision = TIM_CLOCKDIVISION_DIV1;
   htim3.Init.AutoReloadPreload = TIM_AUTORELOAD_PRELOAD_ENABLE;
   htim3.Init.AutoReloadPreload = TIM_AUTORELOAD_PRELOAD_ENABLE;
   if (HAL_TIM_Base_Init(&htim3) != HAL_OK)
   if (HAL_TIM_Base_Init(&htim3) != HAL_OK)
@@ -224,18 +224,18 @@ static void MX_TIM3_Init(void)
     Error_Handler();
     Error_Handler();
   }
   }
   sConfigOC.OCMode = TIM_OCMODE_PWM1;
   sConfigOC.OCMode = TIM_OCMODE_PWM1;
-  sConfigOC.Pulse = 100;
+  sConfigOC.Pulse = 0;
   sConfigOC.OCPolarity = TIM_OCPOLARITY_HIGH;
   sConfigOC.OCPolarity = TIM_OCPOLARITY_HIGH;
   sConfigOC.OCFastMode = TIM_OCFAST_DISABLE;
   sConfigOC.OCFastMode = TIM_OCFAST_DISABLE;
   if (HAL_TIM_PWM_ConfigChannel(&htim3, &sConfigOC, TIM_CHANNEL_1) != HAL_OK)
   if (HAL_TIM_PWM_ConfigChannel(&htim3, &sConfigOC, TIM_CHANNEL_1) != HAL_OK)
   {
   {
     Error_Handler();
     Error_Handler();
   }
   }
-  if (HAL_TIM_PWM_ConfigChannel(&htim3, &sConfigOC, TIM_CHANNEL_3) != HAL_OK)
+  if (HAL_TIM_PWM_ConfigChannel(&htim3, &sConfigOC, TIM_CHANNEL_2) != HAL_OK)
   {
   {
     Error_Handler();
     Error_Handler();
   }
   }
-  if (HAL_TIM_PWM_ConfigChannel(&htim3, &sConfigOC, TIM_CHANNEL_4) != HAL_OK)
+  if (HAL_TIM_PWM_ConfigChannel(&htim3, &sConfigOC, TIM_CHANNEL_3) != HAL_OK)
   {
   {
     Error_Handler();
     Error_Handler();
   }
   }

+ 1 - 1
CBD_FOTA_BootLoader/.settings/language.settings.xml

@@ -5,7 +5,7 @@
 			<provider copy-of="extension" id="org.eclipse.cdt.ui.UserLanguageSettingsProvider"/>
 			<provider copy-of="extension" id="org.eclipse.cdt.ui.UserLanguageSettingsProvider"/>
 			<provider-reference id="org.eclipse.cdt.core.ReferencedProjectsLanguageSettingsProvider" ref="shared-provider"/>
 			<provider-reference id="org.eclipse.cdt.core.ReferencedProjectsLanguageSettingsProvider" ref="shared-provider"/>
 			<provider-reference id="org.eclipse.cdt.managedbuilder.core.MBSLanguageSettingsProvider" ref="shared-provider"/>
 			<provider-reference id="org.eclipse.cdt.managedbuilder.core.MBSLanguageSettingsProvider" ref="shared-provider"/>
-			<provider class="org.eclipse.cdt.managedbuilder.language.settings.providers.GCCBuiltinSpecsDetector" console="false" env-hash="1369961777221034186" id="ilg.gnuarmeclipse.managedbuild.cross.GCCBuiltinSpecsDetector" keep-relative-paths="false" name="CDT ARM Cross GCC Built-in Compiler Settings " parameter="${COMMAND} ${FLAGS} ${cross_toolchain_flags} -E -P -v -dD &quot;${INPUTS}&quot;" prefer-non-shared="true">
+			<provider class="org.eclipse.cdt.managedbuilder.language.settings.providers.GCCBuiltinSpecsDetector" console="false" env-hash="1370230865913647974" id="ilg.gnuarmeclipse.managedbuild.cross.GCCBuiltinSpecsDetector" keep-relative-paths="false" name="CDT ARM Cross GCC Built-in Compiler Settings " parameter="${COMMAND} ${FLAGS} ${cross_toolchain_flags} -E -P -v -dD &quot;${INPUTS}&quot;" prefer-non-shared="true">
 				<language-scope id="org.eclipse.cdt.core.gcc"/>
 				<language-scope id="org.eclipse.cdt.core.gcc"/>
 				<language-scope id="org.eclipse.cdt.core.g++"/>
 				<language-scope id="org.eclipse.cdt.core.g++"/>
 			</provider>
 			</provider>