therm Changeset - 299800126735 · protofusion repositories

Changeset - 299800126735

Parent rev.

Child rev.

[Not reviewed]

default

0 3 0

Ethan Zonca - 10 years ago 2014-07-10 22:32:10
ez@ethanzonca.com

Now using GPIO library and generated gpio config, fixes for SPI, etc

3 files changed with 51 insertions and 37 deletions:

libraries/oleddrv/bsp.h

main.c

ssd1306.c

0 comments (0 inline, 0 general)

libraries/oleddrv/bsp.h

➞

Show inline comments

 #ifndef BSP_H
 #define BSP_H
 /**
   IO Connection map
        SSD1303
   Vcc   1  2  Gnd
 D1/Data 3  4  D0/Clk
     D3  5  6  D2
     D5  7  8  D4
     D7  9 10  D6
     WR 11 12  RD
    RES 13 14  A0  (1-data,0-command)
    CS  15 16  C86 (1-8080, 0-SPI)
        STM32
   D0/Clk    PB13/SPI2 Clk
   D1/Data   PB15/SPI2 MOSI
   RES       PB12
   A0        PB14
   CS        Gnd
   D2~D7     (Float)
   WR        (Float)
   RD        (Float)
  */
 #define   SSD_Clk         GPIOA,GPIO_Pin_5
 #define   SSD_Data        GPIOA,GPIO_Pin_7
 //#define   SSD_Clk         GPIOA,GPIO_Pin_5
 //#define   SSD_Data        GPIOA,GPIO_Pin_7
 #define   SSD_Reset       GPIOB,GPIO_Pin_2
 #define   SSD_A0          GPIOB,GPIO_Pin_10
 #define   SSD_CS          GPIOB,GPIO_Pin_1
 #define   SSD_Clk_Low()     GPIOA->BRR = GPIO_Pin_5
 #define   SSD_Clk_High()    GPIOA->ODR |= GPIO_Pin_5
 #define   SSD_Data_Low()    GPIOA->BRR = GPIO_Pin_7
 #define   SSD_Data_High()   GPIOA->ODR |= GPIO_Pin_7
 #define   SSD_Reset_Low()   GPIOB->BRR = GPIO_Pin_2
 #define   SSD_Reset_High()  GPIOB->ODR |= GPIO_Pin_2
 #define   SSD_A0_Low()      GPIOB->BRR = GPIO_Pin_10
 #define   SSD_A0_High()     GPIOB->ODR |= GPIO_Pin_10
 #define   SSD_CS_Low()      GPIOB->BRR = GPIO_Pin_1
 #define   SSD_CS_High()     GPIOB->ODR |= GPIO_Pin_1
 //#define   SSD_Clk_Low()     GPIO_ResetBits(GPIOA, GPIO_Pin_3)
 //#define   SSD_Clk_High()    GPIO_SetBits(GPIOA, GPIO_Pin_5)
 //#define   SSD_Data_Low()    GPIO_ResetBits(GPIOA, GPIO_Pin_7)
 //#define   SSD_Data_High()   GPIO_SetBits(GPIOA, GPIO_Pin_7)
 #define   SSD_Reset_Low()   GPIO_ResetBits(GPIOB, GPIO_Pin_2)
 #define   SSD_Reset_High()  GPIO_SetBits(GPIOB, GPIO_Pin_2)
 #define   SSD_A0_Low()      GPIO_ResetBits(GPIOB, GPIO_Pin_10)
 #define   SSD_A0_High()     GPIO_SetBits(GPIOB, GPIO_Pin_10)
 #define   SSD_CS_Low()      GPIO_ResetBits(GPIOB, GPIO_Pin_1)
 #define   SSD_CS_High()     GPIO_SetBits(GPIOB, GPIO_Pin_1)
 // 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
 #define   SPI_SendByte(data)  SPI_I2S_SendData(SPI1,data)
 #define   SPI_Wait()       while(!(SPI1->SR&SPI_I2S_FLAG_TXE));while(SPI1->SR&SPI_I2S_FLAG_BSY);
 #define   SSD1303_FPS                   50
 #define   IsLedOn()       (!(GPIOA->ODR & GPIO_Pin_8))
 #define   LED_ON()        GPIOA->BRR = GPIO_Pin_8
 #define   LED_OFF()       GPIOA->BSRR = GPIO_Pin_8
 #define   ToggleLED()     if(GPIOA->ODR & GPIO_Pin_8){GPIOA->BRR = GPIO_Pin_8;}\
                           else{GPIOA->BSRR = GPIO_Pin_8;}
 #define   GSel1_High()    GPIOB->BSRR = GPIO_Pin_9
 #define   GSel1_Low()     GPIOB->BRR = GPIO_Pin_9
 #define   MMA_SLEEP()     GPIOB->BRR = GPIO_Pin_11
 #define   MMA_WAKEUP()    GPIOB->BSRR = GPIO_Pin_11
 #define   Is_MMA_WAKEUP() (GPIOB->ODR & GPIO_Pin_11)
 #define   DMA_SSD_1303    DMA1_Channel5
 #define   DMA_Handler_SSD_1303    DMA1_Channel5_IRQHandler
 #define   Is_Enc_Key_Down()    (!(GPIOA->IDR & GPIO_Pin_0))
 #endif

main.c

➞

Show inline comments

 #include "main.h"
 #include "stm32l100c_discovery.h"
 #include "ssd1306.h"
 #define LED_POWER GPIOB,  GPIO_Pin_9
 #define LED_STAT  GPIOA,  GPIO_Pin_15
 #define LED_POWER GPIOB,GPIO_Pin_9
 #define LED_STAT  GPIOA,GPIO_Pin_15
 static __IO uint32_t TimingDelay;
 uint8_t BlinkSpeed = 0;
 void init_gpio();
 void init_spi();
 /* Main */
 int main(void)
+{
    // Hopefully init clocks
    SystemInit();
    RCC_ClocksTypeDef RCC_Clocks;
   /* Configure LED3 and LED4 on STM32L100C-Discovery */
   STM_EVAL_LEDInit(LED3);
   STM_EVAL_LEDInit(LED4);
   /* SysTick end of count event each 1ms */
+    /* SysTick end of count event each 1ms */
   RCC_GetClocksFreq(&RCC_Clocks);
   SysTick_Config(RCC_Clocks.HCLK_Frequency / 1000);
  /* Initiate Blink Speed variable */
   BlinkSpeed = 1;
   GPIO_ResetBits(LED_STAT);
   Delay(100);
   init_gpio();
   init_spi();
-  //SPI_I2S_SendData(SPI1, 0x1);
+//  SPI_I2S_SendData(SPI1, 0x1);
  /* Init lcd driver */
-//  SSD1303_Init();
 // SSD1303_Init();
 //  SSD1303_DrawPoint(3,3,1);
 //  SSD1303_DrawPoint(5,5,0);
 //testme
 //  GPIO_SetBits(LED_PWR);
   STM_EVAL_LEDOn(LED4);
   Delay(1000);
 // GPIO_ResetBits(LED_PWR);
 STM_EVAL_LEDOff(LED4);
   Delay(1000);
   GPIO_SetBits(LED_POWER);
 //  GPIO_SetBits(LED_STAT);
 //  STM_EVAL_LEDOn(LED4);
   Delay(500);
  GPIO_ResetBits(LED_POWER);
 // GPIO_ResetBits(LED_STAT);
 //  STM_EVAL_LEDOff(LED4);
   while(1)
+  {
       /* Turn on LD4 Blue LED during 1s each time User button is pressed */
       STM_EVAL_LEDOn(LED4);
       //STM_EVAL_LEDOn(LED4);
       GPIO_SetBits(LED_POWER);
       //STM_EVAL_LEDOn(LED3);
       /* wait for 1s */
-      Delay(300);
+      Delay(150);
       /* Turn off LD4 Blue LED after 1s each time User button is pressed */
       STM_EVAL_LEDOff(LED4);
       Delay(300);
       //STM_EVAL_LEDOff(LED4);
       GPIO_ResetBits(LED_POWER);
       Delay(150);
+  }
+}
 /**
   * @brief  Inserts a delay time.
   * @param  nTime: specifies the delay time length, in 1 ms.
   * @retval None
   */
 void Delay(__IO uint32_t nTime)
+{
   TimingDelay = nTime;
   while(TimingDelay != 0);
+}
 /**
   * @brief  Decrements the TimingDelay variable.
   * @param  None
   * @retval None
   */
 void TimingDelay_Decrement(void)
+{
   if (TimingDelay != 0x00)
+  {
     TimingDelay--;
+  }
+}
 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);
   /*Enable or disable the APB peripheral clock */
   // Enable SPI clocks
   RCC_APB2PeriphClockCmd(RCC_APB2Periph_SPI1, ENABLE);
   RCC_APB1PeriphClockCmd(RCC_APB1Periph_SPI2, ENABLE);
   // Enable GPIO clocks
   RCC_AHBPeriphClockCmd(RCC_AHBPeriph_GPIOC|RCC_AHBPeriph_GPIOB|RCC_AHBPeriph_GPIOA, 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;

ssd1306.c

➞

Show inline comments

@@ @@ -36,137 +36,136 @@ static uint8_t lastContrast = 0xCC; @@
 /* Private function prototypes -----------------------------------------------*/
 void  WriteCommand(unsigned char command);
 void  WriteData(unsigned char data);
 void  OnPageTransferDone(void);
 unsigned long SSD1303_OFF(void);
 unsigned long SSD1303_ON(void);
 unsigned char* SSD1303_GetBuffer()
+{
   return SSD1303_Buffer;
+}
 /*******************************************************************************
 * Function Name  : WriteCommand
 * Description    : Write command to the SSD1303
 * Input          : None
 * Output         : None
 * Return         : None
 *******************************************************************************/
 void WriteCommand(unsigned char command)
+{
   SSD_A0_Low();
   SPI_SendByte(command);
   SPI_Wait();
+}
 /*******************************************************************************
 * Function Name  : WriteData
 * Description    : Write data to the SSD1303
 * Input          : None
 * Output         : None
 * Return         : None
 *******************************************************************************/
 void WriteData(unsigned char data)
+{
   SSD_A0_High();
   SPI_SendByte(data);
   SPI_Wait();
+}
 /*******************************************************************************
 * Function Name  : SSD1303_Init
 * Description    : Initialize the SSD1303
 * Input          : None
 * Output         : None
 * Return         : None
 *******************************************************************************/
 void SSD1303_Init(void)
+{
   /* Initialize SPI2 */
   // TODO
   /* Generate a reset */
   SSD_Reset_Low();
   uint32_t i ;
   for(i=5000;--i;);
   uint32_t i;
   for(i=5000; i>1; i--)
   SSD_Reset_High();
   /*************************************************
   // SSD1303 Initialization Command
   *************************************************/
   // Lower Column Address
   WriteCommand(0x00); /* Set Lower Column Address */
   GPIO_SetBits(GPIOA,GPIO_Pin_15);
   // High Column Address
   WriteCommand(0x10); /* Set Higher Column Address*/
   // Display Start Line
   WriteCommand(0x40); /* Set Display Start Line */
 #ifdef    DEBUG_BOARD
   curContrast = lastContrast = 0x30;
 #else
   curContrast = lastContrast = 0xCF;
 #endif
   // Contrast Control Register
   WriteCommand(0x81); /* Set Contrast Control */
   WriteCommand(lastContrast); /* 0 ~ 255 0x1f*/
   // Re-map
   WriteCommand(0xA1); /* [A0]:column address 0 is map
   to SEG0 , [A1]: columnaddress 131 is map to SEG0*/
   // Entire Display ON/OFF
   WriteCommand(0xA4); /* A4=ON */
   // Normal or Inverse Display
   WriteCommand(0XA6); /* Normal Display*/
   // Multiplex Ratio
   WriteCommand(0xA8); /* Set Multiplex Ratio */
   WriteCommand(0x3f); /* Set to 36 Mux*/
   // Set DC-DC
   WriteCommand(0xAD); /* Set DC-DC */
   WriteCommand(0x8B); /* 8B=ON, 8A=Off */
   // Display ON/OFF
   WriteCommand(0xAE); /* AF=ON , AE=OFF*/
   // Display Offset
   WriteCommand(0xD3); /* Set Display Offset */
   WriteCommand(0x00); /* No offset */
   // Display Clock Divide
   WriteCommand(0xD5); /* Set Clock Divide */
   WriteCommand(0x20); /* Set to 80Hz */
   // Area Color Mode
   WriteCommand(0xD8); /* Set Area Color On or Off*/
   WriteCommand(0x00); /* Mono Mode */
   // COM Pins Hardware Configuration
   WriteCommand(0xDA); /* Set Pins HardwareConfiguration */
   WriteCommand(0x12);
   // VCOMH
   WriteCommand(0xDB); /* Set VCOMH */
   WriteCommand(0x00);
   // VP
   WriteCommand(0xD9); /* Set VP */
   WriteCommand(0x22); /* P1=2 , P2=2 */
   // Set Common output scan direction
   WriteCommand(0xc8);/* Set COM scan direction */
   // For SSD1306 Set the address mode
   WriteCommand(0x20);/* Set address mode */
   WriteCommand(0x00);/* Set address mode horizontal */
   // Set the page start address
   WriteCommand(0xb0);
   WriteCommand(0x00);
   WriteCommand(0x10);
   /* Turn on the controller */
   pre_on = SSD1303_ON();
 //  // Set Charge pump
 //  WriteCommand(0x8D); /* Set Charge pump */
 //  WriteCommand(0x14); /* 0x14=ON, 0x10=Off */
 //
 //  // Turn on the display
 //  WriteCommand(0xaf);
+}
 /*******************************************************************************
 * Function Name  : SSD1303_TurnOff
 * Description    : Turn off the SSD1303 controller
 * Input          : None
 * Output         : None

0 comments (0 inline, 0 general)