修改OS

bsp/bsp.h

@@ -13,12 +13,12 @@
 #define __BSP_H__
 
 #include "gpios.h"
-#include "dmas.h"
+// #include "dmas.h"
 // #include "adcs.h"
 // #include "dacs.h"
 // #include "tims.h"
 // #include "pwms.h"
-#include "uarts.h"
+// #include "uarts.h"
 // #include "eeprom.h"
 // #include "spis.h"
 // #include "i2cs.h"

freertos/inc/FreeRTOSConfig.h

@@ -26,7 +26,7 @@
 
 #ifndef FREERTOS_CONFIG_H
 #define FREERTOS_CONFIG_H
-
+#include "main.h"
 /*-----------------------------------------------------------
  * Application specific definitions.
  *
@@ -42,7 +42,7 @@
 #define configUSE_PREEMPTION 1
 #define configUSE_IDLE_HOOK 0
 #define configUSE_TICK_HOOK 0
-#define configCPU_CLOCK_HZ ((unsigned long)72000000)
+#define configCPU_CLOCK_HZ ((unsigned long)SystemCoreClock)
 #define configTICK_RATE_HZ ((TickType_t)1000)
 #define configMAX_PRIORITIES (5)
 #define configMINIMAL_STACK_SIZE ((unsigned short)128)

lib/inc/storage.h

@@ -7,7 +7,7 @@
  */
 #ifndef __STORAGE_H__
 #define __STORAGE_H__
-
+#include "sys.h"
 #include "lib.h"
 
 typedef struct
@@ -34,7 +34,7 @@ typedef struct
         BOOL(*read)
         (uint32_t addr, uint8_t *buf, uint16_t size);
         BOOL(*write)
-        (uint32_t addr,  uint8_t * buf, uint16_t size);
+        (uint32_t addr, uint8_t *buf, uint16_t size);
         BOOL(*erase_page)
         (uint32_t page);
     } ops;

sys.h

@@ -18,6 +18,15 @@
 #define LOCK() __disable_irq()    ///< 系统关全局中断
 #define UNLOCK() __enable_irq()   ///< 系统开全局中断
 
+#ifndef __NOP
+
+/**
+  \brief   No Operation
+  \details No Operation does nothing. This instruction can be used for code alignment purposes.
+ */
+#define __NOP() __ASM volatile("nop")
+#endif
+
 typedef struct
 {
     uint32_t pll_source;