diff --git a/main.c b/main.c --- a/main.c +++ b/main.c @@ -6,7 +6,6 @@ #define LED_STAT GPIOA,GPIO_Pin_15 static __IO uint32_t TimingDelay; -uint8_t BlinkSpeed = 0; void init_gpio(); void init_spi(); @@ -15,56 +14,43 @@ void init_spi(); 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 */ - RCC_GetClocksFreq(&RCC_Clocks); - SysTick_Config(RCC_Clocks.HCLK_Frequency / 1000); + // Hopefully init clocks + SystemInit(); + RCC_ClocksTypeDef RCC_Clocks; + + //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); - GPIO_ResetBits(LED_STAT); - Delay(100); + init_gpio(); + init_spi(); + + //SSD1302_Init(); + //SSD1303_DrawPoint(3,3,1); + //SSD1303_DrawPoint(5,5,0); - init_gpio(); - init_spi(); -// SPI_I2S_SendData(SPI1, 0x1); - /* Init lcd driver */ -// SSD1303_Init(); -// SSD1303_DrawPoint(3,3,1); -// SSD1303_DrawPoint(5,5,0); + GPIO_SetBits(LED_POWER); + Delay(500); + GPIO_ResetBits(LED_POWER); -//testme - 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 LD0 Blue LED during 1s each time User button is pressed */ + //STM_EVAL_LEDOn(LED4); + GPIO_SetBits(LED_POWER); + //STM_EVAL_LEDOn(LED3); - while(1) - { - /* Turn on LD4 Blue LED during 1s each time User button is pressed */ - //STM_EVAL_LEDOn(LED4); - GPIO_SetBits(LED_POWER); - //STM_EVAL_LEDOn(LED3); - - /* wait for 1s */ - Delay(150); - - /* Turn off LD4 Blue LED after 1s each time User button is pressed */ - //STM_EVAL_LEDOff(LED4); - GPIO_ResetBits(LED_POWER); - Delay(150); - } + /* wait for 1s */ + Delay(150); + + /* Turn off LD4 Blue LED after 1s each time User button is pressed */ + //STM_EVAL_LEDOff(LED4); + GPIO_ResetBits(LED_POWER); + Delay(150); + } } /** @@ -95,33 +81,33 @@ void TimingDelay_Decrement(void) void init_spi(void) { - SPI_InitTypeDef SPI_InitStructure; + 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 */ + // 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 */ + // 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) { @@ -266,3 +252,4 @@ void assert_failed(uint8_t* file, uint32 } #endif +// vim:softtabstop=4 shiftwidth=4 expandtab