From 4b3de978227c0cf834955e085d460a5db5490dea Mon Sep 17 00:00:00 2001 From: Michael Wiebusch Date: Thu, 12 Dec 2013 10:53:08 +0100 Subject: [PATCH] added GPIO definitions for the converter board --- china_devel_board/test001/Makefile | 4 +- china_devel_board/test001/src/main.c | 29 +++--- china_devel_board/test001/src/periph_conf.h | 109 ++++++++++++++++++-- 3 files changed, 117 insertions(+), 25 deletions(-) diff --git a/china_devel_board/test001/Makefile b/china_devel_board/test001/Makefile index fa33dd5..5fc7e5f 100644 --- a/china_devel_board/test001/Makefile +++ b/china_devel_board/test001/Makefile @@ -41,7 +41,7 @@ swd: all vsprog -cstm32_hd -ms -oe -owf -I main.hex remote_swd: all - scp main.hex root@jspc55:/local.1/mwiebusch/stm32/ && ssh root@jspc55 "vsprog -cstm32_hd -ms -oe -owf -I /local.1/mwiebusch/stm32/main.hex" + scp main.hex root@jspc55:/local.1/mwiebusch/stm32/ && ssh root@jspc57 "vsprog -cstm32_hd -ms -oe -owf -I /d/jspc55.1/mwiebusch/stm32/main.hex" remote_reset: - ssh root@jspc55 "vsprog -cstm32_hd -ms" \ No newline at end of file + ssh root@jspc57 "vsprog -cstm32_hd -ms" diff --git a/china_devel_board/test001/src/main.c b/china_devel_board/test001/src/main.c index 2d379d0..ec6c558 100644 --- a/china_devel_board/test001/src/main.c +++ b/china_devel_board/test001/src/main.c @@ -14,6 +14,7 @@ #include #include "newlib_stubs.c" +#define UC_NO_REGS 14 GPIO_InitTypeDef GPIO_InitStructure; NVIC_InitTypeDef NVIC_InitStructure; @@ -22,6 +23,7 @@ USART_InitTypeDef USART_InitStructure; DMA_InitTypeDef DMA_InitStructure; uint16_t SPIBuffer[] = {0xAAAA, 0xAAAA, 0xAAAA}; +uint16_t uC_regs[UC_NO_REGS]; // prototypes for functions that are included in main.c @@ -42,13 +44,6 @@ int main(int argc, char *argv[]) { disable_JTAG(); //disable JTAG to free GPIO ports - - -// UART init - -// uinit(115200); // debug uart -// uinit(31250); // midi baudrate - // configure timer interval // SysTick_Config(16777215); // standard // SysTick_Config(7200000); // 10 Hz interrupt @@ -59,8 +54,8 @@ int main(int argc, char *argv[]) { // UART init the StdPeriphLib way -// USART_InitStructure.USART_BaudRate = 115200; - USART_InitStructure.USART_BaudRate = 19200; + USART_InitStructure.USART_BaudRate = 115200; +// USART_InitStructure.USART_BaudRate = 19200; USART_InitStructure.USART_WordLength = USART_WordLength_8b; USART_InitStructure.USART_StopBits = USART_StopBits_1; USART_InitStructure.USART_Parity = USART_Parity_No; @@ -68,7 +63,7 @@ int main(int argc, char *argv[]) { USART_InitStructure.USART_Mode = USART_Mode_Rx | USART_Mode_Tx; STM_EVAL_COMInit(COM1, &USART_InitStructure); - STM_EVAL_COMInit(COM2, &USART_InitStructure); +// STM_EVAL_COMInit(COM2, &USART_InitStructure); @@ -78,7 +73,9 @@ int main(int argc, char *argv[]) { STM_EVAL_LEDInit(LED2); STM_EVAL_LEDInit(LED3); STM_EVAL_LEDInit(LED4); + STM_EVAL_LEDOn(LED1); STM_EVAL_LEDOn(LED2); + STM_EVAL_LEDOn(LED3); STM_EVAL_LEDOn(LED4); @@ -86,7 +83,7 @@ int main(int argc, char *argv[]) { USART_SendData(EVAL_COM1, (uint8_t) 'A'); USART_SendData(EVAL_COM1, (uint8_t) 'B'); USART_SendData(EVAL_COM1, (uint8_t) 'C'); - USART_SendData(EVAL_COM2, (uint8_t) 'B'); +// USART_SendData(EVAL_COM2, (uint8_t) 'B'); init_SPI2(); @@ -218,11 +215,11 @@ void SysTick_Handler(void) static uint8_t character = 'A'; // comm_puts("SysTick_Handler"); // spi_writeTwoBytes(0x0F, 0xAB); - STM_EVAL_LEDToggle(LED1); - STM_EVAL_LEDToggle(LED2); - STM_EVAL_LEDToggle(LED3); - STM_EVAL_LEDToggle(LED4); - +// STM_EVAL_LEDToggle(LED1); +// STM_EVAL_LEDToggle(LED2); +// STM_EVAL_LEDToggle(LED3); +// STM_EVAL_LEDToggle(LED4); +// uint8_t i; for( i = 0; i<10; i++){ diff --git a/china_devel_board/test001/src/periph_conf.h b/china_devel_board/test001/src/periph_conf.h index 356dadb..b07209a 100644 --- a/china_devel_board/test001/src/periph_conf.h +++ b/china_devel_board/test001/src/periph_conf.h @@ -70,21 +70,116 @@ */ #define LEDn 4 -#define LED1_PIN GPIO_Pin_6 +#define LED1_PIN GPIO_Pin_9 #define LED1_GPIO_PORT GPIOC #define LED1_GPIO_CLK RCC_APB2Periph_GPIOC -#define LED2_PIN GPIO_Pin_7 +#define LED2_PIN GPIO_Pin_8 #define LED2_GPIO_PORT GPIOC #define LED2_GPIO_CLK RCC_APB2Periph_GPIOC -#define LED3_PIN GPIO_Pin_13 -#define LED3_GPIO_PORT GPIOD -#define LED3_GPIO_CLK RCC_APB2Periph_GPIOD +#define LED3_PIN GPIO_Pin_7 +#define LED3_GPIO_PORT GPIOC +#define LED3_GPIO_CLK RCC_APB2Periph_GPIOC #define LED4_PIN GPIO_Pin_6 -#define LED4_GPIO_PORT GPIOD -#define LED4_GPIO_CLK RCC_APB2Periph_GPIOD +#define LED4_GPIO_PORT GPIOC +#define LED4_GPIO_CLK RCC_APB2Periph_GPIOC + + +#define JTAGEN0_PIN GPIO_Pin_14 +#define JTAGEN0_GPIO_PORT GPIOC +#define JTAGEN0_GPIO_CLK RCC_APB2Periph_GPIOC + +#define JTAGEN1_PIN GPIO_Pin_15 +#define JTAGEN1_GPIO_PORT GPIOC +#define JTAGEN1_GPIO_CLK RCC_APB2Periph_GPIOC + + +#define SENSOREN0_PIN GPIO_Pin_11 +#define SENSOREN0_GPIO_PORT GPIOA +#define SENSOREN0_GPIO_CLK RCC_APB2Periph_GPIOA + +#define SENSOREN1_PIN GPIO_Pin_12 +#define SENSOREN1_GPIO_PORT GPIOA +#define SENSOREN1_GPIO_CLK RCC_APB2Periph_GPIOA + + +#define DISD0_PIN GPIO_Pin_0 +#define DISD0_GPIO_PORT GPIOA +#define DISD0_GPIO_CLK RCC_APB2Periph_GPIOA + +#define DISA0_PIN GPIO_Pin_1 +#define DISA0_GPIO_PORT GPIOA +#define DISA0_GPIO_CLK RCC_APB2Periph_GPIOA + +#define DISD1_PIN GPIO_Pin_13 +#define DISD1_GPIO_PORT GPIOC +#define DISD1_GPIO_CLK RCC_APB2Periph_GPIOC + +#define DISA1_PIN GPIO_Pin_1 +#define DISA1_GPIO_PORT GPIOC +#define DISA1_GPIO_CLK RCC_APB2Periph_GPIOC + + +#define ENAD0_PIN GPIO_Pin_3 +#define ENAD0_GPIO_PORT GPIOC +#define ENAD0_GPIO_CLK RCC_APB2Periph_GPIOC + +#define ENAA0_PIN GPIO_Pin_5 +#define ENAA0_GPIO_PORT GPIOC +#define ENAA0_GPIO_CLK RCC_APB2Periph_GPIOC + +#define ENAD1_PIN GPIO_Pin_0 +#define ENAD1_GPIO_PORT GPIOC +#define ENAD1_GPIO_CLK RCC_APB2Periph_GPIOC + +#define ENAA1_PIN GPIO_Pin_2 +#define ENAA1_GPIO_PORT GPIOC +#define ENAA1_GPIO_CLK RCC_APB2Periph_GPIOC + + +#define OVCD_C0_PIN GPIO_Pin_10 +#define OVCD_C0_GPIO_PORT GPIOB +#define OVCD_C0_GPIO_CLK RCC_APB2Periph_GPIOB + +#define OVCA_C0_PIN GPIO_Pin_11 +#define OVCA_C0_GPIO_PORT GPIOB +#define OVCA_C0_GPIO_CLK RCC_APB2Periph_GPIOB + +#define OVCD_C1_PIN GPIO_Pin_0 +#define OVCD_C1_GPIO_PORT GPIOB +#define OVCD_C1_GPIO_CLK RCC_APB2Periph_GPIOB + +#define OVCA_C1_PIN GPIO_Pin_1 +#define OVCA_C1_GPIO_PORT GPIOB +#define OVCA_C1_GPIO_CLK RCC_APB2Periph_GPIOB + + +#define MUXADDR0_PIN GPIO_Pin_9 +#define MUXADDR0_GPIO_PORT GPIOB +#define MUXADDR0_GPIO_CLK RCC_APB2Periph_GPIOB + +#define MUXADDR1_PIN GPIO_Pin_8 +#define MUXADDR1_GPIO_PORT GPIOB +#define MUXADDR1_GPIO_CLK RCC_APB2Periph_GPIOB + +#define ZEROCALIB_PIN GPIO_Pin_7 +#define ZEROCALIB_GPIO_PORT GPIOB +#define ZEROCALIB_GPIO_CLK RCC_APB2Periph_GPIOB + + +#define ADC_CONV0_PIN GPIO_Pin_4 +#define ADC_CONV0_GPIO_PORT GPIOC +#define ADC_CONV0_GPIO_CLK RCC_APB2Periph_GPIOC + +#define ADC_CONV1_PIN GPIO_Pin_6 +#define ADC_CONV1_GPIO_PORT GPIOB +#define ADC_CONV1_GPIO_CLK RCC_APB2Periph_GPIOB + +#define DAC_CS_PIN GPIO_Pin_11 +#define DAC_CS_GPIO_PORT GPIOC +#define DAC_CS_GPIO_CLK RCC_APB2Periph_GPIOC /** * @} -- 2.43.0