diff options
| author | William Chang <william@factual.com> | 2019-11-20 22:17:07 -0800 |
|---|---|---|
| committer | William Chang <william@factual.com> | 2019-11-20 22:17:07 -0800 |
| commit | e7f4d56592b3975c38af329e77b4efd9108495e8 (patch) | |
| tree | 0a416bccbf70bfdbdb9ffcdb3bf136b47378c014 /drivers/qwiic/qwiic.c | |
| parent | 71493b2f9bbd5f3d18373c518fa14ccafcbf48fc (diff) | |
| parent | 8416a94ad27b3ff058576f09f35f0704a8b39ff3 (diff) | |
| download | firmware-e7f4d56592b3975c38af329e77b4efd9108495e8.tar.gz firmware-e7f4d56592b3975c38af329e77b4efd9108495e8.tar.bz2 firmware-e7f4d56592b3975c38af329e77b4efd9108495e8.zip | |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'drivers/qwiic/qwiic.c')
| -rw-r--r-- | drivers/qwiic/qwiic.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/qwiic/qwiic.c b/drivers/qwiic/qwiic.c index 904791992..316d6539c 100644 --- a/drivers/qwiic/qwiic.c +++ b/drivers/qwiic/qwiic.c @@ -16,16 +16,16 @@ #include "qwiic.h" void qwiic_init(void) { - #ifdef QWIIC_JOYSTIIC_ENABLE +#ifdef QWIIC_JOYSTIIC_ENABLE joystiic_init(); - #endif - #ifdef QWIIC_MICRO_OLED_ENABLE +#endif +#ifdef QWIIC_MICRO_OLED_ENABLE micro_oled_init(); - #endif +#endif } void qwiic_task(void) { - #ifdef QWIIC_JOYSTIIC_ENABLE +#ifdef QWIIC_JOYSTIIC_ENABLE joystiic_task(); - #endif +#endif } |