noisymime
/
Arduino_STM32
mirror of https://github.com/noisymime/Arduino_STM32.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'lacklustrlabs-TIMER_CCMR1_CC2S_INPUT_TI1'

This commit is contained in:
Roger Clark 2018-01-24 08:02:17 +11:00
parent 6f1429175c 82ee5b1f33
commit 8a18e09161
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
STM32F1/system/libmaple/include/libmaple/timer.h
View File

@ -393,10 +393,10 @@ extern timer_dev timer14;
#define TIMER_CCMR1_OC2FE (1U << TIMER_CCMR1_OC2FE_BIT)
#define TIMER_CCMR1_IC2PSC (0x3 << 10)
#define TIMER_CCMR1_CC2S (0x3 << 8)
#define TIMER_CCMR1_CC2S_OUTPUT (TIMER_CCMR_CCS_OUTPUT << 8)
#define TIMER_CCMR1_CC2S_INPUT_TI1 (TIMER_CCMR_CCS_INPUT_TI1 << 8)
#define TIMER_CCMR1_CC2S_INPUT_TI2 (TIMER_CCMR_CCS_INPUT_TI2 << 8)
#define TIMER_CCMR1_CC2S_INPUT_TRC (TIMER_CCMR_CCS_INPUT_TRC << 8)
#define TIMER_CCMR1_CC2S_OUTPUT (0x0 << 8)
#define TIMER_CCMR1_CC2S_INPUT_TI2 (0x1 << 8)
#define TIMER_CCMR1_CC2S_INPUT_TI1 (0x2 << 8)
#define TIMER_CCMR1_CC2S_INPUT_TRC (0x3 << 8)
#define TIMER_CCMR1_OC1CE (1U << TIMER_CCMR1_OC1CE_BIT)
#define TIMER_CCMR1_OC1M (0x3 << 4)
#define TIMER_CCMR1_IC1F (0xF << 4)