cleaned up, enabled ADC readout by default

diff --git a/SWD_programmer/HOWTO b/SWD_programmer/HOWTO
index 6a95476d1dec39200b7c6adeca229e6fcb44bf8f..44d77ab5f39640b9f01fe661c3ca98ecf6aa21b5 100644 (file)
--- a/SWD_programmer/HOWTO
+++ b/SWD_programmer/HOWTO
@@ -23,10 +23,10 @@ microcontroller while using the SWD protocol/interfac. Let me tell you how it is
 #############################
 
 on Ubuntu based systems:
-$ sudo apt-get install libusb-1.0-0-dev git
+$ sudo apt-get install libusb-1.0-0-dev git dh-autoreconf
 
 other systems:
-  make sure you have libusb-1.0-0-dev installed,
+  make sure you have libusb-1.0-0-dev and dh-autoreconf installed,
   or cross your fingers that the software will without it or compile anyway
   (it did when I installed it on jspc57)
   

diff --git a/firmware/src/CB_functions.c b/firmware/src/CB_functions.c
index 67a1b47d90538a4d6df2e9c82e42ce03dacb45d8..581103310dbd2e73125112aabcde6a7ee50b9296 100644 (file)
--- a/firmware/src/CB_functions.c
+++ b/firmware/src/CB_functions.c
@@ -123,7 +123,7 @@ void adc0_read(void){
   SPI_DMA_Buffer_In[c++] = VDDA;
   SPI_DMA_Buffer_In[c++] = readAdc0(CH7VSGND | UNIPOLAR); // GNDSENSE
   SPI_DMA_Buffer_In[c++] = GNDSENSE;
-  SPI_DMA_Buffer_In[c++] = readAdc0(CH0VSCH7 | UNIPOLAR); // TEMP
+  SPI_DMA_Buffer_In[c++] = readAdc0(CH0VSCH7 | UNIPOLAR); // TEMP vs GNDSENSE
   SPI_DMA_Buffer_In[c++] = TEMP;
   SPI_DMA_Buffer_In[c++] = readAdc0(CH2VSGND | UNIPOLAR); // ZEROSING
   SPI_DMA_Buffer_In[c++] = ZEROSING;

diff --git a/firmware/src/Makefile b/firmware/src/Makefile
index 8aad90cffcf01b7026427e25f289eacbd6cc0d7a..b2f3c20e6560bd63bd828a5cc1af039fd100d992 100644 (file)
--- a/firmware/src/Makefile
+++ b/firmware/src/Makefile
@@ -2,7 +2,6 @@ include ../Makefile.common
 
 OBJS+=startup.o 
 OBJS+=main.o
-OBJS+=serial.o
 OBJS+=stm32f10x_it.o
 OBJS+=periph_conf.o
 OBJS+=CB_functions.o

diff --git a/firmware/src/dac.h b/firmware/src/dac.h
index 6d32884da1ef9ce0eb7e10869e7e60af82c36610..26e1461ebdacfc67163e32ae6af3a71d3729ec16 100644 (file)
--- a/firmware/src/dac.h
+++ b/firmware/src/dac.h
@@ -1,7 +1,7 @@
 /**
  ********************************************************
  * 
- *  DAC SPI (headers)
+ *  USART3 (DAC) (headers)
  * 
  ********************************************************
  */

diff --git a/firmware/src/main.c b/firmware/src/main.c
index 7b979afb7b7c71a6c10e7ac318cf4364eae515fc..aee65c32dc4823cbf9f22857f40d70256acd1147 100644 (file)
--- a/firmware/src/main.c
+++ b/firmware/src/main.c
@@ -1,7 +1,7 @@
 /**
  ********************************************************
  * 
- *  Michas Test-main :D 
+ *  main.c
  * 
  ********************************************************
  */
@@ -30,11 +30,6 @@ extern uint16_t SPI_DMA_Buffer[];
 extern uint16_t SPI_DMA_Buffer_In[];
 extern uint16_t uC_regs[];
 
-// GPIO_InitTypeDef GPIO_InitStructure;
-// NVIC_InitTypeDef NVIC_InitStructure;
-// SPI_InitTypeDef SPI_InitStructure;
-// USART_InitTypeDef USART_InitStructure;
-// DMA_InitTypeDef DMA_InitStructure;
 
 
 
@@ -55,7 +50,7 @@ int main(int argc, char *argv[]) {
   
   uint8_t UcRegAddr;
 
-       SystemInit();
+  SystemInit();
   disable_JTAG(); //disable JTAG to free GPIO ports
   init_CB_GPIO_Outputs();
   
@@ -76,6 +71,7 @@ int main(int argc, char *argv[]) {
   
   delay_ms(1000);
   CB_GPIO_Out_Hi(LED4);
+  uC_regs[0x0b] |= 1; // enable cyclic ADC readout by default
   
   report_all_registers();
 
@@ -107,16 +103,8 @@ int main(int argc, char *argv[]) {
 /*
 void SysTick_Handler(void)
 {
-  
-  static uint8_t spi_addr = 0;
-  
-  
-  SPI_DMA_Buffer[0] = (uint16_t) spi_addr; // address
-  SPI_DMA_Buffer[1] = (uint16_t) uC_regs[spi_addr]; // data content
-//   SPI_DMA_Buffer[1] = 0x5678; // data content
-  spi_dma_shovel();
-  
-  spi_addr=(spi_addr+1)%18;
+  //do something
+
 }
 
 */

diff --git a/firmware/src/serial.c b/firmware/src/serial.c
deleted file mode 100644 (file)
index a4294c9..0000000
--- a/firmware/src/serial.c
+++ /dev/null
@@ -1,71 +0,0 @@
-#include "stm32f10x.h"
-#include "stm32f10x_gpio.h"
-#include "stm32f10x_rcc.h"
-#include "stm32f10x_usart.h"
-#include "serial.h"
-
-
-
-
-
-
-
-
-void comm_put(char d) {
-       while (USART_GetFlagStatus(USART1, USART_FLAG_TXE) == RESET) {
-               ;
-       }
-       USART_SendData(USART1, (uint16_t) d);
-}
-
-
-void comm_puts(const char* s) {
-       char c;
-       while ((c = *s++) != '\0') {
-               comm_put(c);
-       }
-}
-
-void uinit(u32 rate){
-
-       GPIO_InitTypeDef GPIO_InitStructure;
-       USART_InitTypeDef USART_InitStructure;
-//     USART_ClockInitTypeDef USART_ClockInitStructure;
-
-       //enable bus clocks
-       RCC_APB2PeriphClockCmd(RCC_APB2Periph_GPIOA | RCC_APB2Periph_AFIO, ENABLE);
-
-       RCC_APB2PeriphClockCmd(RCC_APB2Periph_USART1, ENABLE);
-
-       //Configure USART1 Tx (PA.02) as alternate function push-pull
-       GPIO_InitStructure.GPIO_Pin = GPIO_Pin_9;
-       GPIO_InitStructure.GPIO_Mode = GPIO_Mode_AF_PP;
-       GPIO_InitStructure.GPIO_Speed = GPIO_Speed_50MHz;
-       GPIO_Init(GPIOA, &GPIO_InitStructure);
-       //Configure USART1 Rx (PA.03) as input floating
-       GPIO_InitStructure.GPIO_Pin = GPIO_Pin_10;
-       GPIO_InitStructure.GPIO_Mode = GPIO_Mode_IN_FLOATING;
-       GPIO_Init(GPIOA, &GPIO_InitStructure);
-
-       /* USART1 and USART2 configuration ------------------------------------------------------*/
-       /* USART and USART2 configured as follow:
-        - BaudRate = 115200 baud
-        - Word Length = 8 Bits
-        - One Stop Bit
-        - No parity
-        - Hardware flow control disabled (RTS and CTS signals)
-        - Receive and transmit enabled
-        */
-       USART_InitStructure.USART_BaudRate = rate;
-       USART_InitStructure.USART_WordLength = USART_WordLength_8b;
-       USART_InitStructure.USART_StopBits = USART_StopBits_1;
-       USART_InitStructure.USART_Parity = USART_Parity_No;
-       USART_InitStructure.USART_HardwareFlowControl = USART_HardwareFlowControl_None;
-       USART_InitStructure.USART_Mode = USART_Mode_Rx | USART_Mode_Tx;
-
-       /* Configure USART1 */
-       USART_Init(USART1, &USART_InitStructure);
-
-       /* Enable the USART1 */
-       USART_Cmd(USART1, ENABLE);
-}

diff --git a/firmware/src/serial.h b/firmware/src/serial.h
deleted file mode 100644 (file)
index 59b838c..0000000
--- a/firmware/src/serial.h
+++ /dev/null
@@ -1,5 +0,0 @@
-void comm_put(char d);
-
-void comm_puts(const char* s);
-
-void uinit(u32 rate);

diff --git a/firmware/src/spi1.c b/firmware/src/spi1.c
index 7d3dca9b38ed08c8c4eaedbe92e099feaefc029a..68f02d27674ec8f4e1d9ce8691c50fbdf167d093 100644 (file)
--- a/firmware/src/spi1.c
+++ b/firmware/src/spi1.c
@@ -1,3 +1,12 @@
+/**
+ ********************************************************
+ * 
+ *  SPI1
+ * 
+ ********************************************************
+ */
+
+
 #include "spi1.h"
 #include "CB_functions.h"
 #include "periph_conf.h"

diff --git a/firmware/src/spi1.h b/firmware/src/spi1.h
index 0646b325cb9f19fc5c8954405f069d5749966715..359980e4489747eafd26a7b2c8bd27afa494f646 100644 (file)
--- a/firmware/src/spi1.h
+++ b/firmware/src/spi1.h
@@ -1,3 +1,12 @@
+/**
+ ********************************************************
+ * 
+ *  SPI1 (headers)
+ * 
+ ********************************************************
+ */
+
+
 #include "stm32f10x_conf.h"
  
  

diff --git a/firmware/src/spi3.c b/firmware/src/spi3.c
index 886c88f0fe486988bc0a12061ddac592ed72ef51..d583bb994b5776c5c9f2d8a0b003f82ca20e5e36 100644 (file)
--- a/firmware/src/spi3.c
+++ b/firmware/src/spi3.c
@@ -1,3 +1,11 @@
+/**
+ ********************************************************
+ * 
+ *  SPI3
+ * 
+ ********************************************************
+ */
+
 #include "spi3.h"
 #include "CB_functions.h"
 #include "periph_conf.h"

diff --git a/firmware/src/spi3.h b/firmware/src/spi3.h
index 7be0d8bdd290372b9b28fb156311145061eb2842..9d4ba3dc7ec95bca92dd77ffef8c841205fd687f 100644 (file)
--- a/firmware/src/spi3.h
+++ b/firmware/src/spi3.h
@@ -1,3 +1,12 @@
+/**
+ ********************************************************
+ * 
+ *  SPI3 (headers)
+ * 
+ ********************************************************
+ */
+
+
 #include "stm32f10x_conf.h"
  
  

diff --git a/firmware/src/spi_conf.h b/firmware/src/spi_conf.h
deleted file mode 100644 (file)
index 3d62c7f..0000000
--- a/firmware/src/spi_conf.h
+++ /dev/null
@@ -1,92 +0,0 @@
-/**\r
-  ******************************************************************************\r
-  * @file    SPI/FullDuplex_SoftNSS/platform_config.h \r
-  * @author  MCD Application Team\r
-  * @version V3.5.0\r
-  * @date    08-April-2011\r
-  * @brief   Evaluation board specific configuration file.\r
-  ******************************************************************************\r
-  * @attention\r
-  *\r
-  * THE PRESENT FIRMWARE WHICH IS FOR GUIDANCE ONLY AIMS AT PROVIDING CUSTOMERS\r
-  * WITH CODING INFORMATION REGARDING THEIR PRODUCTS IN ORDER FOR THEM TO SAVE\r
-  * TIME. AS A RESULT, STMICROELECTRONICS SHALL NOT BE HELD LIABLE FOR ANY\r
-  * DIRECT, INDIRECT OR CONSEQUENTIAL DAMAGES WITH RESPECT TO ANY CLAIMS ARISING\r
-  * FROM THE CONTENT OF SUCH FIRMWARE AND/OR THE USE MADE BY CUSTOMERS OF THE\r
-  * CODING INFORMATION CONTAINED HEREIN IN CONNECTION WITH THEIR PRODUCTS.\r
-  *\r
-  * <h2><center>&copy; COPYRIGHT 2011 STMicroelectronics</center></h2>\r
-  ******************************************************************************\r
-  */ \r
-\r
-/* Define to prevent recursive inclusion -------------------------------------*/\r
-#ifndef __PLATFORM_CONFIG_H\r
-#define __PLATFORM_CONFIG_H\r
-\r
-/* Includes ------------------------------------------------------------------*/\r
-\r
-/* Exported types ------------------------------------------------------------*/\r
-/* Exported constants --------------------------------------------------------*/\r
-/* Uncomment the line corresponding to the STMicroelectronics evaluation board\r
-   used to run the example */\r
-// #if !defined (USE_STM32100B_EVAL) && !defined (USE_STM3210B_EVAL) &&  !defined (USE_STM3210E_EVAL) &&  !defined (USE_STM3210C_EVAL) &&  !defined (USE_STM32100E_EVAL)\r
-//  //#define USE_STM32100B_EVAL\r
-//  //#define USE_STM3210B_EVAL\r
-//  //#define USE_STM3210E_EVAL\r
-//  //#define USE_STM32100E_EVAL\r
-//  #define USE_STM3210C_EVAL\r
-// #endif\r
-\r
-/* Define the STM32F10x hardware depending on the used evaluation board */\r
-// #if defined (USE_STM3210B_EVAL) || defined (USE_STM3210E_EVAL) || defined(USE_STM32100B_EVAL) || defined (USE_STM32100E_EVAL)\r
-  #define SPIy                   SPI1\r
-  #define SPIy_CLK               RCC_APB2Periph_SPI1\r
-  #define SPIy_GPIO              GPIOA\r
-  #define SPIy_GPIO_CLK          RCC_APB2Periph_GPIOA  \r
-  #define SPIy_PIN_SCK           GPIO_Pin_5\r
-  #define SPIy_PIN_MISO          GPIO_Pin_6\r
-  #define SPIy_PIN_MOSI          GPIO_Pin_7\r
-\r
-// remapped\r
-//   #define SPIy                   SPI1\r
-//   #define SPIy_CLK               RCC_APB2Periph_SPI1\r
-//   #define SPIy_GPIO              GPIOB\r
-//   #define SPIy_GPIO_CLK          RCC_APB2Periph_GPIOB\r
-//   #define SPIy_PIN_SCK           GPIO_Pin_3\r
-//   #define SPIy_PIN_MISO          GPIO_Pin_4\r
-//   #define SPIy_PIN_MOSI          GPIO_Pin_5\r
-  \r
-  \r
-  #define SPIz                    SPI2\r
-  #define SPIz_CLK                RCC_APB1Periph_SPI2\r
-  #define SPIz_GPIO               GPIOB\r
-  #define SPIz_GPIO_CLK           RCC_APB2Periph_GPIOB \r
-  #define SPIz_PIN_SCK            GPIO_Pin_13\r
-  #define SPIz_PIN_MISO           GPIO_Pin_14\r
-  #define SPIz_PIN_MOSI           GPIO_Pin_15 \r
-          \r
-// #elif defined (USE_STM3210C_EVAL)\r
-//   #define SPIy                   SPI3   /* SPI pins are remapped by software */\r
-//   #define SPIy_CLK               RCC_APB1Periph_SPI3\r
-//   #define SPIy_GPIO              GPIOC\r
-//   #define SPIy_GPIO_CLK          RCC_APB2Periph_GPIOC  \r
-//   #define SPIy_PIN_SCK           GPIO_Pin_10\r
-//   #define SPIy_PIN_MISO          GPIO_Pin_11\r
-//   #define SPIy_PIN_MOSI          GPIO_Pin_12\r
-//   \r
-//   #define SPIz                    SPI2\r
-//   #define SPIz_CLK                RCC_APB1Periph_SPI2\r
-//   #define SPIz_GPIO               GPIOB\r
-//   #define SPIz_GPIO_CLK           RCC_APB2Periph_GPIOB\r
-//   #define SPIz_PIN_SCK            GPIO_Pin_13\r
-//   #define SPIz_PIN_MISO           GPIO_Pin_14\r
-//   #define SPIz_PIN_MOSI           GPIO_Pin_15\r
-// \r
-// #endif\r
-\r
-/* Exported macro ------------------------------------------------------------*/\r
-/* Exported functions ------------------------------------------------------- */\r
-\r
-#endif /* __PLATFORM_CONFIG_H */\r
-\r
-/******************* (C) COPYRIGHT 2011 STMicroelectronics *****END OF FILE****/\r

diff --git a/firmware/src/stm32_eval.h b/firmware/src/stm32_eval.h
deleted file mode 100644 (file)
index b964a9d..0000000
--- a/firmware/src/stm32_eval.h
+++ /dev/null
@@ -1,376 +0,0 @@
-/**\r
-  ******************************************************************************\r
-  * @file    stm32_eval.h\r
-  * @author  MCD Application Team\r
-  * @version V4.5.0\r
-  * @date    07-March-2011\r
-  * @brief   Header file for stm32_eval.c module.\r
-  ******************************************************************************\r
-  * @attention\r
-  *\r
-  * THE PRESENT FIRMWARE WHICH IS FOR GUIDANCE ONLY AIMS AT PROVIDING CUSTOMERS\r
-  * WITH CODING INFORMATION REGARDING THEIR PRODUCTS IN ORDER FOR THEM TO SAVE\r
-  * TIME. AS A RESULT, STMICROELECTRONICS SHALL NOT BE HELD LIABLE FOR ANY\r
-  * DIRECT, INDIRECT OR CONSEQUENTIAL DAMAGES WITH RESPECT TO ANY CLAIMS ARISING\r
-  * FROM THE CONTENT OF SUCH FIRMWARE AND/OR THE USE MADE BY CUSTOMERS OF THE\r
-  * CODING INFORMATION CONTAINED HEREIN IN CONNECTION WITH THEIR PRODUCTS.\r
-  *\r
-  * <h2><center>&copy; COPYRIGHT 2011 STMicroelectronics</center></h2>\r
-  ******************************************************************************  \r
-  */ \r
-  \r
-/* Define to prevent recursive inclusion -------------------------------------*/\r
-#ifndef __STM32_EVAL_H\r
-#define __STM32_EVAL_H\r
-\r
-#ifdef __cplusplus\r
- extern "C" {\r
-#endif \r
-\r
-/* Includes ------------------------------------------------------------------*/\r
-\r
-/** @addtogroup Utilities\r
-  * @{\r
-  */ \r
-  \r
-/** @addtogroup STM32_EVAL\r
-  * @{\r
-  */ \r
-\r
-/** @defgroup STM32_EVAL_Abstraction_Layer\r
-  * @{\r
-  */\r
-  \r
-/** @defgroup STM32_EVAL_HARDWARE_RESOURCES\r
-  * @{\r
-  */\r
-\r
-/**\r
-@code  \r
- The table below gives an overview of the hardware resources supported by each \r
- STM32 EVAL board.\r
-     - LCD: TFT Color LCD (Parallel (FSMC) and Serial (SPI))\r
-     - IOE: IO Expander on I2C\r
-     - sFLASH: serial SPI FLASH (M25Pxxx)\r
-     - sEE: serial I2C EEPROM (M24C08, M24C32, M24C64)\r
-     - TSENSOR: Temperature Sensor (LM75)\r
-     - SD: SD Card memory (SPI and SDIO (SD Card MODE)) \r
-  =================================================================================================================+\r
-    STM32 EVAL     | LED | Buttons  | Com Ports |    LCD    | IOE  | sFLASH | sEE | TSENSOR | SD (SPI) | SD(SDIO)  |\r
-  =================================================================================================================+\r
-   STM3210B-EVAL   |  4  |    8     |     2     | YES (SPI) | NO   |  YES   | NO  |   YES   |    YES   |    NO     |\r
-  -----------------------------------------------------------------------------------------------------------------+\r
-   STM3210E-EVAL   |  4  |    8     |     2     | YES (FSMC)| NO   |  YES   | NO  |   YES   |    NO    |    YES    |\r
-  -----------------------------------------------------------------------------------------------------------------+\r
-   STM3210C-EVAL   |  4  |    3     |     1     | YES (SPI) | YES  |  NO    | YES |   NO    |    YES   |    NO     |\r
-  -----------------------------------------------------------------------------------------------------------------+\r
-   STM32100B-EVAL  |  4  |    8     |     2     | YES (SPI) | NO   |  YES   | NO  |   YES   |    YES   |    NO     |\r
-  -----------------------------------------------------------------------------------------------------------------+\r
-   STM32L152-EVAL  |  4  |    8     |     2     | YES (SPI) | NO   |  NO    | NO  |   YES   |    YES   |    NO     |\r
-  -----------------------------------------------------------------------------------------------------------------+\r
-   STM32100E-EVAL  |  4  |    8     |     2     | YES (FSMC)| YES  |  YES   | YES |   YES   |    YES   |    NO     |\r
-  =================================================================================================================+\r
-@endcode\r
-*/\r
-\r
-/**\r
-  * @}\r
-  */\r
-  \r
-/** @defgroup STM32_EVAL_Exported_Types\r
-  * @{\r
-  */\r
-\r
-// garbage:\r
-typedef enum \r
-{\r
-  xLED1 = 0,\r
-  xLED2 = 1,\r
-  xLED3 = 2,\r
-  xLED4 = 3\r
-} Led_TypeDef;\r
-\r
-typedef enum \r
-{  \r
-  BUTTON_WAKEUP = 0,\r
-  BUTTON_TAMPER = 1,\r
-  BUTTON_KEY = 2,\r
-  BUTTON_RIGHT = 3,\r
-  BUTTON_LEFT = 4,\r
-  BUTTON_UP = 5,\r
-  BUTTON_DOWN = 6,\r
-  BUTTON_SEL = 7\r
-} Button_TypeDef;\r
-\r
-typedef enum \r
-{  \r
-  BUTTON_MODE_GPIO = 0,\r
-  BUTTON_MODE_EXTI = 1\r
-} ButtonMode_TypeDef;\r
-\r
-typedef enum \r
-{ \r
-  JOY_NONE = 0,\r
-  JOY_SEL = 1,\r
-  JOY_DOWN = 2,\r
-  JOY_LEFT = 3,\r
-  JOY_RIGHT = 4,\r
-  JOY_UP = 5\r
-} JOYState_TypeDef\r
-;\r
-\r
-typedef enum \r
-{\r
-  COM1 = 0,\r
-  COM2 = 1\r
-} COM_TypeDef;   \r
-/**\r
-  * @}\r
-  */ \r
-  \r
-/** @defgroup STM32_EVAL_Exported_Constants\r
-  * @{\r
-  */\r
-\r
-/** \r
-  * @brief  Uncomment the line corresponding to the STMicroelectronics evaluation\r
-  *   board used in your application.\r
-  *   \r
-  *  Tip: To avoid modifying this file each time you need to switch between these\r
-  *       boards, you can define the board in your toolchain compiler preprocessor.    \r
-  */ \r
-#if !defined (USE_STM32100B_EVAL) && !defined (USE_STM3210B_EVAL) &&  !defined (USE_STM3210E_EVAL)\\r
-   &&  !defined (USE_STM3210C_EVAL) &&  !defined (USE_STM32L152_EVAL) &&  !defined (USE_STM32100E_EVAL)\r
- //#define USE_STM32100B_EVAL\r
- //#define USE_STM3210B_EVAL\r
- //#define USE_STM3210E_EVAL\r
- //#define USE_STM3210C_EVAL\r
- //#define USE_STM32L152_EVAL\r
- //#define USE_STM32100E_EVAL\r
-#endif\r
-\r
-\r
-/*\r
-#ifdef USE_STM32100B_EVAL\r
- #include "stm32f10x.h"\r
- #include "stm32100b_eval/stm32100b_eval.h"\r
-#elif defined USE_STM3210B_EVAL\r
- #include "stm32f10x.h"\r
- #include "stm3210b_eval/stm3210b_eval.h" \r
-#elif defined USE_STM3210E_EVAL\r
- #include "stm32f10x.h"\r
- #include "stm3210e_eval/stm3210e_eval.h"\r
-#elif defined USE_STM3210C_EVAL\r
- #include "stm32f10x.h"\r
- #include "stm3210c_eval/stm3210c_eval.h"\r
-#elif defined USE_STM32L152_EVAL\r
- #include "stm32l1xx.h"\r
- #include "stm32l152_eval/stm32l152_eval.h" \r
-#elif defined USE_STM32100E_EVAL\r
- #include "stm32f10x.h"\r
- #include "stm32100e_eval/stm32100e_eval.h"\r
-#else \r
- #error "Please select first the STM32 EVAL board to be used (in stm32_eval.h)"\r
-#endif         \r
-\r
-*/\r
-// nimm gefälligst meine hardware-konfiguration\r
-#include "periph_conf.h"\r
-\r
-\r
-/** \r
-  * @brief  STM32 Button Defines Legacy  \r
-  */ \r
-#define Button_WAKEUP        BUTTON_WAKEUP\r
-#define Button_TAMPER        BUTTON_TAMPER\r
-#define Button_KEY           BUTTON_KEY\r
-#define Button_RIGHT         BUTTON_RIGHT\r
-#define Button_LEFT          BUTTON_LEFT\r
-#define Button_UP            BUTTON_UP\r
-#define Button_DOWN          BUTTON_DOWN\r
-#define Button_SEL           BUTTON_SEL\r
-#define Mode_GPIO            BUTTON_MODE_GPIO\r
-#define Mode_EXTI            BUTTON_MODE_EXTI\r
-#define Button_Mode_TypeDef  ButtonMode_TypeDef\r
-#define JOY_CENTER           JOY_SEL\r
-#define JOY_State_TypeDef    JOYState_TypeDef \r
-\r
-/** \r
-  * @brief  LCD Defines Legacy  \r
-  */ \r
-#define LCD_RSNWR_GPIO_CLK  LCD_NWR_GPIO_CLK\r
-#define LCD_SPI_GPIO_PORT   LCD_SPI_SCK_GPIO_PORT\r
-#define LCD_SPI_GPIO_CLK    LCD_SPI_SCK_GPIO_CLK\r
-#define R0                  LCD_REG_0\r
-#define R1                  LCD_REG_1\r
-#define R2                  LCD_REG_2\r
-#define R3                  LCD_REG_3\r
-#define R4                  LCD_REG_4\r
-#define R5                  LCD_REG_5\r
-#define R6                  LCD_REG_6\r
-#define R7                  LCD_REG_7\r
-#define R8                  LCD_REG_8\r
-#define R9                  LCD_REG_9\r
-#define R10                 LCD_REG_10\r
-#define R12                 LCD_REG_12\r
-#define R13                 LCD_REG_13\r
-#define R14                 LCD_REG_14\r
-#define R15                 LCD_REG_15\r
-#define R16                 LCD_REG_16\r
-#define R17                 LCD_REG_17\r
-#define R18                 LCD_REG_18\r
-#define R19                 LCD_REG_19\r
-#define R20                 LCD_REG_20\r
-#define R21                 LCD_REG_21\r
-#define R22                 LCD_REG_22\r
-#define R23                 LCD_REG_23\r
-#define R24                 LCD_REG_24\r
-#define R25                 LCD_REG_25\r
-#define R26                 LCD_REG_26\r
-#define R27                 LCD_REG_27\r
-#define R28                 LCD_REG_28\r
-#define R29                 LCD_REG_29\r
-#define R30                 LCD_REG_30\r
-#define R31                 LCD_REG_31\r
-#define R32                 LCD_REG_32\r
-#define R33                 LCD_REG_33\r
-#define R34                 LCD_REG_34\r
-#define R36                 LCD_REG_36\r
-#define R37                 LCD_REG_37\r
-#define R40                 LCD_REG_40\r
-#define R41                 LCD_REG_41\r
-#define R43                 LCD_REG_43\r
-#define R45                 LCD_REG_45\r
-#define R48                 LCD_REG_48\r
-#define R49                 LCD_REG_49\r
-#define R50                 LCD_REG_50\r
-#define R51                 LCD_REG_51\r
-#define R52                 LCD_REG_52\r
-#define R53                 LCD_REG_53\r
-#define R54                 LCD_REG_54\r
-#define R55                 LCD_REG_55\r
-#define R56                 LCD_REG_56\r
-#define R57                 LCD_REG_57\r
-#define R59                 LCD_REG_59\r
-#define R60                 LCD_REG_60\r
-#define R61                 LCD_REG_61\r
-#define R62                 LCD_REG_62\r
-#define R63                 LCD_REG_63\r
-#define R64                 LCD_REG_64\r
-#define R65                 LCD_REG_65\r
-#define R66                 LCD_REG_66\r
-#define R67                 LCD_REG_67\r
-#define R68                 LCD_REG_68\r
-#define R69                 LCD_REG_69\r
-#define R70                 LCD_REG_70\r
-#define R71                 LCD_REG_71\r
-#define R72                 LCD_REG_72\r
-#define R73                 LCD_REG_73\r
-#define R74                 LCD_REG_74\r
-#define R75                 LCD_REG_75\r
-#define R76                 LCD_REG_76\r
-#define R77                 LCD_REG_77\r
-#define R78                 LCD_REG_78\r
-#define R79                 LCD_REG_79\r
-#define R80                 LCD_REG_80\r
-#define R81                 LCD_REG_81\r
-#define R82                 LCD_REG_82\r
-#define R83                 LCD_REG_83\r
-#define R96                 LCD_REG_96\r
-#define R97                 LCD_REG_97\r
-#define R106                LCD_REG_106\r
-#define R118                LCD_REG_118\r
-#define R128                LCD_REG_128\r
-#define R129                LCD_REG_129\r
-#define R130                LCD_REG_130\r
-#define R131                LCD_REG_131\r
-#define R132                LCD_REG_132\r
-#define R133                LCD_REG_133\r
-#define R134                LCD_REG_134\r
-#define R135                LCD_REG_135\r
-#define R136                LCD_REG_136\r
-#define R137                LCD_REG_137\r
-#define R139                LCD_REG_139\r
-#define R140                LCD_REG_140\r
-#define R141                LCD_REG_141\r
-#define R143                LCD_REG_143\r
-#define R144                LCD_REG_144\r
-#define R145                LCD_REG_145\r
-#define R146                LCD_REG_146\r
-#define R147                LCD_REG_147\r
-#define R148                LCD_REG_148\r
-#define R149                LCD_REG_149\r
-#define R150                LCD_REG_150\r
-#define R151                LCD_REG_151\r
-#define R152                LCD_REG_152\r
-#define R153                LCD_REG_153\r
-#define R154                LCD_REG_154\r
-#define R157                LCD_REG_157\r
-#define R192                LCD_REG_192\r
-#define R193                LCD_REG_193\r
-#define R227                LCD_REG_227\r
-#define R229                LCD_REG_229\r
-#define R231                LCD_REG_231\r
-#define R239                LCD_REG_239\r
-#define White               LCD_COLOR_WHITE\r
-#define Black               LCD_COLOR_BLACK\r
-#define Grey                LCD_COLOR_GREY\r
-#define Blue                LCD_COLOR_BLUE\r
-#define Blue2               LCD_COLOR_BLUE2\r
-#define Red                 LCD_COLOR_RED\r
-#define Magenta             LCD_COLOR_MAGENTA\r
-#define Green               LCD_COLOR_GREEN\r
-#define Cyan                LCD_COLOR_CYAN\r
-#define Yellow              LCD_COLOR_YELLOW\r
-#define Line0               LCD_LINE_0\r
-#define Line1               LCD_LINE_1\r
-#define Line2               LCD_LINE_2\r
-#define Line3               LCD_LINE_3\r
-#define Line4               LCD_LINE_4\r
-#define Line5               LCD_LINE_5\r
-#define Line6               LCD_LINE_6\r
-#define Line7               LCD_LINE_7\r
-#define Line8               LCD_LINE_8\r
-#define Line9               LCD_LINE_9\r
-#define Horizontal          LCD_DIR_HORIZONTAL\r
-#define Vertical            LCD_DIR_VERTICAL\r
-\r
-\r
-/**\r
-  * @}\r
-  */ \r
-\r
-/** @defgroup STM32_EVAL_Exported_Macros\r
-  * @{\r
-  */ \r
-/**\r
-  * @}\r
-  */ \r
-\r
-/** @defgroup STM32_EVAL_Exported_Functions\r
-  * @{\r
-  */ \r
-/**\r
-  * @}\r
-  */ \r
-\r
-#ifdef __cplusplus\r
-}\r
-#endif\r
-\r
-\r
-#endif /* __STM32_EVAL_H */\r
-\r
-/**\r
-  * @}\r
-  */ \r
-\r
-/**\r
-  * @}\r
-  */ \r
-\r
-/**\r
-  * @}\r
-  */   \r
-\r
-/******************* (C) COPYRIGHT 2011 STMicroelectronics *****END OF FILE****/\r

diff --git a/firmware/src/stm32f10x_it.c b/firmware/src/stm32f10x_it.c
index 8b3228aa120213acdfa0ebcc52f16702977c1c30..ab3ee52612fb426d6dc15694df96a95f3b0e2488 100644 (file)
--- a/firmware/src/stm32f10x_it.c
+++ b/firmware/src/stm32f10x_it.c
@@ -23,7 +23,6 @@
 \r
 /* Includes ------------------------------------------------------------------*/\r
 #include "stm32f10x_it.h"\r
-#include "stm32_eval.h" //remove this file ...\r
 #include "stm32f10x_conf.h" /*include directives for StdPeriphLib */\r
 \r
 /* custom includes for this project */\r