Skip to content

Conversation

@machunyu
Copy link
Contributor

fixes the CoX library's bug, such as xuart xgpio xsysctl

machunyu and others added 18 commits April 21, 2014 10:04
Conflicts:
	CoX/CoX_Peripheral/CoX_Peripheral_NUC4xx/libcox/xPort.h
	CoX/CoX_Peripheral/CoX_Peripheral_NUC4xx/libcox/xdma.c
	CoX/CoX_Peripheral/CoX_Peripheral_Template/inc/xacmp.h
	CoX/CoX_Peripheral/CoX_Peripheral_Template/inc/xadc.h
	CoX/CoX_Peripheral/CoX_Peripheral_Template/inc/xtimer.h
Conflicts:
	CoX/CoX_Peripheral/CoX_Peripheral_STM32F1xx/libcox/xgpio.c
	CoX/CoX_Peripheral/CoX_Peripheral_STM32F1xx/libcox/xuart.c
	CoX/CoX_Peripheral/CoX_Peripheral_STM32F1xx/libcox/xuart.h
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants