Merge pull request #19 from JerrySkywalker/dev

A fully functional version specified for training launch pad (preview version) only

Author: CkovMk

d_mk66f18/app_menu_port.h

@@ -63,40 +63,40 @@ extern "C"
 #define HITSIC_MENU_BUTTON_5DIR_BSP_INIT  \
     {                                     \
         {                                 \
-    	GPIO_KEY_BTOK_GPIO,  \
-		GPIO_KEY_BTOK_PIN,   \
+            RTEPIN_DIGITAL_BUTTON_OK_GPIO, \
+            RTEPIN_DIGITAL_BUTTON_OK_PIN,   \
             kPORT_InterruptOrDMADisabled, \
             0,                            \
             BUTTON_STAT_NONE,             \
             NULL,                         \
         },                                \
         {                                 \
-        	GPIO_KEY_BTUP_GPIO,  \
-			GPIO_KEY_BTUP_PIN,   \
+        	RTEPIN_DIGITAL_BUTTON_UP_GPIO,  \
+			RTEPIN_DIGITAL_BUTTON_UP_PIN,   \
             kPORT_InterruptOrDMADisabled, \
             0,                            \
             BUTTON_STAT_NONE,             \
             NULL,                         \
         },                                \
         {                                 \
-        	GPIO_KEY_BTDN_GPIO,  \
-			GPIO_KEY_BTDN_PIN,   \
+        	RTEPIN_DIGITAL_BUTTON_DN_GPIO,  \
+			RTEPIN_DIGITAL_BUTTON_DN_PIN,   \
             kPORT_InterruptOrDMADisabled, \
             0,                            \
             BUTTON_STAT_NONE,             \
             NULL,                         \
         },                                \
         {                                 \
-        	GPIO_KEY_BTLF_GPIO,  \
-			GPIO_KEY_BTLF_PIN,   \
+        	RTEPIN_DIGITAL_BUTTON_LF_GPIO,  \
+			RTEPIN_DIGITAL_BUTTON_LF_PIN,   \
             kPORT_InterruptOrDMADisabled, \
             0,                            \
             BUTTON_STAT_NONE,             \
             NULL,                         \
         },                                \
         {                                 \
-        	GPIO_KEY_BTRT_GPIO,  \
-			GPIO_KEY_BTRT_PIN,   \
+        	RTEPIN_DIGITAL_BUTTON_RT_GPIO,  \
+			RTEPIN_DIGITAL_BUTTON_RT_PIN,   \
             kPORT_InterruptOrDMADisabled, \
             0,                            \
             BUTTON_STAT_NONE,             \

d_mk66f18/drv_disp_ssd1306_port.hpp

@@ -30,8 +30,8 @@
 #include "sys_pitmgr.hpp"
 #include "pin_mux.h"
 
-#define HITSIC_DISP_SSD1306_FLIP_X (0U)
-#define HITSIC_DISP_SSD1306_FLIP_Y (0U)
+#define HITSIC_DISP_SSD1306_FLIP_X (1U)
+#define HITSIC_DISP_SSD1306_FLIP_Y (1U)
 
 #define OLED_SPI_BASE			SPI0
 #define OLED_SPI_CLKFREQ 		CLOCK_GetFreq(DSPI0_CLK_SRC)
@@ -42,22 +42,34 @@
 
 inline void DISP_SSD1306_gpioSetRST(uint8_t x)
 {
-	GPIO_PinWrite(GPIO_OLED_RST_GPIO, GPIO_OLED_RST_PIN, x);
+	GPIO_PinWrite(RTEPIN_BASIC_OLED_RST_GPIO, RTEPIN_BASIC_OLED_RST_PIN, x);
+	//GPIO_PinWrite(GPIOA, 10, x);
 }
 
 inline void DISP_SSD1306_gpioSetD_C(uint8_t x)
 {
-	GPIO_PinWrite(GPIO_OLED_D_C_GPIO, GPIO_OLED_D_C_PIN, x);
+	GPIO_PinWrite(RTEPIN_BASIC_OLED_D_C_GPIO, RTEPIN_BASIC_OLED_D_C_PIN, x);
+    //GPIO_PinWrite(GPIOA, 11, x);
+}
+
+//内部使用用户无需调用
+inline void OLED_SCL(uint8_t data)
+{
+    GPIO_PinWrite(RTEPIN_BASIC_OLED_SCK_GPIO, RTEPIN_BASIC_OLED_SCK_PIN, data);
+    //GPIO_PinWrite(GPIOA, 15, data);
+}
+//内部使用用户无需调用
+inline void OLED_SDA(uint8_t data)
+{
+    GPIO_PinWrite(RTEPIN_BASIC_OLED_SOT_GPIO, RTEPIN_BASIC_OLED_SOT_PIN, data);
+    //GPIO_PinWrite(GPIOA, 16, data);
 }
 
 inline void DISP_SSD1306_delay_ms(uint32_t ms)
 {
 	for(int i = 0; i < ms; ++i)
 	{
-		for(int j = 0; j < 1000; ++j)
-		{
-			__asm volatile ("nop");
-		}
+        SDK_DelayAtLeastUs(1000,CLOCK_GetFreq(kCLOCK_CoreSysClk));
 	}
 }
 
@@ -88,15 +100,34 @@ inline void DISP_SSD1306_delay_ms(uint32_t ms)
 //}
 inline void DISP_SSD1306_spiWrite(uint8_t data)
 {
-	static dspi_transfer_t oled_spi_xfer =
-		{
-			.txData = NULL,
-			.rxData = NULL,
-			.dataSize = 1,
-			.configFlags = OLED_SPI_MasterCtarn | OLED_SPI_MasterPcsn | kDSPI_MasterPcsContinuous,
-		};
-	oled_spi_xfer.txData = &data;
-	DSPI_MasterTransferBlocking(OLED_SPI_BASE, &oled_spi_xfer);
+//	static dspi_transfer_t oled_spi_xfer =
+//		{
+//			.txData = NULL,
+//			.rxData = NULL,
+//			.dataSize = 1,
+//			.configFlags = OLED_SPI_MasterCtarn | OLED_SPI_MasterPcsn | kDSPI_MasterPcsContinuous,
+//		};
+//	oled_spi_xfer.txData = &data;
+//	DSPI_MasterTransferBlocking(OLED_SPI_BASE, &oled_spi_xfer);
+
+    uint8_t i=8;
+
+    OLED_SCL(0);;
+
+    while(i--)
+    {
+        if(data&0x80){OLED_SDA(1);}
+        else{OLED_SDA(0);}
+
+        //SDK_DelayAtLeastUs(2,CLOCK_GetFreq(kCLOCK_CoreSysClk));
+        OLED_SCL(1);
+
+        //SDK_DelayAtLeastUs(3,CLOCK_GetFreq(kCLOCK_CoreSysClk));
+        OLED_SCL(0);
+        data<<=1;
+    }
+
+
 }
 
 

utilities/drv_ftfx_flash.h

@@ -114,18 +114,18 @@ extern "C" {
 
 
 
-	/**
-	 * @brief   flash扇区擦除
-	 *
-	 * @param  {uint8_t*} dst     : 读出数据的目标地址
-	 * @param  {uint32_t} sectors : 扇区号，0是k66倒数一块扇区，1是倒数第2块扇区，以此类推
-	 * @return {status_t}         : 错误代码
-	 * @SampleUsage		status_t result;
-	 *					uint8_t a[4096] = {1};
-	 *					uint8_t b[4096] = {0};
-	 *					result = FLASH_SectorWrite(a,0);
-	 *					result = FLASH_SectorRead(b,0);
-	 */
+    /**
+     * @brief   flash扇区擦除
+     *
+     * @param  {uint8_t*} dst     : 读出数据的目标地址
+     * @param  {uint32_t} sectors : 扇区号，0是k66倒数一块扇区，1是倒数第2块扇区，以此类推
+     * @return {status_t}         : 错误代码
+     * @SampleUsage		status_t result;
+     *					uint8_t a[4096] = {1};
+     *					uint8_t b[4096] = {0};
+     *					result = FLASH_SectorWrite(a,0);
+     *					result = FLASH_SectorRead(b,0);
+     */
 	status_t FLASH_SectorErase(uint32_t _sect);