diff options
| author | inmarket <inmarket@ugfx.org> | 2016-11-09 16:42:24 +1000 |
|---|---|---|
| committer | inmarket <inmarket@ugfx.org> | 2016-11-09 16:42:24 +1000 |
| commit | 7f4bfaadd5ad1bf2feaf0645e429e30cbe8fad18 (patch) | |
| tree | c997d10e3033bc337528f37eb2c8b23aedcbf3e6 | |
| parent | 545a719db9f706d47d1135c5056faab82e22f230 (diff) | |
| parent | cd9e47d6461a05d54458237c5e951b04655efe7d (diff) | |
| download | uGFX-7f4bfaadd5ad1bf2feaf0645e429e30cbe8fad18.tar.gz uGFX-7f4bfaadd5ad1bf2feaf0645e429e30cbe8fad18.tar.bz2 uGFX-7f4bfaadd5ad1bf2feaf0645e429e30cbe8fad18.zip | |
Merge branch 'master' of https://git.ugfx.io/uGFX/uGFX
| -rw-r--r-- | src/gadc/gadc.h | 2 | ||||
| -rw-r--r-- | src/gtimer/gtimer.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/gadc/gadc.h b/src/gadc/gadc.h index eb29865d..94321192 100644 --- a/src/gadc/gadc.h +++ b/src/gadc/gadc.h @@ -12,7 +12,7 @@ * * @brief Module to abstract the very variable ADC interfaces of the underlying systems * - * @details The reason why ChibiOS/GFX has it's own ADC abstraction is because + * @details The reason why uGFX has it's own ADC abstraction is because * the Chibi-OS drivers are very CPU specific and do not * provide a way across all hardware platforms to create periodic * ADC conversions. There are also issues with devices with different diff --git a/src/gtimer/gtimer.h b/src/gtimer/gtimer.h index db740e1c..e818f3e7 100644 --- a/src/gtimer/gtimer.h +++ b/src/gtimer/gtimer.h @@ -12,7 +12,7 @@ * * @brief Module which provides software based timers for user-space applications * - * @details The reason why ChibiOS/GFX has it's own timer abstraction is because + * @details The reason why uGFX has it's own timer abstraction is because * virtual timers provided by ChibiOS/RT are interrupt context only. * While great for what they are designed for, they make coding of the input * drivers much more complex. |