From 62014aea7565ed85d7cf5cf9ecebef4e15a01a59 Mon Sep 17 00:00:00 2001 From: marcoveeneman Date: Tue, 30 Aug 2016 18:45:33 +0200 Subject: Fixed .launch file for RT-TM4C1294-LAUNCHPAD demo. --- ...C1294-LAUNCHPAD (OpenOCD, Flash and Run).launch | 52 ++++++++++++++++++++++ ...-LAUNCHPAD-LWIP (OpenOCD, Flash and Run).launch | 52 ---------------------- 2 files changed, 52 insertions(+), 52 deletions(-) create mode 100644 demos/TIVA/RT-TM4C1294-LAUNCHPAD/debug/RT-TM4C1294-LAUNCHPAD (OpenOCD, Flash and Run).launch delete mode 100644 demos/TIVA/RT-TM4C1294-LAUNCHPAD/debug/RT-TM4C1294-LAUNCHPAD-LWIP (OpenOCD, Flash and Run).launch (limited to 'demos') diff --git a/demos/TIVA/RT-TM4C1294-LAUNCHPAD/debug/RT-TM4C1294-LAUNCHPAD (OpenOCD, Flash and Run).launch b/demos/TIVA/RT-TM4C1294-LAUNCHPAD/debug/RT-TM4C1294-LAUNCHPAD (OpenOCD, Flash and Run).launch new file mode 100644 index 0000000..597e58d --- /dev/null +++ b/demos/TIVA/RT-TM4C1294-LAUNCHPAD/debug/RT-TM4C1294-LAUNCHPAD (OpenOCD, Flash and Run).launch @@ -0,0 +1,52 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/demos/TIVA/RT-TM4C1294-LAUNCHPAD/debug/RT-TM4C1294-LAUNCHPAD-LWIP (OpenOCD, Flash and Run).launch b/demos/TIVA/RT-TM4C1294-LAUNCHPAD/debug/RT-TM4C1294-LAUNCHPAD-LWIP (OpenOCD, Flash and Run).launch deleted file mode 100644 index c9016ed..0000000 --- a/demos/TIVA/RT-TM4C1294-LAUNCHPAD/debug/RT-TM4C1294-LAUNCHPAD-LWIP (OpenOCD, Flash and Run).launch +++ /dev/null @@ -1,52 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -- cgit v1.2.3 From 538eba7b6fbc4dcc08bfa459d5edbaac4b1672b0 Mon Sep 17 00:00:00 2001 From: marcoveeneman Date: Thu, 27 Oct 2016 23:50:49 +0200 Subject: Updated ChibiStudio .cproject files. --- demos/TIVA/RT-TM4C123G-LAUNCHPAD/.cproject | 1 + demos/TIVA/RT-TM4C1294-LAUNCHPAD-LWIP/.cproject | 69 ++++++++++- demos/TIVA/RT-TM4C1294-LAUNCHPAD/.cproject | 147 ++++++++++++++++++++++++ 3 files changed, 211 insertions(+), 6 deletions(-) (limited to 'demos') 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 @@ + diff --git a/demos/TIVA/RT-TM4C1294-LAUNCHPAD-LWIP/.cproject b/demos/TIVA/RT-TM4C1294-LAUNCHPAD-LWIP/.cproject index efeab1b..df70011 100644 --- a/demos/TIVA/RT-TM4C1294-LAUNCHPAD-LWIP/.cproject +++ b/demos/TIVA/RT-TM4C1294-LAUNCHPAD-LWIP/.cproject @@ -22,22 +22,79 @@ + + + diff --git a/demos/TIVA/RT-TM4C1294-LAUNCHPAD/.cproject b/demos/TIVA/RT-TM4C1294-LAUNCHPAD/.cproject index dff1605..989853d 100644 --- a/demos/TIVA/RT-TM4C1294-LAUNCHPAD/.cproject +++ b/demos/TIVA/RT-TM4C1294-LAUNCHPAD/.cproject @@ -21,12 +21,159 @@ + + + + + + -- cgit v1.2.3 From 041c87831be9062b67602c935dbd9c61a5aaa115 Mon Sep 17 00:00:00 2001 From: marcoveeneman Date: Thu, 27 Oct 2016 23:52:24 +0200 Subject: Some missing changes. --- demos/TIVA/RT-TM4C1294-LAUNCHPAD/mcuconf.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'demos') diff --git a/demos/TIVA/RT-TM4C1294-LAUNCHPAD/mcuconf.h b/demos/TIVA/RT-TM4C1294-LAUNCHPAD/mcuconf.h index 3abab92..c3e5921 100644 --- a/demos/TIVA/RT-TM4C1294-LAUNCHPAD/mcuconf.h +++ b/demos/TIVA/RT-TM4C1294-LAUNCHPAD/mcuconf.h @@ -31,7 +31,7 @@ * HAL driver system settings. */ #define TIVA_MOSC_SINGLE_ENDED FALSE -#define TIVA_RSCLKCFG_OSCSRC RSCLKCFG_OSCSRC_MOSC +#define TIVA_RSCLKCFG_OSCSRC SYSCTL_RSCLKCFG_OSCSRC_MOSC /* * GPT driver system settings. -- cgit v1.2.3 From 24de854c9055fdb7c5e0a7539df0136be942d59c Mon Sep 17 00:00:00 2001 From: marcoveeneman Date: Fri, 28 Oct 2016 00:03:49 +0200 Subject: Replaced custom register bitfield macros by TivaWare bitfield macros. --- demos/TIVA/RT-TM4C123G-LAUNCHPAD/mcuconf.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'demos') diff --git a/demos/TIVA/RT-TM4C123G-LAUNCHPAD/mcuconf.h b/demos/TIVA/RT-TM4C123G-LAUNCHPAD/mcuconf.h index 926cab1..13f25ef 100644 --- a/demos/TIVA/RT-TM4C123G-LAUNCHPAD/mcuconf.h +++ b/demos/TIVA/RT-TM4C123G-LAUNCHPAD/mcuconf.h @@ -30,7 +30,7 @@ /* * 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 -- cgit v1.2.3 From 7e3ef128a4f10aae16ee18a73ae488c6f3185f71 Mon Sep 17 00:00:00 2001 From: marcoveeneman Date: Sat, 29 Oct 2016 19:47:09 +0200 Subject: Updated mcuconf.h files. --- demos/TIVA/RT-TM4C123G-LAUNCHPAD/mcuconf.h | 4 ++-- demos/TIVA/RT-TM4C1294-LAUNCHPAD-LWIP/mcuconf.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'demos') diff --git a/demos/TIVA/RT-TM4C123G-LAUNCHPAD/mcuconf.h b/demos/TIVA/RT-TM4C123G-LAUNCHPAD/mcuconf.h index 13f25ef..b5e4213 100644 --- a/demos/TIVA/RT-TM4C123G-LAUNCHPAD/mcuconf.h +++ b/demos/TIVA/RT-TM4C123G-LAUNCHPAD/mcuconf.h @@ -37,8 +37,8 @@ #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. diff --git a/demos/TIVA/RT-TM4C1294-LAUNCHPAD-LWIP/mcuconf.h b/demos/TIVA/RT-TM4C1294-LAUNCHPAD-LWIP/mcuconf.h index 3abab92..c3e5921 100644 --- a/demos/TIVA/RT-TM4C1294-LAUNCHPAD-LWIP/mcuconf.h +++ b/demos/TIVA/RT-TM4C1294-LAUNCHPAD-LWIP/mcuconf.h @@ -31,7 +31,7 @@ * HAL driver system settings. */ #define TIVA_MOSC_SINGLE_ENDED FALSE -#define TIVA_RSCLKCFG_OSCSRC RSCLKCFG_OSCSRC_MOSC +#define TIVA_RSCLKCFG_OSCSRC SYSCTL_RSCLKCFG_OSCSRC_MOSC /* * GPT driver system settings. -- cgit v1.2.3