therm Changeset - 63171fecb213 · protofusion repositories

Changeset - 63171fecb213

Parent rev.

Child rev.

[Not reviewed]

default

0 1 0

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

Formatting

1 file changed with 5 insertions and 18 deletions:

main.c

0 comments (0 inline, 0 general)

main.c

➞

Show inline comments

@@ @@ -3,59 +3,45 @@ @@
 #include "ssd1306.h"
 #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);
  /* Init lcd driver */
 // SSD1303_Init();
     //SSD1302_Init();
 //  SSD1303_DrawPoint(3,3,1);
 //  SSD1303_DrawPoint(5,5,0);
 //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 LD4 Blue LED during 1s each time User button is pressed */
+        /* 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);
       /* wait for 1s */
       Delay(150);
@@ @@ -263,6 +249,7 @@ void assert_failed(uint8_t* file, uint32 @@
   /* Infinite loop */
   while (1)
   {}
+}
 #endif
 // vim:softtabstop=4 shiftwidth=4 expandtab

0 comments (0 inline, 0 general)