therm Changeset - 872ec99b2dff · protofusion repositories

Changeset - 872ec99b2dff

Parent rev.

Child rev.

[Not reviewed]

Merge default

0 4 0

Ethan Zonca - 10 years ago 2014-07-10 19:38:53
ez@ethanzonca.com

SPI setup using stdperiph

4 files changed with 169 insertions and 4 deletions:

Makefile

libraries/oleddrv/bsp.h

main.c

157

stm32-flash.ld

0 comments (0 inline, 0 general)

Makefile

➞

Show inline comments

@@ @@ -96,6 +96,7 @@ OBJCOPY=$(TOOLCHAIN_PATH)/$(TOOLCHAIN_PR @@
 AS=$(TOOLCHAIN_PATH)/$(TOOLCHAIN_PREFIX)-as
 AR=$(TOOLCHAIN_PATH)/$(TOOLCHAIN_PREFIX)-ar
 GDB=$(TOOLCHAIN_PATH)/$(TOOLCHAIN_PREFIX)-gdb
 SIZE=$(TOOLCHAIN_PATH)/$(TOOLCHAIN_PREFIX)-size
 all: $(OBJ)
@@ @@ -110,3 +111,9 @@ clean: @@
 	rm -f $(TARGET).elf
 	rm -f $(TARGET).hex
 	rm -f $(TARGET).bin
 # Display size
 size: $(TARGET).elf
 	@echo Invoking: ARM GNU Print Size
 	$(SIZE) --format=berkeley $<
 	@echo

libraries/oleddrv/bsp.h

➞

Show inline comments

@@ @@ -42,7 +42,8 @@ D1/Data 3 4 D0/Clk @@
 #define   SSD_CS_Low()      GPIOB->BRR = GPIO_Pin_1
 #define   SSD_CS_High()     GPIOB->ODR |= GPIO_Pin_1
 #define   SPI_SendByte(data)  SPI1->DR = (data)
 // Use stdperiph
 #define   SPI_SendByte(data)  SPI_I2S_SendData(SPI1, data);  //SPI1->DR = (data)
 #define   SPI_Wait()           while(!(SPI1->SR&SPI_I2S_FLAG_TXE));while(SPI1->SR&SPI_I2S_FLAG_BSY);
 #define   SSD1303_FPS                   50

main.c

➞

Show inline comments

@@ @@ -5,6 +5,8 @@ @@
 static __IO uint32_t TimingDelay;
 uint8_t BlinkSpeed = 0;
 void init_gpio();
 void init_spi();
 /* Main */
 int main(void)
@@ @@ -17,6 +19,7 @@ int main(void) @@
   STM_EVAL_LEDInit(LED4);
 //  RCC_Configuration();
   /* Initialize User_Button on STM32L100C-Discovery */
   //STM_EVAL_PBInit(BUTTON_USER, BUTTON_MODE_GPIO);
@@ @@ -27,6 +30,13 @@ int main(void) @@
  /* Initiate Blink Speed variable */
   BlinkSpeed = 1;
 //  while(1) {
 //	  ITM_SendChar('!');
 //  }
   init_spi();
   //SPI_I2S_SendData(SPI1, 0x1);
  /* Init lcd driver */
 //  SSD1303_Init();
 //  SSD1303_DrawPoint(3,3,1);
@@ @@ -77,6 +87,153 @@ void TimingDelay_Decrement(void) @@
+  }
+}
 void init_spi(void) {
 	SPI_InitTypeDef  SPI_InitStructure;
 	// OLED IC
 	SPI_InitStructure.SPI_Direction = SPI_Direction_1Line_Tx;
 	SPI_InitStructure.SPI_Mode = SPI_Mode_Master;
 	SPI_InitStructure.SPI_DataSize = SPI_DataSize_8b;
 	SPI_InitStructure.SPI_CPOL = SPI_CPOL_High;
 	SPI_InitStructure.SPI_CPHA = SPI_CPHA_2Edge;
 	SPI_InitStructure.SPI_NSS = SPI_NSS_Soft;
 	SPI_InitStructure.SPI_BaudRatePrescaler = SPI_BaudRatePrescaler_64;
 	SPI_InitStructure.SPI_FirstBit = SPI_FirstBit_MSB;
 	SPI_InitStructure.SPI_CRCPolynomial = 7;
 	SPI_Init(SPI1, &SPI_InitStructure);
 	SPI_Cmd(SPI1, ENABLE);           /* Enable the SPI  */
 	// MAX IC
 	SPI_InitStructure.SPI_Direction = SPI_Direction_1Line_Rx;
 	SPI_InitStructure.SPI_Mode = SPI_Mode_Master;
 	SPI_InitStructure.SPI_DataSize = SPI_DataSize_8b;
 	SPI_InitStructure.SPI_CPOL = SPI_CPOL_High;
 	SPI_InitStructure.SPI_CPHA = SPI_CPHA_2Edge;
 	SPI_InitStructure.SPI_NSS = SPI_NSS_Soft;
 	SPI_InitStructure.SPI_BaudRatePrescaler = SPI_BaudRatePrescaler_64;
 	SPI_InitStructure.SPI_FirstBit = SPI_FirstBit_MSB;
 	SPI_InitStructure.SPI_CRCPolynomial = 7;
 	SPI_Init(SPI2, &SPI_InitStructure);
 	SPI_Cmd(SPI2, ENABLE);           /* Enable the SPI */
+}
 void init_gpio(void) {
  GPIO_InitTypeDef GPIO_InitStruct;
   /** Configure pins as
         * Analog
         * Input
         * Output
         * EVENT_OUT
         * EXTI
   */
   /*Enable or disable the AHB peripheral clock */
   RCC_AHBPeriphClockCmd(RCC_AHBPeriph_GPIOC|RCC_AHBPeriph_GPIOB|RCC_AHBPeriph_GPIOA|RCC_APB1Periph_SPI2|RCC_APB2Periph_SPI1, ENABLE);
   RCC_AHBPeriphClockCmd(RCC_AHBPeriph_DMA1, ENABLE); // EMZ TODO get the right ones
   /*Configure GPIO pin : PC */
   GPIO_InitStruct.GPIO_Pin = GPIO_Pin_13;
   GPIO_InitStruct.GPIO_Mode = GPIO_Mode_OUT;
   GPIO_InitStruct.GPIO_OType = GPIO_OType_PP;
   GPIO_InitStruct.GPIO_PuPd = GPIO_PuPd_NOPULL;
   GPIO_InitStruct.GPIO_Speed = GPIO_Speed_400KHz;
   GPIO_Init(GPIOC, &GPIO_InitStruct);
   /*Configure GPIO pin : PB */
   GPIO_InitStruct.GPIO_Pin = GPIO_Pin_1|GPIO_Pin_2|GPIO_Pin_10|GPIO_Pin_12
                           |GPIO_Pin_9;
   GPIO_InitStruct.GPIO_Mode = GPIO_Mode_OUT;
   GPIO_InitStruct.GPIO_OType = GPIO_OType_PP;
   GPIO_InitStruct.GPIO_PuPd = GPIO_PuPd_NOPULL;
   GPIO_InitStruct.GPIO_Speed = GPIO_Speed_400KHz;
   GPIO_Init(GPIOB, &GPIO_InitStruct);
   /*Configure GPIO pin : PA */
   GPIO_InitStruct.GPIO_Pin = GPIO_Pin_15;
   GPIO_InitStruct.GPIO_Mode = GPIO_Mode_OUT;
   GPIO_InitStruct.GPIO_OType = GPIO_OType_PP;
   GPIO_InitStruct.GPIO_PuPd = GPIO_PuPd_NOPULL;
   GPIO_InitStruct.GPIO_Speed = GPIO_Speed_400KHz;
   GPIO_Init(GPIOA, &GPIO_InitStruct);
   /*Configure GPIO pin : PB */
   GPIO_InitStruct.GPIO_Pin = GPIO_Pin_3|GPIO_Pin_4|GPIO_Pin_5|GPIO_Pin_6
                           |GPIO_Pin_7;
   GPIO_InitStruct.GPIO_Mode = GPIO_Mode_IN;
   GPIO_InitStruct.GPIO_PuPd = GPIO_PuPd_NOPULL;
   GPIO_Init(GPIOB, &GPIO_InitStruct);
   /** SPI1 GPIO Configuration
   PA5   ------> SPI1_SCK
   PA7   ------> SPI1_MOSI
   */
   /*Enable or disable the AHB peripheral clock */
   RCC_AHBPeriphClockCmd(RCC_AHBPeriph_GPIOA, ENABLE);
   /*Configure GPIO pin : PA */
   GPIO_InitStruct.GPIO_Pin = GPIO_Pin_5|GPIO_Pin_7;
   GPIO_InitStruct.GPIO_OType = GPIO_OType_PP;
   GPIO_InitStruct.GPIO_PuPd = GPIO_PuPd_NOPULL;
   GPIO_InitStruct.GPIO_Speed = GPIO_Speed_400KHz;
   GPIO_Init(GPIOA, &GPIO_InitStruct);
   /*Configure GPIO pin alternate function */
   GPIO_PinAFConfig(GPIOA, GPIO_PinSource5, GPIO_AF_SPI1);
   /*Configure GPIO pin alternate function */
   GPIO_PinAFConfig(GPIOA, GPIO_PinSource7, GPIO_AF_SPI1);
   /** SPI2 GPIO Configuration
   PB13   ------> SPI2_SCK
   PB14   ------> SPI2_MISO
   PB15   ------> SPI2_MOSI
   */
   /*Enable or disable the AHB peripheral clock */
   RCC_AHBPeriphClockCmd(RCC_AHBPeriph_GPIOB, ENABLE);
   /*Configure GPIO pin : PB */
   GPIO_InitStruct.GPIO_Pin = GPIO_Pin_13|GPIO_Pin_14|GPIO_Pin_15;
   GPIO_InitStruct.GPIO_OType = GPIO_OType_PP;
   GPIO_InitStruct.GPIO_PuPd = GPIO_PuPd_NOPULL;
   GPIO_InitStruct.GPIO_Speed = GPIO_Speed_400KHz;
   GPIO_Init(GPIOB, &GPIO_InitStruct);
   /*Configure GPIO pin alternate function */
   GPIO_PinAFConfig(GPIOB, GPIO_PinSource13, GPIO_AF_SPI2);
   /*Configure GPIO pin alternate function */
   GPIO_PinAFConfig(GPIOB, GPIO_PinSource14, GPIO_AF_SPI2);
   /*Configure GPIO pin alternate function */
   GPIO_PinAFConfig(GPIOB, GPIO_PinSource15, GPIO_AF_SPI2);
   /** USB GPIO Configuration
   PA11   ------> USB_DM
   PA12   ------> USB_DP
   */
   /*Enable or disable the AHB peripheral clock */
   RCC_AHBPeriphClockCmd(RCC_AHBPeriph_GPIOA, ENABLE);
   /*Configure GPIO pin : PA */
   GPIO_InitStruct.GPIO_Pin = GPIO_Pin_11|GPIO_Pin_12;
   GPIO_InitStruct.GPIO_OType = GPIO_OType_PP;
   GPIO_InitStruct.GPIO_PuPd = GPIO_PuPd_NOPULL;
   GPIO_InitStruct.GPIO_Speed = GPIO_Speed_400KHz;
   GPIO_Init(GPIOA, &GPIO_InitStruct);
+}
 #ifdef  USE_FULL_ASSERT
 /**

stm32-flash.ld

➞

Show inline comments

@@ @@ -33,7 +33,7 @@ @@
 ENTRY(Reset_Handler)
 /* Highest address of the user mode stack */
-_estack = 0x20004000;    /* end of 16K RAM */
+_estack = 0x20001000;    /* end of 4K RAM */
 /* Generate a link error if heap and stack don't fit into RAM */
 _Min_Heap_Size = 0x200;      /* required amount of heap  */
@@ @@ -42,8 +42,8 @@ ENTRY(Reset_Handler) @@
 /* Specify the memory areas */
 MEMORY
+{
   FLASH (rx)      : ORIGIN = 0x08000000, LENGTH = 256K
   RAM (xrw)       : ORIGIN = 0x20000000, LENGTH = 16K
   FLASH (rx)      : ORIGIN = 0x08000000, LENGTH = 32K
   RAM (xrw)       : ORIGIN = 0x20000000, LENGTH = 4K
   MEMORY_B1 (rx)  : ORIGIN = 0x60000000, LENGTH = 0K
+}

0 comments (0 inline, 0 general)