therm Changeset - bf4d568491ad · protofusion repositories

Changeset - bf4d568491ad

Parent rev.

Child rev.

[Not reviewed]

default

1 1 0

Ethan Zonca - 10 years ago 2014-08-18 23:12:13
ez@ethanzonca.com

Remove old code

2 files changed with 2 insertions and 493 deletions:

ssd1306.c

system_stm32l1xx_4meg_extxtal.c

395

0 comments (0 inline, 0 general)

ssd1306.c

➞

Show inline comments

@@ @@ -77,25 +77,24 @@ void WriteData(unsigned char data) @@
 * Output         : None
 * Return         : None
 *******************************************************************************/
 void ssd1306_Init(void)
+{
   /* Generate a reset */
   SSD_Reset_Low();
   uint32_t i;
   for(i=5000; i>1; i--)
   SSD_Reset_High();
   WriteCommand(0xAE);
   WriteCommand(0xD5);
   WriteCommand(0x80);
   WriteCommand(0xA8);
   WriteCommand(0x1F);
   WriteCommand(0xD3);
   WriteCommand(0x00);
   WriteCommand(0x40 | 0x00); // line #0
   WriteCommand(0x8D);
   WriteCommand(0x14); //10 or 14 if not externalvcc
   WriteCommand(0x20);
   WriteCommand(0x00);
@@ @@ -104,132 +103,43 @@ void ssd1306_Init(void) @@
   WriteCommand(0xDA); // setcompins
   WriteCommand(0x02);
   WriteCommand(0x81); // contrast
   WriteCommand(0x0F); // contrast value. 8f is a good one.
   WriteCommand(0xD9);
   WriteCommand(0xF1); //22 or F1 if not externalvcc
   WriteCommand(0xDB);
   WriteCommand(0x40);
   WriteCommand(0xA4); // dispalyallon_resume
   WriteCommand(0xA6); // normaldisplay
   WriteCommand(0xAF); // display on
   // Clear buffer
 //  for(i=0;i<900;i++)
 //    ssd1306_Buffer[i] = 0;
   /*************************************************
   // ssd1306 Initialization Command
   *************************************************/
  /*
   // Lower Column Address
   WriteCommand(0x00); // Set Lower Column Address
   GPIO_SetBits(GPIOA,GPIO_Pin_15);//turn on status LED
   // 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 = ssd1306_ON();
 //  // Set Charge pump
 //  WriteCommand(0x8D); // Set Charge pump
 //  WriteCommand(0x14); // 0x14=ON, 0x10=Off
 //
 //  // Turn on the display
 //  WriteCommand(0xaf);
 */
+}
 void ssd1306_block_write(void)
+{
   // Set col start addr to 0
   WriteCommand(0x21);
   WriteCommand(0x00);
   // Set col end addr to width - 1
   WriteCommand(127);
   // Set page addr
   WriteCommand(0x22);
   WriteCommand(0x00); // start page addr
   WriteCommand(4); // end page addr (height / 8)
+  // Write data
   uint32_t i = 0;
   for(i=0;i<512;i++)
     WriteData(ssd1306_Buffer[i]);
 //  for(i=0;i<512;i++)
              // * * * *
 //    WriteData(0b00000011);
+}
 /*******************************************************************************
 * Function Name  : ssd1306_TurnOff
 * Description    : Turn off the ssd1306 controller
 * Input          : None
 * Output         : None
 * Return         : None
 *******************************************************************************/
 unsigned long ssd1306_TurnOff(void)
+{
@@ @@ -585,31 +495,25 @@ void ssd1306_FillScreen(Color_t color) @@
     ssd1306_Buffer[i] = mask;
+  }
+}
 const DeviceProp  ssd1306_Prop =
+{
   .pfnDrawBlok = ssd1306_DrawBlock,
   .pfnDrawPoint = ssd1306_DrawPoint,
   .xPixel = 128,
   .yPixel = 64,
 };
 // FontData
 // Times New Roman font
 const char fontData[240][5] =
 {                                       // Refer to "Times New Roman" Font Database
                                         //   Basic Characters
     {0x00,0x00,0x00,0x00,0x00},         //   (  0)    - 0x0020 No-Break Space
     {0x00,0x00,0x4F,0x00,0x00},         //   (  1)  ! - 0x0021 Exclamation Mark
     {0x00,0x07,0x00,0x07,0x00},         //   (  2)  " - 0x0022 Quotation Mark
     {0x14,0x7F,0x14,0x7F,0x14},         //   (  3)  # - 0x0023 Number Sign
     {0x24,0x2A,0x7F,0x2A,0x12},         //   (  4)  $ - 0x0024 Dollar Sign
     {0x23,0x13,0x08,0x64,0x62},         //   (  5)  % - 0x0025 Percent Sign
     {0x36,0x49,0x55,0x22,0x50},         //   (  6)  & - 0x0026 Ampersand
     {0x00,0x05,0x03,0x00,0x00},         //   (  7)  ' - 0x0027 Apostrophe
     {0x00,0x1C,0x22,0x41,0x00},         //   (  8)  ( - 0x0028 Left Parenthesis

system_stm32l1xx_4meg_extxtal.c

➞

Show inline comments

deleted file

0 comments (0 inline, 0 general)