[BSP] stm32f10x can code format

This commit is contained in:
Aubr.Cool 2015-07-07 14:55:17 +08:00
parent b750e11ec1
commit 6fad73c939
2 changed files with 1247 additions and 1039 deletions

View File

@ -41,24 +41,35 @@ static struct canledtype
};
void can_bus_hook(struct rt_can_device *can, struct canledtype *led)
{
if(can->timerinitflag == 1) {
if (can->timerinitflag == 1)
{
rt_pin_write(led->rtd.pin, 0);
} else {
}
else
{
if (can->status.rcvchange == 1 || can->status.sndchange == 1)
{
can->status.rcvchange = 0;
can->status.sndchange = 0;
rt_pin_write(led->rtd.pin, rt_pin_read(led->rtd.pin) ? 0 : 1);
} else {
}
else
{
rt_pin_write(led->rtd.pin, 1);
}
}
if(can->timerinitflag == 1) {
if (can->timerinitflag == 1)
{
rt_pin_write(led->err.pin, 0);
} else {
if(can->status.errcode) {
}
else
{
if (can->status.errcode)
{
rt_pin_write(led->err.pin, 0);
} else {
}
else
{
rt_pin_write(led->err.pin, 1);
}
}
@ -151,7 +162,8 @@ struct rt_can_filter_config filter2 =
.actived = 1,
.items = filter2item,
};
static struct can_app_struct can_data[2] = {
static struct can_app_struct can_data[2] =
{
{
.name = "bxcan1",
.filter = &filter1,
@ -175,7 +187,8 @@ void rt_can_thread_entry(void* parameter)
rt_event_init(&canpara->event, canpara->name, RT_IPC_FLAG_FIFO);
rt_device_open(candev, (RT_DEVICE_OFLAG_RDWR | RT_DEVICE_FLAG_INT_RX | RT_DEVICE_FLAG_INT_TX));
rt_device_control(candev, RT_CAN_CMD_SET_FILTER, canpara->filter);
while(1) {
while (1)
{
if (
rt_event_recv(&canpara->event,
((1 << canpara->filter->items[0].hdr) |
@ -184,30 +197,39 @@ void rt_can_thread_entry(void* parameter)
(1 << canpara->filter->items[3].hdr)),
canpara->eventopt,
RT_WAITING_FOREVER, &e) != RT_EOK
) {
)
{
continue;
}
if(e & (1 << canpara->filter->items[0].hdr)) {
if (e & (1 << canpara->filter->items[0].hdr))
{
msg.hdr = canpara->filter->items[0].hdr;
while (rt_device_read(candev, 0, &msg, sizeof(msg)) == sizeof(msg)) {
while (rt_device_read(candev, 0, &msg, sizeof(msg)) == sizeof(msg))
{
rt_device_write(candev, 0, &msg, sizeof(msg));
}
}
if(e & (1 << canpara->filter->items[1].hdr)) {
if (e & (1 << canpara->filter->items[1].hdr))
{
msg.hdr = canpara->filter->items[1].hdr;
while (rt_device_read(candev, 0, &msg, sizeof(msg)) == sizeof(msg)) {
while (rt_device_read(candev, 0, &msg, sizeof(msg)) == sizeof(msg))
{
rt_device_write(candev, 0, &msg, sizeof(msg));
}
}
if(e & (1 << canpara->filter->items[2].hdr)) {
if (e & (1 << canpara->filter->items[2].hdr))
{
msg.hdr = canpara->filter->items[2].hdr;
while (rt_device_read(candev, 0, &msg, sizeof(msg)) == sizeof(msg)) {
while (rt_device_read(candev, 0, &msg, sizeof(msg)) == sizeof(msg))
{
rt_device_write(candev, 0, &msg, sizeof(msg));
}
}
if(e & (1 << canpara->filter->items[3].hdr)) {
if (e & (1 << canpara->filter->items[3].hdr))
{
msg.hdr = canpara->filter->items[3].hdr;
while (rt_device_read(candev, 0, &msg, sizeof(msg)) == sizeof(msg)) {
while (rt_device_read(candev, 0, &msg, sizeof(msg)) == sizeof(msg))
{
rt_device_write(candev, 0, &msg, sizeof(msg));
}
}

File diff suppressed because it is too large Load Diff