Revision 13:8dd215952d76, committed 2015-12-03

Comitter:

messi1

Date:

Thu Dec 03 21:48:11 2015 +0000

Parent:

12:8e27450eb391

Child:

14:961ce3497de1

Commit message:

Fixed Chinese Typos

Changed in this revision

--- a/include/SGL.h	Wed Nov 18 23:32:15 2015 +0000
+++ b/include/SGL.h	Thu Dec 03 21:48:11 2015 +0000
@@ -51,8 +51,8 @@
     virtual void fillRect(T x, T y, T width, T height, uint16_t color);
     virtual void drawCircle(T x, T y, T r, uint16_t color);
     virtual void fillCircle(T x, T y, T r, uint16_t color);
-    virtual void drawTraingle(T x0, T y0, T x1, T y1, T x2, T y2, uint16_t color);
-    virtual void fillTraingle(T x0, T y0, T x1, T y1, T x2, T y2, uint16_t color);    
+    virtual void drawTriangle(T x0, T y0, T x1, T y1, T x2, T y2, uint16_t color);
+    virtual void fillTriangle(T x0, T y0, T x1, T y1, T x2, T y2, uint16_t color);    
     
     // The zoom factor works at the moment only with integer values. Float values will create bad fonts 
     virtual void drawChar(uint8_t ascii, T x, T y, uint16_t color, float zoom=1);

--- a/include/SSD1331.h	Wed Nov 18 23:32:15 2015 +0000
+++ b/include/SSD1331.h	Thu Dec 03 21:48:11 2015 +0000
@@ -157,7 +157,7 @@
     PM_NormalMode      = 0xAF
 };
 
-enum ScollingDirection{
+enum ScrollDirection{
     SD_Horizontal      = 0x00,
     SD_Vertical        = 0x01,
     SD_Diagonal        = 0x02
@@ -298,13 +298,13 @@
         *  @param rowNum       Position x bottom right corner
         *  @param interval     Speed of the scrolling either 6, 10 100 or 200 frames
         */
-        void setScolling(ScollingDirection direction, uint8_t rowAddr, uint8_t rowNum, ScrollInterval interval);
+        void setScrolling(ScrollDirection dir, uint8_t rowAddr, uint8_t rowNum, ScrollInterval interval);
         
         /** Enables or disables the scrolling
         *
         *  @param enable   Set true or flase for enabling or disabling the scrolling
         */
-        void enableScolling(bool enable);
+        void enableScrolling(bool enable);
         
         /** Sets the display mode of the oled screen
         *

--- a/src/SGL.cpp	Wed Nov 18 23:32:15 2015 +0000
+++ b/src/SGL.cpp	Thu Dec 03 21:48:11 2015 +0000
@@ -156,7 +156,7 @@
 
 //---------------------------------------------------------------------------------------
 template <class T>
-void SGL<T>::drawTraingle(T x0, T y0, T x1, T y1, T x2, T y2, uint16_t color)
+void SGL<T>::drawTriangle(T x0, T y0, T x1, T y1, T x2, T y2, uint16_t color)
 {
     drawLine(x0, y0, x1, y1,color);
     drawLine(x1, y1, x2, y2,color);
@@ -165,7 +165,7 @@
 
 //---------------------------------------------------------------------------------------
 template <class T>
-void SGL<T>::fillTraingle(T x0, T y0, T x1, T y1, T x2, T y2, uint16_t color)
+void SGL<T>::fillTriangle(T x0, T y0, T x1, T y1, T x2, T y2, uint16_t color)
 {
     T a, b, y, last;
 

--- a/src/SSD1331.cpp	Wed Nov 18 23:32:15 2015 +0000
+++ b/src/SSD1331.cpp	Thu Dec 03 21:48:11 2015 +0000
@@ -215,7 +215,7 @@
 }
 
 //------------------------------------------------------------------------------------
-void SSD1331::setScolling(ScollingDirection direction, uint8_t rowAddr, uint8_t rowNum, ScrollInterval interval)
+void SSD1331::setScrolling(ScrollDirection direction, uint8_t rowAddr, uint8_t rowNum, ScrollInterval interval)
 {
     uint8_t scolling_horizontal = 0x0;
     uint8_t scolling_vertical = 0x0;
@@ -243,7 +243,7 @@
 }
 
 //------------------------------------------------------------------------------------
-void SSD1331::enableScolling(bool enable)
+void SSD1331::enableScrolling(bool enable)
 {
     if(enable)
         sendCmd(CMD_ACTIVE_SCROLLING);