修改CubeMX项目名称

Core/Inc/gpio.h

@@ -22,18 +22,17 @@
 #define __GPIO_H__
 
 #ifdef __cplusplus
-extern "C"
+extern "C" {
-{
 #endif
 
 /* Includes ------------------------------------------------------------------*/
 #include "main.h"
 
-  /* USER CODE BEGIN Includes */
+/* USER CODE BEGIN Includes */
 
-  /* USER CODE END Includes */
+/* USER CODE END Includes */
 
-  /* USER CODE BEGIN Private defines */
+/* USER CODE BEGIN Private defines */
   typedef enum
   {
     DI_1,
@@ -53,16 +52,17 @@ extern "C"
     DO_EN,
     DO_MAX,
   } gpio_do_e;
-  /* USER CODE END Private defines */
+/* USER CODE END Private defines */
 
-  void MX_GPIO_Init(void);
+void MX_GPIO_Init(void);
 
-  /* USER CODE BEGIN Prototypes */
+/* USER CODE BEGIN Prototypes */
   extern void gpio_do_test(uint8_t gpio_num, GPIO_PinState state);
   extern GPIO_PinState gpio_di_test(uint8_t gpio_num);
-  /* USER CODE END Prototypes */
+/* USER CODE END Prototypes */
 
 #ifdef __cplusplus
 }
 #endif
 #endif /*__ GPIO_H__ */
+

Core/Src/freertos.c

@@ -61,17 +61,17 @@ osThreadId gpio_di_do_taskHandle;
 extern float current_buff[2];
 /* USER CODE END FunctionPrototypes */
 
-void start_tcp_task(void const *argument);
+void start_tcp_task(void const * argument);
-void start_led_toggle_task(void const *argument);
+void start_led_toggle_task(void const * argument);
-void start_dac_task(void const *argument);
+void start_dac_task(void const * argument);
-void start_adc_task(void const *argument);
+void start_adc_task(void const * argument);
-void start_gpio_di_do_task(void const *argument);
+void start_gpio_di_do_task(void const * argument);
 
 extern void MX_LWIP_Init(void);
 void MX_FREERTOS_Init(void); /* (MISRA C 2004 rule 8.1) */
 
 /* GetIdleTaskMemory prototype (linked to static allocation support) */
-void vApplicationGetIdleTaskMemory(StaticTask_t **ppxIdleTaskTCBBuffer, StackType_t **ppxIdleTaskStackBuffer, uint32_t *pulIdleTaskStackSize);
+void vApplicationGetIdleTaskMemory( StaticTask_t **ppxIdleTaskTCBBuffer, StackType_t **ppxIdleTaskStackBuffer, uint32_t *pulIdleTaskStackSize );
 
 /* USER CODE BEGIN GET_IDLE_TASK_MEMORY */
 static StaticTask_t xIdleTaskTCBBuffer;
@@ -87,12 +87,11 @@ void vApplicationGetIdleTaskMemory(StaticTask_t **ppxIdleTaskTCBBuffer, StackTyp
 /* USER CODE END GET_IDLE_TASK_MEMORY */
 
 /**
- * @brief  FreeRTOS initialization
+  * @brief  FreeRTOS initialization
- * @param  None
+  * @param  None
- * @retval None
+  * @retval None
- */
+  */
-void MX_FREERTOS_Init(void)
+void MX_FREERTOS_Init(void) {
-{
   /* USER CODE BEGIN Init */
 
   /* USER CODE END Init */
@@ -137,6 +136,7 @@ void MX_FREERTOS_Init(void)
   /* USER CODE BEGIN RTOS_THREADS */
   /* add threads, ... */
   /* USER CODE END RTOS_THREADS */
+
 }
 
 /* USER CODE BEGIN Header_start_tcp_task */
@@ -146,7 +146,7 @@ void MX_FREERTOS_Init(void)
  * @retval None
  */
 /* USER CODE END Header_start_tcp_task */
-void start_tcp_task(void const *argument)
+void start_tcp_task(void const * argument)
 {
   /* init code for LWIP */
   MX_LWIP_Init();
@@ -180,7 +180,7 @@ void start_tcp_task(void const *argument)
  * @retval None
  */
 /* USER CODE END Header_start_led_toggle_task */
-void start_led_toggle_task(void const *argument)
+void start_led_toggle_task(void const * argument)
 {
   /* USER CODE BEGIN start_led_toggle_task */
   /* Infinite loop */
@@ -199,7 +199,7 @@ void start_led_toggle_task(void const *argument)
  * @retval None
  */
 /* USER CODE END Header_start_dac_task */
-void start_dac_task(void const *argument)
+void start_dac_task(void const * argument)
 {
   /* USER CODE BEGIN start_dac_task */
   dac161s997_init();
@@ -221,7 +221,7 @@ void start_dac_task(void const *argument)
  * @retval None
  */
 /* USER CODE END Header_start_adc_task */
-void start_adc_task(void const *argument)
+void start_adc_task(void const * argument)
 {
   /* USER CODE BEGIN start_adc_task */
   ad7124_setup();
@@ -253,7 +253,7 @@ void start_adc_task(void const *argument)
  * @retval None
  */
 /* USER CODE END Header_start_gpio_di_do_task */
-void start_gpio_di_do_task(void const *argument)
+void start_gpio_di_do_task(void const * argument)
 {
   /* USER CODE BEGIN start_gpio_di_do_task */
   /* Infinite loop */

Core/Src/gpio.c

@@ -33,12 +33,12 @@
 /* USER CODE END 1 */
 
 /** Configure pins as
- * Analog
+        * Analog
- * Input
+        * Input
- * Output
+        * Output
- * EVENT_OUT
+        * EVENT_OUT
- * EXTI
+        * EXTI
- */
+*/
 void MX_GPIO_Init(void)
 {
 
@@ -56,13 +56,15 @@ void MX_GPIO_Init(void)
   HAL_GPIO_WritePin(ETH_RESET_GPIO_Port, ETH_RESET_Pin, GPIO_PIN_SET);
 
   /*Configure GPIO pin Output Level */
-  HAL_GPIO_WritePin(GPIOB, LED3_R_Pin | LED3_G_Pin | DAC1_CS_Pin | DAC2_CS_Pin, GPIO_PIN_SET);
+  HAL_GPIO_WritePin(GPIOB, LED3_R_Pin|LED3_G_Pin|DAC1_CS_Pin|DAC2_CS_Pin, GPIO_PIN_SET);
 
   /*Configure GPIO pin Output Level */
-  HAL_GPIO_WritePin(GPIOE, LED3_Y_Pin | LED2_R_Pin | LED2_G_Pin | LED2_Y_Pin | ADC_CS_Pin | AD7124_SYNC_Pin, GPIO_PIN_SET);
+  HAL_GPIO_WritePin(GPIOE, LED3_Y_Pin|LED2_R_Pin|LED2_G_Pin|LED2_Y_Pin
+                          |ADC_CS_Pin|AD7124_SYNC_Pin, GPIO_PIN_SET);
 
   /*Configure GPIO pin Output Level */
-  HAL_GPIO_WritePin(GPIOD, DO_CH4_Pin | DO_CH3_Pin | DO_CH1_Pin | DO_CH2_Pin | DO_EN_Pin | HART1_RTS_Pin | HART2_RTS_Pin, GPIO_PIN_SET);
+  HAL_GPIO_WritePin(GPIOD, DO_CH4_Pin|DO_CH3_Pin|DO_CH1_Pin|DO_CH2_Pin
+                          |DO_EN_Pin|HART1_RTS_Pin|HART2_RTS_Pin, GPIO_PIN_SET);
 
   /*Configure GPIO pin Output Level */
   HAL_GPIO_WritePin(HART1_RST_GPIO_Port, HART1_RST_Pin, GPIO_PIN_SET);
@@ -71,7 +73,7 @@ void MX_GPIO_Init(void)
   HAL_GPIO_WritePin(HART2_RST_GPIO_Port, HART2_RST_Pin, GPIO_PIN_RESET);
 
   /*Configure GPIO pins : PEPin PEPin */
-  GPIO_InitStruct.Pin = DI_CH5_Pin | DI_CH6_Pin;
+  GPIO_InitStruct.Pin = DI_CH5_Pin|DI_CH6_Pin;
   GPIO_InitStruct.Mode = GPIO_MODE_INPUT;
   GPIO_InitStruct.Pull = GPIO_PULLUP;
   HAL_GPIO_Init(GPIOE, &GPIO_InitStruct);
@@ -84,35 +86,35 @@ void MX_GPIO_Init(void)
   HAL_GPIO_Init(ETH_RESET_GPIO_Port, &GPIO_InitStruct);
 
   /*Configure GPIO pins : PBPin PBPin */
-  GPIO_InitStruct.Pin = LED3_R_Pin | LED3_G_Pin;
+  GPIO_InitStruct.Pin = LED3_R_Pin|LED3_G_Pin;
   GPIO_InitStruct.Mode = GPIO_MODE_OUTPUT_PP;
   GPIO_InitStruct.Pull = GPIO_PULLUP;
   GPIO_InitStruct.Speed = GPIO_SPEED_FREQ_MEDIUM;
   HAL_GPIO_Init(GPIOB, &GPIO_InitStruct);
 
   /*Configure GPIO pins : PEPin PEPin PEPin PEPin */
-  GPIO_InitStruct.Pin = LED3_Y_Pin | LED2_R_Pin | LED2_G_Pin | LED2_Y_Pin;
+  GPIO_InitStruct.Pin = LED3_Y_Pin|LED2_R_Pin|LED2_G_Pin|LED2_Y_Pin;
   GPIO_InitStruct.Mode = GPIO_MODE_OUTPUT_PP;
   GPIO_InitStruct.Pull = GPIO_PULLUP;
   GPIO_InitStruct.Speed = GPIO_SPEED_FREQ_MEDIUM;
   HAL_GPIO_Init(GPIOE, &GPIO_InitStruct);
 
   /*Configure GPIO pins : PDPin PDPin PDPin PDPin */
-  GPIO_InitStruct.Pin = DO_CH4_Pin | DO_CH3_Pin | DO_CH1_Pin | DO_CH2_Pin;
+  GPIO_InitStruct.Pin = DO_CH4_Pin|DO_CH3_Pin|DO_CH1_Pin|DO_CH2_Pin;
   GPIO_InitStruct.Mode = GPIO_MODE_OUTPUT_PP;
   GPIO_InitStruct.Pull = GPIO_NOPULL;
   GPIO_InitStruct.Speed = GPIO_SPEED_FREQ_VERY_HIGH;
   HAL_GPIO_Init(GPIOD, &GPIO_InitStruct);
 
   /*Configure GPIO pins : PDPin PDPin PDPin PDPin */
-  GPIO_InitStruct.Pin = DO_EN_Pin | HART1_RTS_Pin | HART2_RTS_Pin | HART2_RST_Pin;
+  GPIO_InitStruct.Pin = DO_EN_Pin|HART1_RTS_Pin|HART2_RTS_Pin|HART2_RST_Pin;
   GPIO_InitStruct.Mode = GPIO_MODE_OUTPUT_PP;
   GPIO_InitStruct.Pull = GPIO_PULLUP;
   GPIO_InitStruct.Speed = GPIO_SPEED_FREQ_VERY_HIGH;
   HAL_GPIO_Init(GPIOD, &GPIO_InitStruct);
 
   /*Configure GPIO pins : PCPin PCPin */
-  GPIO_InitStruct.Pin = DI_CH1_Pin | DI_CH2_Pin;
+  GPIO_InitStruct.Pin = DI_CH1_Pin|DI_CH2_Pin;
   GPIO_InitStruct.Mode = GPIO_MODE_INPUT;
   GPIO_InitStruct.Pull = GPIO_PULLUP;
   HAL_GPIO_Init(GPIOC, &GPIO_InitStruct);
@@ -125,19 +127,19 @@ void MX_GPIO_Init(void)
   HAL_GPIO_Init(HART1_RST_GPIO_Port, &GPIO_InitStruct);
 
   /*Configure GPIO pins : PAPin PAPin */
-  GPIO_InitStruct.Pin = DI_CH3_Pin | DI_CH4_Pin;
+  GPIO_InitStruct.Pin = DI_CH3_Pin|DI_CH4_Pin;
   GPIO_InitStruct.Mode = GPIO_MODE_INPUT;
   GPIO_InitStruct.Pull = GPIO_PULLUP;
   HAL_GPIO_Init(GPIOA, &GPIO_InitStruct);
 
   /*Configure GPIO pins : PDPin PDPin */
-  GPIO_InitStruct.Pin = HART1_OCD_Pin | HART2_OCD_Pin;
+  GPIO_InitStruct.Pin = HART1_OCD_Pin|HART2_OCD_Pin;
   GPIO_InitStruct.Mode = GPIO_MODE_IT_FALLING;
   GPIO_InitStruct.Pull = GPIO_PULLUP;
   HAL_GPIO_Init(GPIOD, &GPIO_InitStruct);
 
   /*Configure GPIO pins : PBPin PBPin */
-  GPIO_InitStruct.Pin = DAC1_CS_Pin | DAC2_CS_Pin;
+  GPIO_InitStruct.Pin = DAC1_CS_Pin|DAC2_CS_Pin;
   GPIO_InitStruct.Mode = GPIO_MODE_OUTPUT_PP;
   GPIO_InitStruct.Pull = GPIO_PULLUP;
   GPIO_InitStruct.Speed = GPIO_SPEED_FREQ_VERY_HIGH;
@@ -163,6 +165,7 @@ void MX_GPIO_Init(void)
 
   HAL_NVIC_SetPriority(EXTI3_IRQn, 5, 0);
   HAL_NVIC_EnableIRQ(EXTI3_IRQn);
+
 }
 
 /* USER CODE BEGIN 2 */

MDK-ARM/RTE/_semi-finished_product_testing/RTE_Components.h

@@ -0,0 +1,21 @@
+
+/*
+ * Auto generated Run-Time-Environment Configuration File
+ *      *** Do not modify ! ***
+ *
+ * Project: 'semi-finished_product_testing' 
+ * Target:  'semi-finished_product_testing' 
+ */
+
+#ifndef RTE_COMPONENTS_H
+#define RTE_COMPONENTS_H
+
+
+/*
+ * Define the Device Header File: 
+ */
+#define CMSIS_device_header "stm32f4xx.h"
+
+
+
+#endif /* RTE_COMPONENTS_H */

MDK-ARM/semi-finished_product_testing/semi-finished_product_testing.sct

@@ -0,0 +1,19 @@
+; *************************************************************
+; *** Scatter-Loading Description File generated by uVision ***
+; *************************************************************
+
+LR_IROM1 0x08000000 0x00100000  {    ; load region size_region
+  ER_IROM1 0x08000000 0x00100000  {  ; load address = execution address
+   *.o (RESET, +First)
+   *(InRoot$$Sections)
+   .ANY (+RO)
+   .ANY (+XO)
+  }
+  RW_IRAM1 0x20000000 0x0001C000  {  ; RW data
+   .ANY (+RW +ZI)
+  }
+  RW_IRAM2 0x2001C000 0x00004000  {
+   .ANY (+RW +ZI)
+  }
+}
+

semi-finished_product_testing.ioc

@@ -552,8 +552,8 @@ ProjectManager.MainLocation=Core/Src
 ProjectManager.NoMain=false
 ProjectManager.PreviousToolchain=
 ProjectManager.ProjectBuild=false
-ProjectManager.ProjectFileName=TEST2.ioc
+ProjectManager.ProjectFileName=semi-finished_product_testing.ioc
-ProjectManager.ProjectName=TEST2
+ProjectManager.ProjectName=semi-finished_product_testing
 ProjectManager.ProjectStructure=
 ProjectManager.RegisterCallBack=
 ProjectManager.StackSize=0x400