diff options
| author | inmarket <andrewh@inmarket.com.au> | 2014-08-23 17:56:23 +1000 |
|---|---|---|
| committer | inmarket <andrewh@inmarket.com.au> | 2014-08-23 17:56:23 +1000 |
| commit | e758a60b100913fe7fa82e9751292781c0328a38 (patch) | |
| tree | 7e95c7cde2d9246f98fb006e3683e407468ba9c2 /boards/addons/gdisp/board_SSD1289_stm32f4discovery.h | |
| parent | 2b47a0708602b45b0b5db120a496bf92232aa4b1 (diff) | |
| parent | 0c7c74112e07f612ea5a2da00a5962728225d41f (diff) | |
| download | uGFX-e758a60b100913fe7fa82e9751292781c0328a38.tar.gz uGFX-e758a60b100913fe7fa82e9751292781c0328a38.tar.bz2 uGFX-e758a60b100913fe7fa82e9751292781c0328a38.zip | |
Merge branch 'gdriver' into newmouse
Diffstat (limited to 'boards/addons/gdisp/board_SSD1289_stm32f4discovery.h')
| -rw-r--r-- | boards/addons/gdisp/board_SSD1289_stm32f4discovery.h | 21 |
1 files changed, 11 insertions, 10 deletions
diff --git a/boards/addons/gdisp/board_SSD1289_stm32f4discovery.h b/boards/addons/gdisp/board_SSD1289_stm32f4discovery.h index acbe16c0..6198b73a 100644 --- a/boards/addons/gdisp/board_SSD1289_stm32f4discovery.h +++ b/boards/addons/gdisp/board_SSD1289_stm32f4discovery.h @@ -25,16 +25,17 @@ /* PWM configuration structure. We use timer 3 channel 3 */ static const PWMConfig pwmcfg = { - 100000, /* 100 kHz PWM clock frequency. */ - 100, /* PWM period is 100 cycles. */ - 0, - { - {PWM_OUTPUT_DISABLED, 0}, - {PWM_OUTPUT_DISABLED, 0}, - {PWM_OUTPUT_ACTIVE_HIGH, 0}, - {PWM_OUTPUT_DISABLED, 0} - }, - 0 + 100000, /* 100 kHz PWM clock frequency. */ + 100, /* PWM period is 100 cycles. */ + 0, + { + {PWM_OUTPUT_DISABLED, 0}, + {PWM_OUTPUT_DISABLED, 0}, + {PWM_OUTPUT_ACTIVE_HIGH, 0}, + {PWM_OUTPUT_DISABLED, 0} + }, + 0, + 0 }; static inline void init_board(GDisplay *g) { |