Skip to content

Commit 2ef278c

Browse files
committed
增加维护人信息
1 parent 0718e87 commit 2ef278c

File tree

5 files changed

+34
-20
lines changed

5 files changed

+34
-20
lines changed

README.md

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,17 @@
88

99
| 文件 | 说明 |
1010
| ---------------- | ------------------------------- |
11+
| adc_vol_sample.c | 使用 ADC 设备转换电压数据 |
12+
| hwtimer_sample.c | 使用 硬件定时器定时 |
1113
| i2c_aht10_sample.c | 使用 i2c 设备获取 aht10 温湿度传感器数据 |
14+
| iwdg_sample.c | 看门狗设备使用示例 |
15+
| led_blink_sample.c | 使用 pin 设备控制 LED 闪烁 |
1216
| pin_beep_sample.c | 使用 pin 设备控制蜂鸣器 |
13-
| uart_sample.c | 使用 serial 设备收发数据 |
17+
| pwm_led_sample.c | 使用 pwm 设备控制 LED 的亮度 |
18+
| rtc_sample.c | 使用 rtc 设备设置年月日时分秒信息 |
19+
| sd_sample.c | 块设备 SD 卡使用示例 |
1420
| spi_w25q_sample.c | 使用 spi 设备读取 W25Q ID |
21+
| uart_sample.c | 使用 serial 设备收发数据 |
1522

1623
### 1.2 许可证
1724

@@ -45,5 +52,5 @@ RT-Thread online packages
4552

4653
## 5、联系方式 & 感谢
4754

48-
* 维护:name
49-
* 主页:https://github.com/RT-Thread-packages/peripheral-sample.git
55+
* 维护:misonyo
56+
* 主页:https://github.com/misonyo

iwdg_sample.c

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ static void idle_hook(void)
3131

3232
static int iwdg_sample(int argc, char *argv[])
3333
{
34-
rt_err_t result = RT_EOK;
34+
rt_err_t ret = RT_EOK;
3535
rt_uint32_t timeout = 1000; /* 溢出时间 */
3636
char device_name[RT_NAME_MAX];
3737

@@ -52,23 +52,23 @@ static int iwdg_sample(int argc, char *argv[])
5252
return RT_ERROR;
5353
}
5454
/* 初始化设备 */
55-
result = rt_device_init(wdg_dev);
56-
if (result != RT_EOK)
55+
ret = rt_device_init(wdg_dev);
56+
if (ret != RT_EOK)
5757
{
5858
rt_kprintf("initialize %s failed!\n", device_name);
5959
return RT_ERROR;
6060
}
6161
/* 设置看门狗溢出时间 */
62-
result = rt_device_control(wdg_dev, RT_DEVICE_CTRL_WDT_SET_TIMEOUT, (void *)timeout);
63-
if (result != RT_EOK)
62+
ret = rt_device_control(wdg_dev, RT_DEVICE_CTRL_WDT_SET_TIMEOUT, (void *)timeout);
63+
if (ret != RT_EOK)
6464
{
6565
rt_kprintf("set %s timeout failed!\n", device_name);
6666
return RT_ERROR;
6767
}
6868
/* 设置空闲线程回调函数 */
6969
rt_thread_idle_sethook(idle_hook);
7070

71-
return result;
71+
return ret;
7272
}
7373
/* 导出到 msh 命令列表中 */
7474
MSH_CMD_EXPORT(iwdg_sample, iwdg sample);

led_blink_sample.c

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,9 +47,10 @@ static void led_entry(void *parameter)
4747
}
4848
}
4949

50-
static void led_sample(int argc, char *argv[])
50+
static int led_sample(int argc, char *argv[])
5151
{
5252
rt_thread_t tid;
53+
rt_err_t ret = RT_EOK;
5354

5455
/* 判断命令行参数是否给定了PIN脚编号 */
5556
if (argc == 2)
@@ -71,6 +72,12 @@ static void led_sample(int argc, char *argv[])
7172
{
7273
rt_thread_startup(tid);
7374
}
75+
else
76+
{
77+
ret = RT_ERROR;
78+
}
79+
80+
return ret;
7481
}
7582
/* 导出到 msh 命令列表中 */
7683
MSH_CMD_EXPORT(led_sample, led sample);

pwm_led_sample.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ static int pwm_led_sample(int argc, char *argv[])
8888
rt_thread_startup(tid);
8989
}
9090

91-
return 0;
91+
return RT_EOK;
9292
}
9393
/* 导出到 msh 命令列表中 */
9494
MSH_CMD_EXPORT(pwm_led_sample, pwm sample);

sd_sample.c

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
* 2018-09-25 misonyo first edition.
99
*/
1010
/*
11-
* 程序清单:这是一个通过SD卡设备的使用例程
11+
* 程序清单:这是一个SD卡设备的使用例程
1212
* 例程导出了 sd_sample 命令到控制终端
1313
* 命令调用格式:sd_sample sd0
1414
* 命令解释:命令第二个参数是要使用的SD设备的名称,为空则使用例程默认的SD设备。
@@ -32,9 +32,9 @@ void fill_buffer(rt_uint8_t *buff, rt_uint32_t buff_length)
3232
}
3333
}
3434

35-
static rt_err_t sd_sample(int argc, char *argv[])
35+
static int sd_sample(int argc, char *argv[])
3636
{
37-
rt_err_t result;
37+
rt_err_t ret;
3838
rt_device_t sd_device;
3939
char sd_name[RT_NAME_MAX];
4040
rt_uint8_t *write_buff, *read_buff;
@@ -57,20 +57,20 @@ static rt_err_t sd_sample(int argc, char *argv[])
5757
return RT_ERROR;
5858
}
5959
/* 打开设备 */
60-
result = rt_device_open(sd_device, RT_DEVICE_OFLAG_RDWR);
61-
if (result != RT_EOK)
60+
ret = rt_device_open(sd_device, RT_DEVICE_OFLAG_RDWR);
61+
if (ret != RT_EOK)
6262
{
6363
rt_kprintf("open device %s failed!\n", sd_name);
64-
return result;
64+
return ret;
6565
}
6666

6767
rt_memset(&geo, 0, sizeof(geo));
6868
/* 获取块设备信息 */
69-
result = rt_device_control(sd_device, RT_DEVICE_CTRL_BLK_GETGEOME, &geo);
70-
if (result != RT_EOK)
69+
ret = rt_device_control(sd_device, RT_DEVICE_CTRL_BLK_GETGEOME, &geo);
70+
if (ret != RT_EOK)
7171
{
7272
rt_kprintf("control device %s failed!\n", sd_name);
73-
return result;
73+
return ret;
7474
}
7575
rt_kprintf("device information:\n");
7676
rt_kprintf("sector size : %d byte\n", geo.bytes_per_sector);

0 commit comments

Comments
 (0)