#include "misc_utils.h"
#include "spi1.h"
#include "spi2.h"
+#include "spi3.h"
#include "dac.h"
+#include "ltc1867.h"
extern uint16_t spi1DataBuffer[];
void adc0_read(void){
uint8_t c = 0; // counter for spi buffer fill
- static uint8_t d = 0;
-
- c = 0;
// the received data is always one transfer cycle
// later than the corresponding commands requesting
// SPI_DMA_Buffer[c++] = d;
// SPI_DMA_Buffer[c++] = d;
//
- d = (d+1)%16;
+//
+ debug_out(c);
+
+ spi_dma_transfer(c);
+
+}
+
+void adc1_read(void){
+
+ uint8_t c = 0; // counter for spi buffer fill
+
+ // the received data is always one transfer cycle
+ // later than the corresponding commands requesting
+ // for the data
+
+ // set external multiplexers for zero calibration
+ CB_GPIO_Out_Hi(ZEROCALIB);
+ CB_GPIO_Out_Lo(MUXADDR0);
+ CB_GPIO_Out_Lo(MUXADDR1);
+
+ spi3_writeWord(CH3VSGND | UNIPOLAR); // VDDDCUR
+ // ignore received data
+ spi3_writeWord(CH4VSGND | UNIPOLAR); // VDDACUR
+ SPI_DMA_Buffer_In[c++] = ADC1_OFFSET + VDDDCUR;
+ SPI_DMA_Buffer_In[c++] = spi3_receivedWord();
+// spi3_writeWord(CH5VSCH7 | UNIPOLAR); // VDDD
+ spi3_writeWord(CH5VSGND | UNIPOLAR); // VDDD vs AGND
+ SPI_DMA_Buffer_In[c++] = ADC1_OFFSET + VDDACUR;
+ SPI_DMA_Buffer_In[c++] = spi3_receivedWord();
+// spi3_writeWord(CH6VSCH7 | UNIPOLAR); // VDDA
+ spi3_writeWord(CH6VSGND | UNIPOLAR); // VDDA vs AGND
+ SPI_DMA_Buffer_In[c++] = ADC1_OFFSET + VDDD;
+ SPI_DMA_Buffer_In[c++] = spi3_receivedWord();
+ spi3_writeWord(CH7VSGND | UNIPOLAR); // GNDSENSE
+ SPI_DMA_Buffer_In[c++] = ADC1_OFFSET + VDDA;
+ SPI_DMA_Buffer_In[c++] = spi3_receivedWord();
+ spi3_writeWord(CH0VSCH7 | UNIPOLAR); // TEMP
+ SPI_DMA_Buffer_In[c++] = ADC1_OFFSET + GNDSENSE;
+ SPI_DMA_Buffer_In[c++] = spi3_receivedWord();
+ spi3_writeWord(CH2VSGND | UNIPOLAR); // ZEROSING
+ SPI_DMA_Buffer_In[c++] = ADC1_OFFSET + TEMP;
+ SPI_DMA_Buffer_In[c++] = spi3_receivedWord();
+ spi3_writeWord(CH1VSGND | UNIPOLAR); // ZERODIFF
+ SPI_DMA_Buffer_In[c++] = ADC1_OFFSET + ZEROSING;
+ SPI_DMA_Buffer_In[c++] = spi3_receivedWord();
+
+
+ // set external multiplexers to read VDISCREFA/VDISCREF2A
+ CB_GPIO_Out_Lo(ZEROCALIB);
+ CB_GPIO_Out_Hi(MUXADDR0);
+ CB_GPIO_Out_Hi(MUXADDR1);
+
+ spi3_writeWord(CH2VSGND | UNIPOLAR); // VDISCREF2A
+ SPI_DMA_Buffer_In[c++] = ADC1_OFFSET + ZERODIFF;
+ SPI_DMA_Buffer_In[c++] = spi3_receivedWord();
+ spi3_writeWord(CH1VSGND | UNIPOLAR); // VDISCREFA
+ SPI_DMA_Buffer_In[c++] = ADC1_OFFSET + VDISCREF2A;
+ SPI_DMA_Buffer_In[c++] = spi3_receivedWord();
+
+
+ // set external multiplexers to read VDISCREFB/VDISCREF2B
+ CB_GPIO_Out_Lo(ZEROCALIB);
+ CB_GPIO_Out_Lo(MUXADDR0);
+ CB_GPIO_Out_Lo(MUXADDR1);
+
+ spi3_writeWord(CH2VSGND | UNIPOLAR); // VDISCREF2B
+ SPI_DMA_Buffer_In[c++] = ADC1_OFFSET + VDISCREFA;
+ SPI_DMA_Buffer_In[c++] = spi3_receivedWord();
+ spi3_writeWord(CH1VSGND | UNIPOLAR); // VDISCREFB
+ SPI_DMA_Buffer_In[c++] = ADC1_OFFSET + VDISCREF2B;
+ SPI_DMA_Buffer_In[c++] = spi3_receivedWord();
+
+
+ // set external multiplexers to read VDISCREFC/VDISCREF2C
+ CB_GPIO_Out_Lo(ZEROCALIB);
+ CB_GPIO_Out_Hi(MUXADDR0);
+ CB_GPIO_Out_Lo(MUXADDR1);
+
+ spi3_writeWord(CH2VSGND | UNIPOLAR); // VDISCREF2C
+ SPI_DMA_Buffer_In[c++] = ADC1_OFFSET + VDISCREFB;
+ SPI_DMA_Buffer_In[c++] = spi3_receivedWord();
+ spi3_writeWord(CH1VSGND | UNIPOLAR); // VDISCREFC
+ SPI_DMA_Buffer_In[c++] = ADC1_OFFSET + VDISCREF2C;
+ SPI_DMA_Buffer_In[c++] = spi3_receivedWord();
+
+ // set external multiplexers to read VDISCREFD/VDISCREF2D
+ CB_GPIO_Out_Lo(ZEROCALIB);
+ CB_GPIO_Out_Lo(MUXADDR0);
+ CB_GPIO_Out_Hi(MUXADDR1);
+
+ spi3_writeWord(CH2VSGND | UNIPOLAR); // VDISCREF2D
+ SPI_DMA_Buffer_In[c++] = ADC1_OFFSET + VDISCREFC;
+ SPI_DMA_Buffer_In[c++] = spi3_receivedWord();
+ spi3_writeWord(CH1VSGND | UNIPOLAR); // VDISCREFD
+ SPI_DMA_Buffer_In[c++] = ADC1_OFFSET + VDISCREF2D;
+ SPI_DMA_Buffer_In[c++] = spi3_receivedWord();
+
+ spi3_writeWord(CH3VSGND | UNIPOLAR); // dummy command
+ SPI_DMA_Buffer_In[c++] = ADC1_OFFSET + VDISCREFD;
+ SPI_DMA_Buffer_In[c++] = spi3_receivedWord();
+
+
+// SPI_DMA_Buffer[c++] = d;
+// SPI_DMA_Buffer[c++] = d;
+//
//
debug_out(c);
#include "stm32f10x.h"
+// addresses of ADC readings in SPI-Ram
+// 0 digital current CH3 vs GND
+//
+// 1 analog current CH4 vs GND
+//
+// 2 digital voltage CH5 vs CH7
+//
+// 3 analog voltage CH6 vs CH7
+//
+// 4 GND voltage CH7 vs GND
+//
+// 5 Temperature CH0 vs CH7
+//
+// 6 Zero calibration single ended CH2 vs GND
+//
+// 7 Zero calibration differential CH1 vs GND
+//
+// 8 - 11 DiscRef 2A-2D CH2 vs GND
+//
+// 12-15 DiscRef A-D differential CH1 vs GND
+
+
+
+
+
+#define VDDDCUR 0
+#define VDDACUR 1
+#define VDDD 2
+#define VDDA 3
+#define GNDSENSE 4
+#define TEMP 5
+#define ZEROSING 6
+#define ZERODIFF 7
+
+#define VDISCREF2A 8
+#define VDISCREF2B 9
+#define VDISCREF2C 10
+#define VDISCREF2D 11
+
+#define VDISCREFA 12
+#define VDISCREFB 13
+#define VDISCREFC 14
+#define VDISCREFD 15
+
+#define ADC1_OFFSET 16
+
+
+
+
+
+
+
#define UC_NO_REGS 20
void init_CB_GPIO_Outputs(void);
void uart_byte_to_fpga(uint8_t byte);
void debug_out(uint16_t debu);
-void adc0_read(void);
\ No newline at end of file
+void adc0_read(void);
+void adc1_read(void);
\ No newline at end of file
OBJS+=usart1.o
OBJS+=spi1.o
OBJS+=spi2.o
+OBJS+=spi3.o
OBJS+=dac.o
OBJS+=misc_utils.o
--- /dev/null
+/**
+ ********************************************************
+ *
+ * LTC1867(ADC) Commands / other defines
+ *
+ ********************************************************
+ */
+
+#define UNIPOLAR 0b0000010000000000
+#define BIPOLAR 0b0000000000000000
+
+#define CH0VSGND 0b1000000000000000
+#define CH1VSGND 0b1100000000000000
+#define CH2VSGND 0b1001000000000000
+#define CH3VSGND 0b1101000000000000
+#define CH4VSGND 0b1010000000000000
+#define CH5VSGND 0b1110000000000000
+#define CH6VSGND 0b1011000000000000
+#define CH7VSGND 0b1111000000000000
+
+#define CH0VSCH7 0b1000100000000000
+#define CH1VSCH7 0b1100100000000000
+#define CH2VSCH7 0b1001100000000000
+#define CH3VSCH7 0b1101100000000000
+#define CH4VSCH7 0b1010100000000000
+#define CH5VSCH7 0b1110100000000000
+#define CH6VSCH7 0b1011100000000000
+#define CH7VSCH7 0b1111100000000000
+
+#define CONV_TIME 4
+#define ACQ_DELAY 2
+
+// example usage:
+// spi1_writeWord(CH3VSGND | UNIPOLAR);
\ No newline at end of file
#include "usart1.h"
#include "spi1.h"
#include "spi2.h"
+#include "spi3.h"
#include "dac.h"
#include "periph_conf.h"
#include "misc_utils.h"
init_SPI1();
init_SPI2();
+ init_SPI3();
init_USART1();
}else{
if(uC_regs[0x0b] & 1){
adc0_read();
+ adc1_read();
}
}
#include "CB_functions.h"
#include "periph_conf.h"
#include "misc_utils.h"
+#include "ltc1867.h"
#define SPI1_BUFFER_SIZE 2
-SPI_TypeDef * SPI_Module;
+// SPI_TypeDef * SPI_Module;
// GPIO_TypeDef * CS_GPIO;
// uint16_t CS_GPIO_Pin;
void spi1_writeWord(uint16_t word){
while(spi1BusyFlag){}
adc_conv0_pulse();
- delay_us(4); // wait conversion time
+ delay_us(CONV_TIME); // wait conversion time
spi1TxCounter = 1;
spi1RxCounter = 1;
spi1BusyFlag = 1;
}
void spi1_handleSPI1Interrupt(void){
- if(SPI_I2S_GetFlagStatus(SPI_Module, SPI_I2S_FLAG_RXNE) == SET){
+ if(SPI_I2S_GetFlagStatus(SPI1, SPI_I2S_FLAG_RXNE) == SET){
// Receive Buffer Not Empty
spi1RxCounter--;
- spi1DataBuffer[spi1RxCounter] = SPI_I2S_ReceiveData(SPI_Module);
+ spi1DataBuffer[spi1RxCounter] = SPI_I2S_ReceiveData(SPI1);
if(spi1RxCounter == 0){
// spi1_chipDeselect();
spi1BusyFlag = 0;
}
- }else if(SPI_I2S_GetFlagStatus(SPI_Module, SPI_I2S_FLAG_TXE) == SET){
+ }else if(SPI_I2S_GetFlagStatus(SPI1, SPI_I2S_FLAG_TXE) == SET){
// Transmit Buffer Empty
if(spi1TxCounter != 0){
// delay_us(ACQ_DELAY); // delay between acquisitions
// adc_conv0_pulse(); // conversion pulse
// delay_us(CONV_TIME); // wait a bit until conversion is finished
- SPI_I2S_SendData(SPI_Module, spi1DataBuffer[spi1TxCounter - 1]);
+ SPI_I2S_SendData(SPI1, spi1DataBuffer[spi1TxCounter - 1]);
spi1TxCounter--;
}else{
spi1_disableTxInterrupt();
// on top :D
// spi_create(SPI1, GPIOA);
- SPI_Module = SPI1;
+// SPI_Module = SPI1;
// CS_GPIO = GPIOA;
// CS_GPIO_Pin = CS_GPIO_Pin_x;
spi1BusyFlag = 0;
ADC_CONV0_GPIO_PORT->BSRR = ADC_CONV0_PIN; // make a ...
ADC_CONV0_GPIO_PORT->BRR = ADC_CONV0_PIN; // ... short activation pulse
}
-
-
-
-
-
-void read_adc0_block0(void){// do not use, remove soon
-
- // power supply voltages/currents, temperature + zero calib
-
- spi1DataBuffer[0] = (CH3VSGND | UNIPOLAR); // VDDDCUR
- spi1DataBuffer[1] = (CH4VSGND | UNIPOLAR); // VDDACUR
- spi1DataBuffer[2] = (CH5VSCH7 | UNIPOLAR); // VDDD
- spi1DataBuffer[3] = (CH6VSCH7 | UNIPOLAR); // VDDA
- spi1DataBuffer[4] = (CH7VSGND | UNIPOLAR); // GNDSENSE
- spi1DataBuffer[5] = (CH0VSCH7 | UNIPOLAR); // TEMP
- spi1DataBuffer[6] = (CH2VSGND | UNIPOLAR); // ZEROSING
- spi1DataBuffer[7] = (CH1VSGND | UNIPOLAR); // ZERODIFF
-
- spi1DataBuffer[8] = (CH1VSGND | UNIPOLAR); // dummy command
-
- spi1_communicate(9);
-}
-
-
-void read_adc0_block1(void){ // do not use, remove soon
-
- // VDiscRef differential + VDiscRef2 single ended
-
- spi1DataBuffer[0] = (CH2VSGND | UNIPOLAR); // VDISCREF2[A-D]
- spi1DataBuffer[1] = (CH1VSGND | BIPOLAR); // VDISCREF[A-D]
- spi1DataBuffer[2] = (CH1VSGND | BIPOLAR); // dummy command
- spi1_communicate(3);
-}
-
-
-
-// 0 digital current CH3 vs GND
-//
-// 1 analog current CH4 vs GND
-//
-// 2 digital voltage CH5 vs CH7
-//
-// 3 analog voltage CH6 vs CH7
-//
-// 4 GND voltage CH7 vs GND
-//
-// 5 Temperature CH0 vs CH7
-//
-// 6 Zero calibration single ended CH2 vs GND
-//
-// 7 Zero calibration differential CH1 vs GND
-//
-// 8 - 11 DiscRef 2A-2D CH2 vs GND
-//
-// 12-15 DiscRef A-D differential CH1 vs GND
-
-#define VDDDCUR 0
-#define VDDACUR 1
-#define VDDD 2
-#define VDDA 3
-#define GNDSENSE 4
-#define TEMP 5
-#define ZEROSING 6
-#define ZERODIFF 7
-
-#define VDISCREF2A 8
-#define VDISCREF2B 9
-#define VDISCREF2C 10
-#define VDISCREF2D 11
-
-#define VDISCREFA 12
-#define VDISCREFB 13
-#define VDISCREFC 14
-#define VDISCREFD 15
-
-#define UNIPOLAR 0b0000010000000000
-#define BIPOLAR 0b0000000000000000
-
-#define CH0VSGND 0b1000000000000000
-#define CH1VSGND 0b1100000000000000
-#define CH2VSGND 0b1001000000000000
-#define CH3VSGND 0b1101000000000000
-#define CH4VSGND 0b1010000000000000
-#define CH5VSGND 0b1110000000000000
-#define CH6VSGND 0b1011000000000000
-#define CH7VSGND 0b1111000000000000
-#define CH0VSCH7 0b1000100000000000
-#define CH5VSCH7 0b1110100000000000
-#define CH6VSCH7 0b1011100000000000
-
-#define CONV_TIME 4
-#define ACQ_DELAY 2
-
-
-
-
-
// void spi_create(SPI_TypeDef * SPIx, GPIO_TypeDef * CS_GPIOx);
void spi1_handleSPI1Interrupt(void);
void adc_conv0_pulse(void);
void spi1_communicate(uint8_t rounds);
-void read_adc0_block0(void);
-void read_adc0_block1(void);
void spi_dma_transfer(uint8_t count) {\r
\r
while(spi_dma_busyFlag){};\r
+ CB_GPIO_Out_Hi(UC_CS); // spi nCS -> idle Hi\r
\r
memcpy(SPI_DMA_Buffer, SPI_DMA_Buffer_In, count*2 );\r
\r
\r
// Chip Select Low\r
// GPIO_WriteBit(GPIOB, GPIO_Pin_12, RESET);\r
- CB_GPIO_Out_Lo(UC_CS); // spi nCS -> idle Hi\r
\r
// DMA_Cmd(DMA1_Channel4, ENABLE);\r
spi_dma_busyFlag = 1;\r
+ CB_GPIO_Out_Lo(UC_CS); // spi nCS -> idle Hi\r
DMA_Cmd(DMA1_Channel5, ENABLE);\r
}\r
\r
void spi_handleDMA1Ch5Interrupt(void){\r
// Chip Select High\r
// GPIO_WriteBit(GPIOB, GPIO_Pin_12, SET);\r
- CB_GPIO_Out_Hi(UC_CS); // spi nCS -> idle Hi\r
+// CB_GPIO_Out_Hi(UC_CS); // spi nCS -> idle Hi\r
spi_dma_busyFlag = 0;\r
}
\ No newline at end of file
--- /dev/null
+#include "spi3.h"
+#include "CB_functions.h"
+#include "periph_conf.h"
+#include "misc_utils.h"
+#include "ltc1867.h"
+
+#define SPI3_BUFFER_SIZE 2
+
+
+
+
+// SPI_TypeDef * SPI_Module;
+// GPIO_TypeDef * CS_GPIO;
+// uint16_t CS_GPIO_Pin;
+
+uint8_t spi3RxCounter;
+uint8_t spi3TxCounter;
+uint8_t spi3BusyFlag;
+uint16_t spi3DataBuffer[SPI3_BUFFER_SIZE];
+
+
+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 spi3_enableTxInterrupt(void){
+ SPI_I2S_ITConfig(SPI3, SPI_I2S_IT_TXE, ENABLE);
+}
+
+void spi3_disableTxInterrupt(void){
+ SPI_I2S_ITConfig(SPI3, SPI_I2S_IT_TXE, DISABLE);
+}
+
+void spi3_chipSelect(void){
+// GPIO_WriteBit(CS_GPIO, CS_GPIO_Pin, RESET);
+// CB_GPIO_Out_Lo(ADC_CONV0); // spi3 nCS -> idle Hi
+}
+
+void spi3_chipDeselect(void){
+// GPIO_WriteBit(CS_GPIO, CS_GPIO_Pin, SET);
+// CB_GPIO_Out_Hi(ADC_CONV0); // spi3 nCS -> idle Hi
+}
+
+void spi3_writeTwoBytes(uint8_t byte1, uint8_t byte0){
+ while(spi3BusyFlag){}
+ spi3TxCounter = 2;
+ spi3RxCounter = 2;
+ spi3BusyFlag = 1;
+ spi3DataBuffer[0] = byte0;
+ spi3DataBuffer[1] = byte1;
+ spi3_chipSelect();
+ spi3_enableTxInterrupt();
+}
+
+void spi3_writeWord(uint16_t word){
+ while(spi3BusyFlag){}
+ adc_conv1_pulse();
+ delay_us(CONV_TIME); // wait conversion time
+ spi3TxCounter = 1;
+ spi3RxCounter = 1;
+ spi3BusyFlag = 1;
+ spi3DataBuffer[0] = word;
+// spi3_chipSelect();
+ spi3_enableTxInterrupt();
+
+}
+
+uint16_t spi3_receivedWord(void){
+ while(spi3BusyFlag){}
+ return spi3DataBuffer[0];
+}
+
+void spi3_communicate(uint8_t rounds){
+ while(spi3BusyFlag){}
+ spi3TxCounter = rounds;
+ spi3RxCounter = rounds;
+ spi3BusyFlag = 1;
+// spi3_chipSelect();
+ spi3_enableTxInterrupt();
+
+}
+
+void spi3_handleSPI3Interrupt(void){
+ if(SPI_I2S_GetFlagStatus(SPI3, SPI_I2S_FLAG_RXNE) == SET){
+ // Receive Buffer Not Empty
+ spi3RxCounter--;
+ spi3DataBuffer[spi3RxCounter] = SPI_I2S_ReceiveData(SPI3);
+
+ if(spi3RxCounter == 0){
+// spi3_chipDeselect();
+ spi3BusyFlag = 0;
+ }
+ }else if(SPI_I2S_GetFlagStatus(SPI3, SPI_I2S_FLAG_TXE) == SET){
+ // Transmit Buffer Empty
+ if(spi3TxCounter != 0){
+// delay_us(ACQ_DELAY); // delay between acquisitions
+// adc_conv0_pulse(); // conversion pulse
+// delay_us(CONV_TIME); // wait a bit until conversion is finished
+ SPI_I2S_SendData(SPI3, spi3DataBuffer[spi3TxCounter - 1]);
+ spi3TxCounter--;
+ }else{
+ spi3_disableTxInterrupt();
+ }
+ }
+}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+void init_SPI3(void){
+
+ RCC_APB1PeriphClockCmd(RCC_APB1Periph_SPI3, ENABLE); // separate clock commands ...
+ RCC_APB2PeriphClockCmd(RCC_APB2Periph_GPIOB | RCC_APB2Periph_AFIO, ENABLE);//... for separate clock sources
+
+ GPIO_InitStructure.GPIO_Pin = GPIO_Pin_5 | GPIO_Pin_3;
+ GPIO_InitStructure.GPIO_Mode = GPIO_Mode_AF_PP;
+ GPIO_InitStructure.GPIO_Speed = GPIO_Speed_50MHz;
+ GPIO_Init(GPIOB, &GPIO_InitStructure);
+
+ GPIO_InitStructure.GPIO_Pin = GPIO_Pin_4;
+ GPIO_InitStructure.GPIO_Mode = GPIO_Mode_IN_FLOATING;
+ GPIO_InitStructure.GPIO_Speed = GPIO_Speed_50MHz;
+ GPIO_Init(GPIOB, &GPIO_InitStructure);
+
+
+ // CS pin is already initialized by CB_functions
+// GPIO_InitStructure.GPIO_Pin = GPIO_Pin_8;
+// GPIO_InitStructure.GPIO_Mode = GPIO_Mode_Out_PP;
+// GPIO_InitStructure.GPIO_Speed = GPIO_Speed_50MHz;
+// GPIO_Init(GPIOA, &GPIO_InitStructure);
+
+// GPIO_WriteBit(GPIOA, GPIO_Pin_8, SET);
+
+ NVIC_InitStructure.NVIC_IRQChannel = SPI3_IRQn;
+ NVIC_InitStructure.NVIC_IRQChannelPreemptionPriority = 0;
+ NVIC_InitStructure.NVIC_IRQChannelSubPriority = 0;
+ NVIC_InitStructure.NVIC_IRQChannelCmd = ENABLE;
+ NVIC_Init(&NVIC_InitStructure);
+
+ SPI_InitStructure.SPI_BaudRatePrescaler = SPI_BaudRatePrescaler_32;
+// SPI_InitStructure.SPI_CPHA = SPI_CPHA_2Edge; //CPHA=1
+ SPI_InitStructure.SPI_CPHA = SPI_CPHA_1Edge; //CPHA=0
+// SPI_InitStructure.SPI_CPOL = SPI_CPOL_High;
+ SPI_InitStructure.SPI_CPOL = SPI_CPOL_Low;
+ SPI_InitStructure.SPI_CRCPolynomial = 0;
+ SPI_InitStructure.SPI_DataSize = SPI_DataSize_16b;
+ SPI_InitStructure.SPI_Direction = SPI_Direction_2Lines_FullDuplex;
+ SPI_InitStructure.SPI_FirstBit = SPI_FirstBit_MSB;
+ SPI_InitStructure.SPI_Mode = SPI_Mode_Master;
+ SPI_InitStructure.SPI_NSS = SPI_NSS_Soft;
+ SPI_Init(SPI3, &SPI_InitStructure);
+
+ SPI_I2S_ITConfig(SPI3, SPI_I2S_IT_RXNE, ENABLE);
+
+ SPI_Cmd(SPI3, ENABLE);
+
+ // on top :D
+// spi_create(SPI3, GPIOA);
+// SPI_Module = SPI3;
+// CS_GPIO = GPIOA;
+// CS_GPIO_Pin = CS_GPIO_Pin_x;
+ spi3BusyFlag = 0;
+
+}
+
+
+inline void adc_conv1_pulse(void){
+ ADC_CONV1_GPIO_PORT->BSRR = ADC_CONV1_PIN; // make a ...
+ ADC_CONV1_GPIO_PORT->BRR = ADC_CONV1_PIN; // ... short activation pulse
+}
--- /dev/null
+#include "stm32f10x_conf.h"
+
+
+
+
+
+
+
+
+// void spi_create(SPI_TypeDef * SPIx, GPIO_TypeDef * CS_GPIOx);
+void spi3_handleSPI3Interrupt(void);
+void spi3_writeTwoBytes(uint8_t byte1, uint8_t byte0);
+void spi3_writeWord(uint16_t word);
+uint16_t spi3_receivedWord(void);
+
+void init_SPI3(void);
+void adc_conv1_pulse(void);
+
+void spi3_communicate(uint8_t rounds);
+// This project runs on a High Density STM32 uC
+
+//(still don't know who defines a device class by default,
+// grepping didn't show anything)
+
+#undef STM32F10X_LD
+#undef STM32F10X_LD_VL
+#undef STM32F10X_MD
+#undef STM32F10X_MD_VL
+#undef STM32F10X_HD
+#undef STM32F10X_HD_VL
+#undef STM32F10X_XL
+#undef STM32F10X_CL
+
+#define STM32F10X_HD
+
/* Includes -----------------------------------------------------------*/
/* Uncomment the line below to enable peripheral header file inclusion */
/* #include "stm32f10x_adc.h" */
// #include "serial.h"\r
#include "spi1.h"\r
#include "spi2.h"\r
+#include "spi3.h"\r
\r
\r
/** @addtogroup STM32F10x_StdPeriph_Template\r
spi1_handleSPI1Interrupt();\r
}\r
\r
-\r
+void SPI3_IRQHandler(void){\r
+ spi3_handleSPI3Interrupt();\r
+}\r
\r
\r
\r
//for spi1\r
\r
void SPI1_IRQHandler(void);\r
+void SPI3_IRQHandler(void);\r
\r
// for spi2\r
void DMA1_Channel5_IRQHandler(void);\r
jspc29 / mvd_firmware.git / commitdiff