From fc25649da7383397ea1d0e0d8c3892c466013134 Mon Sep 17 00:00:00 2001
From: Michael Wiebusch <antiquark@gmx.net>
Date: Wed, 8 Jan 2014 11:34:52 +0100
Subject: [PATCH] cleaning up c project structure

---
 firmware/src/CB_functions.c |  5 +----
 firmware/src/CB_functions.h |  2 +-
 firmware/src/spi1.c         | 31 +++++++++++++++++++++----------
 firmware/src/spi1.h         |  5 +++--
 4 files changed, 26 insertions(+), 17 deletions(-)

diff --git a/firmware/src/CB_functions.c b/firmware/src/CB_functions.c
index 90b71b6..352bb21 100644
--- a/firmware/src/CB_functions.c
+++ b/firmware/src/CB_functions.c
@@ -55,10 +55,7 @@ void report_all_registers(void) {
 }
 
 
-inline void adc_conv0_pulse(void){
-  ADC_CONV0_GPIO_PORT->BSRR = ADC_CONV0_PIN; // make a ...
-  ADC_CONV0_GPIO_PORT->BRR = ADC_CONV0_PIN; // ... short activation pulse
-}
+
 
 
 void decode_register(uint8_t addr) {
diff --git a/firmware/src/CB_functions.h b/firmware/src/CB_functions.h
index a4ec56c..7a24ff5 100644
--- a/firmware/src/CB_functions.h
+++ b/firmware/src/CB_functions.h
@@ -16,5 +16,5 @@ void decode_register(uint8_t addr);
 
 void report_register(uint8_t addr);
 void report_all_registers(void);
-void adc_conv0_pulse(void);
+
 void uart_byte_to_fpga(uint8_t byte);
\ No newline at end of file
diff --git a/firmware/src/spi1.c b/firmware/src/spi1.c
index 17b6b36..63f2cca 100644
--- a/firmware/src/spi1.c
+++ b/firmware/src/spi1.c
@@ -5,8 +5,8 @@
 #define BUFFER_SIZE 2
  
 SPI_TypeDef * SPI_Module;
-GPIO_TypeDef * CS_GPIO;
-uint16_t CS_GPIO_Pin;
+// GPIO_TypeDef * CS_GPIO;
+// uint16_t CS_GPIO_Pin;
  
 uint8_t spiRxCounter;
 uint8_t spiTxCounter;
@@ -18,12 +18,12 @@ GPIO_InitTypeDef GPIO_InitStructure;
 NVIC_InitTypeDef NVIC_InitStructure;
 SPI_InitTypeDef SPI_InitStructure;
  
-void spi_create(SPI_TypeDef * SPIx, GPIO_TypeDef * CS_GPIOx){
-  SPI_Module = SPIx;
-  CS_GPIO = CS_GPIOx;
-//   CS_GPIO_Pin = CS_GPIO_Pin_x;
-  spiBusyFlag = 0;
-}
+// void spi_create(SPI_TypeDef * SPIx, GPIO_TypeDef * CS_GPIOx){
+//   SPI_Module = SPIx;
+//   CS_GPIO = CS_GPIOx;
+// //   CS_GPIO_Pin = CS_GPIO_Pin_x;
+//   spiBusyFlag = 0;
+// }
  
 void spi_enableTxInterrupt(void){
   SPI_I2S_ITConfig(SPI1, SPI_I2S_IT_TXE, ENABLE);
@@ -146,6 +146,17 @@ void init_SPI1(void){
   SPI_Cmd(SPI1, ENABLE);
   
   // on top :D
-  spi_create(SPI1, GPIOA);
+//   spi_create(SPI1, GPIOA);
+  SPI_Module = SPI1;
+//   CS_GPIO = GPIOA;
+//   CS_GPIO_Pin = CS_GPIO_Pin_x;
+  spiBusyFlag = 0;
   
-}
\ No newline at end of file
+}
+
+
+inline void adc_conv0_pulse(void){
+  ADC_CONV0_GPIO_PORT->BSRR = ADC_CONV0_PIN; // make a ...
+  ADC_CONV0_GPIO_PORT->BRR = ADC_CONV0_PIN; // ... short activation pulse
+}
+
diff --git a/firmware/src/spi1.h b/firmware/src/spi1.h
index 5ff1482..1207f23 100644
--- a/firmware/src/spi1.h
+++ b/firmware/src/spi1.h
@@ -1,8 +1,9 @@
 #include "stm32f10x_conf.h"
  
-void spi_create(SPI_TypeDef * SPIx, GPIO_TypeDef * CS_GPIOx);
+// void spi_create(SPI_TypeDef * SPIx, GPIO_TypeDef * CS_GPIOx);
 void spi_handleSPI1Interrupt(void);
 void spi_writeTwoBytes(uint8_t byte1, uint8_t byte0);
 void spi_writeWord(uint16_t word);
 
-void init_SPI1(void);
\ No newline at end of file
+void init_SPI1(void);
+void adc_conv0_pulse(void);
\ No newline at end of file
-- 
2.43.0