diff options
| author | marcoveeneman <marco-veeneman@hotmail.com> | 2016-10-30 09:35:00 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-10-30 09:35:00 +0100 |
| commit | a45d952fad0cea3cc22a1fc88245fb3328c3f6cc (patch) | |
| tree | 7ab233f7efa82da3540f76b316ebae4882228632 /demos/TIVA/RT-TM4C123G-LAUNCHPAD | |
| parent | 9abfd6d27a5bbef23e84aa70814c26682eb147f6 (diff) | |
| parent | 7e3ef128a4f10aae16ee18a73ae488c6f3185f71 (diff) | |
| download | ChibiOS-Contrib-a45d952fad0cea3cc22a1fc88245fb3328c3f6cc.tar.gz ChibiOS-Contrib-a45d952fad0cea3cc22a1fc88245fb3328c3f6cc.tar.bz2 ChibiOS-Contrib-a45d952fad0cea3cc22a1fc88245fb3328c3f6cc.zip | |
Merge pull request #96 from marcoveeneman/tiva-use-tivaware
Tiva port use TivaWare
Diffstat (limited to 'demos/TIVA/RT-TM4C123G-LAUNCHPAD')
| -rw-r--r-- | demos/TIVA/RT-TM4C123G-LAUNCHPAD/.cproject | 1 | ||||
| -rw-r--r-- | demos/TIVA/RT-TM4C123G-LAUNCHPAD/mcuconf.h | 6 |
2 files changed, 4 insertions, 3 deletions
diff --git a/demos/TIVA/RT-TM4C123G-LAUNCHPAD/.cproject b/demos/TIVA/RT-TM4C123G-LAUNCHPAD/.cproject index 109f8d7..2a64a93 100644 --- a/demos/TIVA/RT-TM4C123G-LAUNCHPAD/.cproject +++ b/demos/TIVA/RT-TM4C123G-LAUNCHPAD/.cproject @@ -49,4 +49,5 @@ </scannerConfigBuildInfo> </storageModule> <storageModule moduleId="org.eclipse.cdt.core.LanguageSettingsProviders"/> + <storageModule moduleId="refreshScope"/> </cproject> diff --git a/demos/TIVA/RT-TM4C123G-LAUNCHPAD/mcuconf.h b/demos/TIVA/RT-TM4C123G-LAUNCHPAD/mcuconf.h index 926cab1..b5e4213 100644 --- a/demos/TIVA/RT-TM4C123G-LAUNCHPAD/mcuconf.h +++ b/demos/TIVA/RT-TM4C123G-LAUNCHPAD/mcuconf.h @@ -30,15 +30,15 @@ /* * HAL driver system settings. */ -#define TIVA_OSCSRC TIVA_RCC2_OSCSRC2_MOSC +#define TIVA_OSCSRC SYSCTL_RCC2_OSCSRC2_MO #define TIVA_MOSC_ENABLE TRUE #define TIVA_DIV400_VALUE 1 #define TIVA_SYSDIV_VALUE 2 #define TIVA_USESYSDIV_ENABLE FALSE #define TIVA_SYSDIV2LSB_ENABLE FALSE #define TIVA_BYPASS_VALUE 0 -#define TIVA_PWM_FIELDS (TIVA_RCC_USEPWMDIV | \ - TIVA_RCC_PWMDIV_8) +#define TIVA_PWM_FIELDS (SYSCTL_RCC_USEPWMDIV | \ + SYSCTL_RCC_PWMDIV_8) /* * GPIO driver system settings. |