gitea/g0b1vetx-board
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of https://gitee.com/zyjzjs/g0b1vetx-board

Browse Source 
# Conflicts:
#	Board/data.c
#	Board/data.h
#	Board/di-board.c
#	Board/di-board.h
#	MDK-ARM/GB01VETx.uvguix.Memory
This commit is contained in:
2584532475@qq.com committed 2024-05-31 17:12:42 +08:00
2 parents 4a963bd78c 3a537f633c
commit 555025be10
5 files changed
+142 -1
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

Board/di-board.c
+16
View File
@@ -14,22 +14,38 @@ DIState_t MX_Din_Pull (int chann)
}
case 2:
{
<<<<<<< HEAD
ret = (DIState_t) HAL_GPIO_ReadPin (DI2_GPIO_Port, DI2_Pin);
=======
ret = (DIState_t)HAL_GPIO_ReadPin (DI2_GPIO_Port, DI2_Pin);
>>>>>>> 3a537f633c99d30fa3fe5d01105f6525a48d3d72
break;
}
case 3:
{
<<<<<<< HEAD
ret = (DIState_t) HAL_GPIO_ReadPin (DI3_GPIO_Port, DI3_Pin);
=======
ret = (DIState_t)HAL_GPIO_ReadPin (DI3_GPIO_Port, DI3_Pin);
>>>>>>> 3a537f633c99d30fa3fe5d01105f6525a48d3d72
break;
}
case 4:
{
<<<<<<< HEAD
ret = (DIState_t) HAL_GPIO_ReadPin (DI4_GPIO_Port, DI4_Pin);
=======
ret = (DIState_t)HAL_GPIO_ReadPin (DI4_GPIO_Port, DI4_Pin);
>>>>>>> 3a537f633c99d30fa3fe5d01105f6525a48d3d72
break;
}
case 5:
{
<<<<<<< HEAD
ret = (DIState_t) HAL_GPIO_ReadPin (DI5_GPIO_Port, DI5_Pin);
=======
ret = (DIState_t)HAL_GPIO_ReadPin (DI5_GPIO_Port, DI5_Pin);
>>>>>>> 3a537f633c99d30fa3fe5d01105f6525a48d3d72
break;
}
case 6: