Merge pull request #3 from misonyo/dev

yqiu2018 · web-flow · commit c0ef7b293ae7 · 2018-08-27T15:30:33.000+08:00
[change|修改]fix some bug
diff --git a/i2c/i2c_aht10_sample.c b/i2c/i2c_aht10_sample.c
@@ -26,7 +26,7 @@
 #define AHT10_GET_DATA              0xAC    /* 获取数据命令 */
 
 static struct rt_i2c_bus_device *i2c_bus = RT_NULL;
-static bool initialized = RT_FALSE;        /* 传感器初始化状态 */
+static rt_bool_t initialized = RT_FALSE;        /* 传感器初始化状态 */
 
 /* 写传感器寄存器 */
 static rt_err_t write_reg(struct rt_i2c_bus_device *bus, rt_uint8_t reg, rt_uint8_t *data)
diff --git a/pin/pin_beep_sample.c b/pin/pin_beep_sample.c
@@ -42,7 +42,7 @@ void beep_off(void *args)
     rt_pin_write(BEEP_PIN_NUM, PIN_LOW);
 }
 
-static void pin_sample(void)
+static void pin_beep_sample(void)
 {
     /* 按键0引脚为输入模式 */
     rt_pin_mode(KEY0_PIN_NUM, PIN_MODE_INPUT_PULLUP);
diff --git a/serial/uart_sample.c b/serial/uart_sample.c
@@ -38,7 +38,7 @@ static void serial_thread_entry(void* parameter)
     char str[] = "hello RT-Thread!\r\n";
 
     /* 查找系统中的串口设备 */
-    serial = rt_device_find(UART_NAME);
+    serial = rt_device_find(SAMPLE_UART_NAME);
     
     if (serial != RT_NULL)
     {
diff --git a/spi/spi_w25q_sample.c b/spi/spi_w25q_sample.c
@@ -21,7 +21,7 @@
 #define W25Q_SPI_DEVICE_NAME     "qspi10"
 #endif
 
-static void spi_sample(int argc,char *argv[])
+static void spi_w25q_sample(void)
 {
     struct rt_spi_device *spi_dev_w25q;
     rt_uint8_t w25x_read_id = 0x90;

Original file line number	Diff line number	Diff line change
`@@ -42,7 +42,7 @@ void beep_off(void *args)`
`42`	`42`	`rt_pin_write(BEEP_PIN_NUM, PIN_LOW);`
`43`	`43`	`}`
`44`	`44`
`45`		`-static void pin_sample(void)`
	`45`	`+static void pin_beep_sample(void)`
`46`	`46`	`{`
`47`	`47`	`/* 按键0引脚为输入模式 */`
`48`	`48`	`rt_pin_mode(KEY0_PIN_NUM, PIN_MODE_INPUT_PULLUP);`
Original file line number	Diff line number	Diff line change
`@@ -38,7 +38,7 @@ static void serial_thread_entry(void* parameter)`
`38`	`38`	`char str[] = "hello RT-Thread!\r\n";`
`39`	`39`
`40`	`40`	`/* 查找系统中的串口设备 */`
`41`		`- serial = rt_device_find(UART_NAME);`
	`41`	`+ serial = rt_device_find(SAMPLE_UART_NAME);`
`42`	`42`
`43`	`43`	`if (serial != RT_NULL)`
`44`	`44`	`{`
Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,7 @@`
`21`	`21`	`#define W25Q_SPI_DEVICE_NAME "qspi10"`
`22`	`22`	`#endif`
`23`	`23`
`24`		`-static void spi_sample(int argc,char *argv[])`
	`24`	`+static void spi_w25q_sample(void)`
`25`	`25`	`{`
`26`	`26`	`struct rt_spi_device *spi_dev_w25q;`
`27`	`27`	`rt_uint8_t w25x_read_id = 0x90;`