added GPIO definitions for the converter board

diff --git a/china_devel_board/test001/Makefile b/china_devel_board/test001/Makefile
index fa33dd5df6bb308493536f4d52f1e3912c8a694e..5fc7e5f345ec3cd985e14810b94c956f7329ae30 100644 (file)
--- 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 2d379d09966e76e2db4d978ba962517cf62a6b02..ec6c558569dcb712be58c05def973648bbae3908 100644 (file)
--- a/china_devel_board/test001/src/main.c
+++ b/china_devel_board/test001/src/main.c
@@ -14,6 +14,7 @@
 #include <stdio.h>
 #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 356dadb32b8cde2b2dc08859c3560499d279d074..b07209a8748c0be9e70add11d26064555e10a244 100644 (file)
--- a/china_devel_board/test001/src/periph_conf.h
+++ b/china_devel_board/test001/src/periph_conf.h
@@ -70,21 +70,116 @@
   */\r
 #define LEDn                             4\r
 \r
-#define LED1_PIN                         GPIO_Pin_6\r
+#define LED1_PIN                         GPIO_Pin_9\r
 #define LED1_GPIO_PORT                   GPIOC\r
 #define LED1_GPIO_CLK                    RCC_APB2Periph_GPIOC \r
   \r
-#define LED2_PIN                         GPIO_Pin_7\r
+#define LED2_PIN                         GPIO_Pin_8\r
 #define LED2_GPIO_PORT                   GPIOC\r
 #define LED2_GPIO_CLK                    RCC_APB2Periph_GPIOC  \r
 \r
-#define LED3_PIN                         GPIO_Pin_13  \r
-#define LED3_GPIO_PORT                   GPIOD\r
-#define LED3_GPIO_CLK                    RCC_APB2Periph_GPIOD  \r
+#define LED3_PIN                         GPIO_Pin_7  \r
+#define LED3_GPIO_PORT                   GPIOC\r
+#define LED3_GPIO_CLK                    RCC_APB2Periph_GPIOC  \r
 \r
 #define LED4_PIN                         GPIO_Pin_6\r
-#define LED4_GPIO_PORT                   GPIOD\r
-#define LED4_GPIO_CLK                    RCC_APB2Periph_GPIOD\r
+#define LED4_GPIO_PORT                   GPIOC\r
+#define LED4_GPIO_CLK                    RCC_APB2Periph_GPIOC\r
+\r
+\r
+#define JTAGEN0_PIN                      GPIO_Pin_14\r
+#define JTAGEN0_GPIO_PORT                GPIOC\r
+#define JTAGEN0_GPIO_CLK                 RCC_APB2Periph_GPIOC\r
+\r
+#define JTAGEN1_PIN                      GPIO_Pin_15\r
+#define JTAGEN1_GPIO_PORT                GPIOC\r
+#define JTAGEN1_GPIO_CLK                 RCC_APB2Periph_GPIOC\r
+\r
+\r
+#define SENSOREN0_PIN                    GPIO_Pin_11\r
+#define SENSOREN0_GPIO_PORT              GPIOA\r
+#define SENSOREN0_GPIO_CLK               RCC_APB2Periph_GPIOA\r
+\r
+#define SENSOREN1_PIN                    GPIO_Pin_12\r
+#define SENSOREN1_GPIO_PORT              GPIOA\r
+#define SENSOREN1_GPIO_CLK               RCC_APB2Periph_GPIOA\r
+\r
+\r
+#define DISD0_PIN                        GPIO_Pin_0\r
+#define DISD0_GPIO_PORT                  GPIOA\r
+#define DISD0_GPIO_CLK                   RCC_APB2Periph_GPIOA\r
+\r
+#define DISA0_PIN                        GPIO_Pin_1\r
+#define DISA0_GPIO_PORT                  GPIOA\r
+#define DISA0_GPIO_CLK                   RCC_APB2Periph_GPIOA\r
+\r
+#define DISD1_PIN                        GPIO_Pin_13\r
+#define DISD1_GPIO_PORT                  GPIOC\r
+#define DISD1_GPIO_CLK                   RCC_APB2Periph_GPIOC\r
+\r
+#define DISA1_PIN                        GPIO_Pin_1\r
+#define DISA1_GPIO_PORT                  GPIOC\r
+#define DISA1_GPIO_CLK                   RCC_APB2Periph_GPIOC\r
+\r
+\r
+#define ENAD0_PIN                        GPIO_Pin_3\r
+#define ENAD0_GPIO_PORT                  GPIOC\r
+#define ENAD0_GPIO_CLK                   RCC_APB2Periph_GPIOC\r
+\r
+#define ENAA0_PIN                        GPIO_Pin_5\r
+#define ENAA0_GPIO_PORT                  GPIOC\r
+#define ENAA0_GPIO_CLK                   RCC_APB2Periph_GPIOC\r
+\r
+#define ENAD1_PIN                        GPIO_Pin_0\r
+#define ENAD1_GPIO_PORT                  GPIOC\r
+#define ENAD1_GPIO_CLK                   RCC_APB2Periph_GPIOC\r
+\r
+#define ENAA1_PIN                        GPIO_Pin_2\r
+#define ENAA1_GPIO_PORT                  GPIOC\r
+#define ENAA1_GPIO_CLK                   RCC_APB2Periph_GPIOC\r
+\r
+\r
+#define OVCD_C0_PIN                      GPIO_Pin_10\r
+#define OVCD_C0_GPIO_PORT                GPIOB\r
+#define OVCD_C0_GPIO_CLK                 RCC_APB2Periph_GPIOB\r
+\r
+#define OVCA_C0_PIN                      GPIO_Pin_11\r
+#define OVCA_C0_GPIO_PORT                GPIOB\r
+#define OVCA_C0_GPIO_CLK                 RCC_APB2Periph_GPIOB\r
+\r
+#define OVCD_C1_PIN                      GPIO_Pin_0\r
+#define OVCD_C1_GPIO_PORT                GPIOB\r
+#define OVCD_C1_GPIO_CLK                 RCC_APB2Periph_GPIOB\r
+\r
+#define OVCA_C1_PIN                      GPIO_Pin_1\r
+#define OVCA_C1_GPIO_PORT                GPIOB\r
+#define OVCA_C1_GPIO_CLK                 RCC_APB2Periph_GPIOB\r
+\r
+\r
+#define MUXADDR0_PIN                     GPIO_Pin_9\r
+#define MUXADDR0_GPIO_PORT               GPIOB\r
+#define MUXADDR0_GPIO_CLK                RCC_APB2Periph_GPIOB\r
+\r
+#define MUXADDR1_PIN                     GPIO_Pin_8\r
+#define MUXADDR1_GPIO_PORT               GPIOB\r
+#define MUXADDR1_GPIO_CLK                RCC_APB2Periph_GPIOB\r
+\r
+#define ZEROCALIB_PIN                    GPIO_Pin_7\r
+#define ZEROCALIB_GPIO_PORT              GPIOB\r
+#define ZEROCALIB_GPIO_CLK               RCC_APB2Periph_GPIOB\r
+\r
+\r
+#define ADC_CONV0_PIN                    GPIO_Pin_4\r
+#define ADC_CONV0_GPIO_PORT              GPIOC\r
+#define ADC_CONV0_GPIO_CLK               RCC_APB2Periph_GPIOC\r
+\r
+#define ADC_CONV1_PIN                    GPIO_Pin_6\r
+#define ADC_CONV1_GPIO_PORT              GPIOB\r
+#define ADC_CONV1_GPIO_CLK               RCC_APB2Periph_GPIOB\r
+\r
+#define DAC_CS_PIN                       GPIO_Pin_11\r
+#define DAC_CS_GPIO_PORT                 GPIOC\r
+#define DAC_CS_GPIO_CLK                  RCC_APB2Periph_GPIOC\r
 \r
 /**\r
   * @}\r