therm Changeset - e51b465ab1cd · protofusion repositories

Changeset - e51b465ab1cd

Parent rev.

Child rev.

[Not reviewed]

default

0 3 0

Ethan Zonca - 10 years ago 2014-08-19 20:37:55
ez@ethanzonca.com

Add logo rendering code

3 files changed with 62 insertions and 3 deletions:

main.c

ssd1306.c

ssd1306.h

0 comments (0 inline, 0 general)

main.c

➞

Show inline comments

@@ @@ -20,24 +20,26 @@ @@
 #define SW_LEFT GPIOB, GPIO_Pin_5
 #define SW_RIGHT GPIOB, GPIO_Pin_4
 // USB Supporting Vars
 extern __IO uint8_t Receive_Buffer[64];
 extern __IO  uint32_t Receive_length ;
 extern __IO  uint32_t length ;
 uint8_t Send_Buffer[64];
 uint32_t packet_sent=1;
 uint32_t packet_receive=1;
 static __IO uint32_t TimingDelay;
 // Move to header file
 void init_gpio();
 void init_spi();
 void process();
 void machine();
 int main(void)
+{
     // Init clocks
@@ @@ -59,54 +61,56 @@ int main(void) @@
     SysTick_Config(RCC_Clocks.HCLK_Frequency / 1000);
     GPIO_ResetBits(LED_STAT);
     Delay(100);
     GPIO_SetBits(LED_POWER);
     Delay(500);
     GPIO_ResetBits(LED_POWER);
     init_spi();
     ssd1306_Init();
     ssd1306_block_write();
     ssd1306_DrawString("Hello World!", 0, 10);
     ssd1306_DrawString("therm 0.1", 0, 40);
     ssd1306_DrawString("Status: Idle", 2, 40);
   //  ssd1306_block_write();
     ssd1306_test();
     uint8_t toggle = 0;
     while(1)
+   {
         //ssd1306_block_write();
         // Process sensor inputs [TODO: 5hz?]
         process();
         // Run state machine [TODO: 50hz?]
         machine();
         // probably just passed the actual port
         // TODO: Grab buttonpresses with interrupts
         uint8_t sw_btn = GPIO_ReadInputDataBit(SW_BTN);
         uint8_t sw_up = GPIO_ReadInputDataBit(SW_UP);
         uint8_t sw_down = GPIO_ReadInputDataBit(SW_DOWN);
         uint8_t sw_left = GPIO_ReadInputDataBit(SW_LEFT);
         uint8_t sw_right = GPIO_ReadInputDataBit(SW_RIGHT);
         if(!sw_btn) {
             GPIO_ToggleBits(LED_STAT);
             if(!toggle) {
-                ssd1306_DrawString("I freaking work!", 2, 10);
+                ssd1306_DrawString("________________", 3, 32);
                 toggle = ! toggle;
+            }
             else  {
-                ssd1306_block_write();
+                ssd1306_DrawString("----------------", 3, 32);
                 toggle = ! toggle;
+            }
+        }
         GPIO_SetBits(LED_POWER);
         Delay(50);
         GPIO_ResetBits(LED_POWER);
         Delay(50);
+    }
+}
 int32_t temp = 0;

ssd1306.c

➞

Show inline comments

@@ @@ -626,24 +626,78 @@ void setStartPage(unsigned char d) @@
+{
     WriteCommand(0xB0|d);       // Set Page Start Address for Page Addressing Mode
                                 // Default => 0xB0 (0x00)
+}
 /* Below are functions used to configure the OLED */
 void setStartColumn(unsigned char d)
+{
     WriteCommand(0x00+d%16);    // Set Lower Column Start Address for Page Addressing Mode
     WriteCommand(0x10+d/16);    // Set Higher Column Start Address for Page Addressing Mode
                                 // Default => 0x10
+}
 const uint8_t row[4][32] = {
 {0x00,0x00,0x01,0x03,0x07,0x0F,0x1E,0x3C,0x3C,0x7C,0x7C,0x7C,0xFC,0xFF,0xFF,0xFC,0xFC,0xFC,0xFC,0xFF,0x7F,0x7F,0x7F,0x3C,0x3C,0x1C,0x0C,0x06,0x03,0x01,0x00,0x00},
 {0x0F,0x7F,0xFF,0xFF,0xFF,0xFF,0x00,0x00,0x00,0x00,0x3F,0x3F,0x7F,0xFF,0xFF,0x00,0x00,0x00,0x00,0xFF,0xFF,0xFF,0xFF,0x00,0x00,0x00,0x00,0x00,0xFF,0xFF,0x7F,0x0F},
 {0xF0,0xFE,0xFF,0xFF,0xFF,0xC7,0x00,0x00,0x00,0x00,0x87,0xC7,0xC7,0xFF,0xFF,0x00,0x00,0x00,0x00,0x87,0x87,0xC7,0xC3,0x03,0x07,0x07,0x0F,0x7F,0xFF,0xFF,0xFE,0xF0},
 {0x00,0x00,0x80,0xC0,0xE0,0xF0,0xF8,0xFC,0xFC,0xFE,0xFE,0xFE,0xFF,0xFF,0xFF,0x1F,0x1F,0x1F,0x1F,0xFF,0xFE,0xFE,0xFE,0xFC,0xFC,0xF8,0xF0,0xE0,0xC0,0x80,0x00,0x00},
 };
 void ssd1306_test()
+{
     uint8_t i = 0;
     setStartPage(3);
     setStartColumn(0);
     for(i = 0; i<32; i++)
+    {
         WriteData(row[0][i]);
+    }
     WriteData(0x00);
     setStartPage(2);
     setStartColumn(0);
     for(i = 0; i<32; i++)
+    {
         WriteData(row[1][i]);
+    }
     WriteData(0x00);
     setStartPage(1);
     setStartColumn(0);
     for(i = 0; i<32; i++)
+    {
         WriteData(row[2][i]);
+    }
     WriteData(0x00);
     setStartPage(0);
     setStartColumn(0);
     for(i = 0; i<32; i++)
+    {
         WriteData(row[3][i]);
+    }
     WriteData(0x00);
+}
 /* Print a single character from font.cpp */
 void ssd1306_DrawChar(char ascii, unsigned char row, unsigned char xPos)
+{
     char *srcPointer = 0;
     unsigned char i;
     srcPointer = &fontData[(ascii-32)][0];
     setStartPage(row);
     setStartColumn(xPos);
     for(i=0;i<5;i++)

ssd1306.h

➞

Show inline comments

@@ @@ -41,14 +41,15 @@ void StartPageTransfer(void); @@
 extern  const DeviceProp  ssd1306_Prop;
 unsigned long ssd1306_DrawBlock(Pos_t x, Pos_t y, Pos_t cx, Pos_t cy, const unsigned char* data);
 unsigned long ssd1306_IsOn(void);
 unsigned long ssd1306_TurnOff(void);
 unsigned long ssd1306_TurnOn(void);
 unsigned char ssd1306_SetContrast(unsigned char contrast);
 unsigned char ssd1306_GetContrast();
 unsigned char* ssd1306_GetBuffer();
 unsigned long ssd1306_DrawPoint(Pos_t x, Pos_t y, Color_t color);
 void ssd1306_block_write(void);
 void ssd1306_DrawChar(char ascii, unsigned char row, unsigned char xPos);
 void ssd1306_DrawString(const char *dataPtr, unsigned char row, unsigned char xPos);
 void ssd1306_test();
 #endif

0 comments (0 inline, 0 general)