Wangjialin 6db1482cd5 Merge branch 'master' into driver_merge_tmp/merge_pcnt ...

# Conflicts:
#	components/driver/include/driver/periph_ctrl.h

2016-11-23 18:15:54 +08:00

..

main

Merge branch 'master' into driver_merge_tmp/merge_pcnt

2016-11-23 18:15:54 +08:00

Makefile

driver: Add PCNT code

2016-11-21 18:17:07 +08:00