update API:

- disp_area() -> draw_area() - disp_inverted() -> invert_colors() - disp_vis_ena() -> visibility()
avsa242 · Nov 5, 2022 · e4e5af1 · e4e5af1
1 parent e7118d7
commit e4e5af1
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 26 deletions.
diff --git a/display.oled.ssd130x.spin b/display.oled.ssd130x.spin
@@ -157,8 +157,8 @@ PUB defaults{}
     chg_pump_voltage(7_500)
     addr_mode(PAGE)
     contrast(127)
-    disp_vis_ena(NORMAL)
-    disp_area(0, 0, 127, 63)
+    visibility(NORMAL)
+    draw_area(0, 0, 127, 63)
     powered(TRUE)
 #else
     reset{}
@@ -170,7 +170,7 @@ PUB preset_128x{}
     disp_start_line(0)
     chg_pump_voltage(7_500)
     addr_mode(HORIZ)
-    disp_vis_ena(NORMAL)
+    visibility(NORMAL)
     case _disp_height
         32:
             com_pin_cfg(0, 0)
@@ -186,7 +186,7 @@ PUB preset_128x32{}
     disp_start_line(0)
     chg_pump_voltage(7_500)
     addr_mode(HORIZ)
-    disp_vis_ena(NORMAL)
+    visibility(NORMAL)
     com_pin_cfg(0, 0)
     powered(TRUE)
 
@@ -196,7 +196,7 @@ PUB preset_128x64{}
     disp_start_line(0)
     chg_pump_voltage(7_500)
     addr_mode(HORIZ)
-    disp_vis_ena(NORMAL)
+    visibility(NORMAL)
     com_pin_cfg(1, 0)
     powered(TRUE)
 
@@ -227,7 +227,7 @@ PUB bitmap(ptr_bmap, sx, sy, ex, ey) | bm_sz
 '   ptr_bmap: pointer to bitmap data
 '   (sx, sy): upper-left corner of bitmap
 '   (ex, ey): lower-right corner of bitmap
-    disp_area(sx, sy, ex, ey)
+    draw_area(sx, sy, ex, ey)
     bm_sz := ((ex-sx) * (ey-sy)) / 8
 
     wr_buffer(ptr_bmap, bm_sz)
@@ -239,7 +239,7 @@ PUB char = putchar
 PUB putchar(ch) | ch_offs
 ' Draw a character from the loaded font
     ch_offs := _font_addr + (ch << 3)
-    disp_area(_charpx_x, _charpx_y, _charpx_x+_charcell_w, _charpx_y+_charcell_h)
+    draw_area(_charpx_x, _charpx_y, _charpx_x+_charcell_w, _charpx_y+_charcell_h)
 
     wr_buffer(ch_offs, _charcell_w)
 
@@ -346,7 +346,7 @@ PUB contrast(level)
     level := (0 #> level <# 255)
     writereg(core#CONTRAST, 1, level)
 
-PUB disp_area(sx, sy, ex, ey)
+PUB draw_area(sx, sy, ex, ey)
 ' Set displayable area
     ifnot (lookup(sx: 0..127) or lookup(sy: 0..63) or lookup(ex: 0..127) or lookup(ey: 0..63))
         return
@@ -356,12 +356,12 @@ PUB disp_area(sx, sy, ex, ey)
     writereg(core#SET_COLADDR, 2, (ex << 8) | sx)
     writereg(core#SET_PAGEADDR, 2, (ey << 8) | sy)
 
-PUB disp_inverted(state) | tmp
+PUB invert_colors(state) | tmp
 ' Invert display colors
     if (state)
-        disp_vis_ena(INVERTED)
+        visibility(INVERTED)
     else
-        disp_vis_ena(NORMAL)
+        visibility(NORMAL)
 
 PUB disp_lines(lines)
 ' Set total number of display lines
@@ -385,7 +385,7 @@ PUB disp_start_line(line)
     line := (0 #> line <# 63)
     writereg(core#DISP_STLINE, 0, line)
 
-PUB disp_vis_ena(mode)
+PUB visibility(mode)
 ' Set display visibility
     case mode
         NORMAL:
@@ -468,7 +468,7 @@ PUB reset{}
 
 PUB show{} | tmp
 ' Write display buffer to display
-    disp_area(0, 0, _disp_xmax, _disp_ymax)
+    draw_area(0, 0, _disp_xmax, _disp_ymax)
 
 #ifdef SSD130X_I2C
     i2c.start{}

diff --git a/display.oled.ssd130x.spin2 b/display.oled.ssd130x.spin2
@@ -156,8 +156,8 @@ PUB defaults()
     chg_pump_voltage(7_500)
     addr_mode(PAGE)
     contrast(127)
-    disp_vis_ena(NORMAL)
-    disp_area(0, 0, 127, 63)
+    visibility(NORMAL)
+    draw_area(0, 0, 127, 63)
     powered(TRUE)
 #else
     reset()
@@ -169,7 +169,7 @@ PUB preset_128x()
     disp_start_line(0)
     chg_pump_voltage(7_500)
     addr_mode(HORIZ)
-    disp_vis_ena(NORMAL)
+    visibility(NORMAL)
     case _disp_height
         32:
             com_pin_cfg(0, 0)
@@ -185,7 +185,7 @@ PUB preset_128x32()
     disp_start_line(0)
     chg_pump_voltage(7_500)
     addr_mode(HORIZ)
-    disp_vis_ena(NORMAL)
+    visibility(NORMAL)
     com_pin_cfg(0, 0)
     powered(TRUE)
 
@@ -195,7 +195,7 @@ PUB preset_128x64()
     disp_start_line(0)
     chg_pump_voltage(7_500)
     addr_mode(HORIZ)
-    disp_vis_ena(NORMAL)
+    visibility(NORMAL)
     com_pin_cfg(1, 0)
     powered(TRUE)
 
@@ -226,7 +226,7 @@ PUB bitmap(ptr_bmap, sx, sy, ex, ey) | bm_sz
 '   ptr_bmap: pointer to bitmap data
 '   (sx, sy): upper-left corner of bitmap
 '   (ex, ey): lower-right corner of bitmap
-    disp_area(sx, sy, ex, ey)
+    draw_area(sx, sy, ex, ey)
     bm_sz := ((ex-sx) * (ey-sy)) / 8
 
     wr_buffer(ptr_bmap, bm_sz)
@@ -238,7 +238,7 @@ PUB char = putchar
 PUB putchar(ch) | ch_offs
 ' Draw a character from the loaded font
     ch_offs := _font_addr + (ch << 3)
-    disp_area(_charpx_x, _charpx_y, _charpx_x+_charcell_w, _charpx_y+_charcell_h)
+    draw_area(_charpx_x, _charpx_y, _charpx_x+_charcell_w, _charpx_y+_charcell_h)
 
     wr_buffer(ch_offs, _charcell_w)
 
@@ -344,7 +344,7 @@ PUB contrast(level)
     level := (0 #> level <# 255)
     writereg(core.CONTRAST, 1, level)
 
-PUB disp_area(sx, sy, ex, ey)
+PUB draw_area(sx, sy, ex, ey)
 ' Set displayable area
     ifnot (lookup(sx: 0..127) or lookup(sy: 0..63) or lookup(ex: 0..127) or lookup(ey: 0..63))
         return
@@ -354,12 +354,12 @@ PUB disp_area(sx, sy, ex, ey)
     writereg(core.SET_COLADDR, 2, (ex << 8) | sx)
     writereg(core.SET_PAGEADDR, 2, (ey << 8) | sy)
 
-PUB disp_inverted(state) | tmp
+PUB invert_colors(state) | tmp
 ' Invert display colors
     if (state)
-        disp_vis_ena(INVERTED)
+        visibility(INVERTED)
     else
-        disp_vis_ena(NORMAL)
+        visibility(NORMAL)
 
 PUB disp_lines(lines)
 ' Set total number of display lines
@@ -383,7 +383,7 @@ PUB disp_start_line(line)
     line := (0 #> line <# 63)
     writereg(core.DISP_STLINE, 0, line)
 
-PUB disp_vis_ena(mode)
+PUB visibility(mode)
 ' Set display visibility
     case mode
         NORMAL:
@@ -465,7 +465,7 @@ PUB reset()
 
 PUB show() | tmp
 ' Write display buffer to display
-    disp_area(0, 0, _disp_xmax, _disp_ymax)
+    draw_area(0, 0, _disp_xmax, _disp_ymax)
 
 #ifdef SSD130X_I2C
     i2c.start()