update to latest release of driver

Author: ironsheep

libraries/community/p2/All/isp_hub75_matrix/isp_hub75_color.spin2

@@ -6,13 +6,13 @@
 ''               -- Copyright (c) 2020 Iron Sheep Productions, LLC
 ''               -- see below for terms of use
 ''   E-mail..... stephen@ironsheep.biz
-''   Started.... Oct 2020 
+''   Started.... Oct 2020
 ''   Updated.... 24 Oct 2020
 ''
 '' =================================================================================================
 
 CON { test colorset }
-  
+
     cBlack = $000000
     cWhite = $FFFFFF
     cRed = $FF0000
@@ -32,7 +32,7 @@ CON { test colorset }
     cDarkGreen = $006400
     cOrange = $FFA500
     cBlueViolet = $8A2BE2
-    
+
     ' SPECIAL non-colors - invoke alforithm to gerate actual color used'
     cRedWhtBlu = $deadf0
     cRainbow = $deadf1
@@ -61,15 +61,15 @@ PUB getBrightness() : brightness
     brightness := defaultBrightness
 
 PUB correctedColor(color) : adjustedColor
-    '' correct a color using generic gamma
+    '' Correct a color using generic gamma
     adjustedColor := color
     'return
     'adjustedColor := ((color * defaultBrightness) >> 8) & $ff
     adjustedColor := byte[@gamma][adjustedColor]
     adjustedColor := dutyCycleForIntensity(adjustedColor)
 
 PUB gammaPeek(color) : adjustedColor | gammmaIndex, lowColor, highColor
-    '' return index of nearest matching value in gamma table
+    '' Return index of nearest matching value in gamma table
     if bGammaEnable
         adjustedColor := byte[@gamma][color]
         repeat gammmaIndex from 0 to 255
@@ -92,7 +92,7 @@ PUB gammaPeek(color) : adjustedColor | gammmaIndex, lowColor, highColor
         adjustedColor := color
 
 PUB correctedSingleColor(led, colorValue) : adjustedColor | pGammaTable
-    '' correct the color for a specific LED (R, G, or B)
+    '' Correct the color for a specific LED (R, G, or B)
     adjustedColor := colorValue
     'adjustedColor := ((adjustedColor * defaultBrightness) >> 8) & $ff
     case led
@@ -130,30 +130,10 @@ PUB rgbColorFromDegrees(degrees) : rcbColor | offset60, fract60, red, green, blu
     elseif degrees >= 60
         green := 255
         red := ((59 - offset60) * fract60) / 100
-    else 
+    else
         red := 255
         green := (offset60 * fract60) / 100
-    {
-    fract60 := 4.25 ' float(255 / 60)  ' 4.25             ' 255 / 60
-    if degrees >= 300
-        red := 255
-        blue := (59 - offset60) * fract60
-    elseif degrees >= 240
-        blue := 255
-        red := offset60 * fract60
-    elseif degrees >= 180
-        blue := 255
-        green := (59 - offset60) * fract60
-    elseif degrees >= 120
-        green := 255
-        blue := offset60 * fract60
-    elseif degrees >= 60
-        green := 255
-        red := (59 - offset60) * fract60
-    else 
-        red := 255
-        green := offset60 * fract60
-    }
+
     rcbColor := cValueForRGB(red, green, blue)
     'debug("- degrees=", udec_(degrees), ", color=", uhex_long_(rcbColor), " RGB=", udec_(red), ", ", udec_(green), ", ", udec_(blue), ")" )
 
@@ -168,46 +148,8 @@ PUB cValueForRGB(red, green, blue) : combinedValue
     '' CONVERT: r,g,b to combined value
     combinedValue := ((red & $ff) << 16) | ((green & $ff) << 8) | (blue & $ff)
 
-PRI dutyCycleForIntensityOld1(hex8bit) : pwmBits
-    ' CALCULATE: proper duty cycle for intensity of 0-255
-    '         --- VERSION 1 - Bits spread throughout ---
-    if hex8bit == 255
-        pwmBits := $ff
-    elseif hex8bit == 0
-        pwmBits := $00
-    else
-        pwmBits := (hex8bit / screen.MAX_PWM_FRAMES - 1) + 1
-
-PRI dutyCycleForIntensityOld2(hex8bit) : pwmBits | segmentSize
-    ' CALCULATE: proper duty cycle for intensity of 0-255
-    '         --- VERSION 2 - 3/4 high, 1/4 off, rest spread throughout ---
-    segmentSize := (256 / (screen.MAX_PWM_FRAMES + 1)) / 8
-    if hex8bit >= 255 - ((segmentSize  * 6) - 1)
-        pwmBits := $ff
-    elseif hex8bit <= (segmentSize * 2)- 1
-        pwmBits := $00
-    else
-        pwmBits := (hex8bit / screen.MAX_PWM_FRAMES) + 1
-
-PRI dutyCycleForIntensityOld3(hex8bit) : pwmBits | segmentSize
-    ' WAIT!!!  Pastel colors!???!
-    ' CALCULATE: proper duty cycle for intensity of 0-255
-    '    --- VERSION 3 - Bits spread throughout ---
-    pwmBits := (hex8bit / screen.MAX_PWM_FRAMES + 1)
-
-PRI dutyCycleForIntensityOld4(hex8bit) : pwmBits | segmentSize
-    ' CALCULATE: proper duty cycle for intensity of 0-255
-    '         --- VERSION 4 - 2/6 high, 1/6 off, rest spread throughout ---
-    segmentSize := ((256 / (screen.MAX_PWM_FRAMES + 1)) / 2) / 3
-    if hex8bit >= 255 - (segmentSize * 2) + 1
-        pwmBits := $ff
-    elseif hex8bit <= 0 + segmentSize - 1
-        pwmBits := $00
-    else
-        pwmBits := ((hex8bit * 10854) / screen.MAX_PWM_FRAMES) / 10000
-
-PRI dutyCycleForIntensity(hex8bit) : pwmBits
-    ' CALCULATE: proper duty cycle for intensity of 0-255
+PUB dutyCycleForIntensity(hex8bit) : pwmBits
+    '' CALCULATE: proper duty cycle for intensity of 0-255
     '         --- VERSION 1 - Bits spread throughout ---
     if hex8bit == 255
         pwmBits := $ff
@@ -257,7 +199,7 @@ gammaOld   byte 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
         byte 172, 174, 176, 178, 180, 182, 184, 186, 188, 190, 192, 194, 197, 199, 201, 203, 205
         byte 207, 210, 212, 214, 216, 219, 221, 223, 226, 228, 230, 233, 235, 237, 240, 242, 245
         byte 247, 250, 252, 255
- 
+
 gamma2_0
         ' 256-step brightness table: gamma = 2.0
         byte	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1
@@ -401,4 +343,3 @@ CON { license }
   SOFTWARE.
  =================================================================================================
 }}
-

libraries/community/p2/All/isp_hub75_matrix/isp_hub75_demos.zip

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:519dc394e5fbd44c3eb2ba9fb1a22b4aa31e8c9e9310f0b0140a7338b4c9bd4a
-size 16018
+oid sha256:fcf16fb8c4209b3584c09cdffb433716f7f96805538cd870f4507af46e26512b
+size 18997

libraries/community/p2/All/isp_hub75_matrix/isp_hub75_display.spin2

@@ -7,7 +7,7 @@
 ''               -- see below for terms of use
 ''   E-mail..... stephen@ironsheep.biz
 ''   Started.... Oct 2020
-''   Updated.... 17 Oct 2020
+''   Updated.... 01 Dec 2020
 ''
 '' =================================================================================================
 
@@ -109,13 +109,13 @@ PUB fillScreen(rgbColor) | row, column
             pixels.drawPixelAtRC(row, column, rgbColor)
 
 PUB fillPanel(threeBitColor)
-    '' fill screen but without PWM (for testing underlying driver)
+    '' Fill screen but without PWM (for testing underlying driver)
     panel.fillPanel(threeBitColor)
 
 PUB commitScreenToPanel()
     '' Write sceen to panel driver
     'debug("- DISP: commit!")
-    panel.loadScreen(@screen0)
+    panel.convertScreen2PWM(@screen0)
 
 
 { --------------     Text Handling     -------------- }
@@ -125,13 +125,13 @@ PUB setCursor(line, column)
     ' TODO emit error on bad column/row?
     cursorLine := 0 #> line <# maxTextLines - 1
     cursorColumn := 0 #> column <# maxTextColumns - 1
-    
+
 PUB homeCursor()
-    '' return the cursor to top left corner of our display
+    '' Return the cursor to top left corner of our display
     setCursor(0, 0)
 
 PUB setTextFont(newFont) | scrollerIndex, hUnusedPix, vUnusedPix
-    '' Select font and update text grid size 
+    '' Select font and update text grid size
     ' currently we only support our 8x8 and 5x7 fonts
     case newFont
         TEXT_FONT_DEFAULT..TEXT_FONT_5x7:
@@ -191,19 +191,19 @@ PUB setTextFont(newFont) | scrollerIndex, hUnusedPix, vUnusedPix
     repeat scrollerIndex from 0 to MAX_SCROLLING_REGIONS - 1
         scroller[scrollerIndex].setFontInfo(maxTextColumns, charWidthInPix, charHeightInPix, leftOffsetInPix, horizontalGapInPix, hBitmapOffsetInPix, selectedTextFont)
 
-PUB setTextColor(rgbColor)  
+PUB setTextColor(rgbColor)
     '' Set 24-bit color for subsequent text display
     currTextColor := rgbColor
 
-PUB setTextAtCursor(zString) 
+PUB setTextAtCursor(zString)
     '' Place text 'zero terminated' at our current cursor position using current text color
     setColoredTextAtLnCol(cursorLine, cursorColumn, zString, currTextColor)
 
 PUB setColoredTextAtLnCol(line, column, pString, rgbColor) | charIndex
     '' Place text at specific cursor position using current text color
     setCursor(line, column)
     charIndex := 0
-    repeat 
+    repeat
         if byte[pString][charIndex] <> 0
             setColorCharAtCursor(byte[pString][charIndex++], rgbColor)
     while byte[pString][charIndex] <> 0
@@ -249,18 +249,18 @@ PUB setColoredCharAtLnCol(line, column, cChar, rgbColor) | pCharBitMap, tlScreen
 
 PUB scrollText(indexAllocated, loopCount)
     'debug("dsp:scrollText() ", udec(indexAllocated))
-    '' specify scrolling text duration (forever, once, twice)
+    '' Specify scrolling text duration (forever, once, twice)
     if indexAllocated >= 0 && indexAllocated < MAX_SCROLLING_REGIONS
         scroller[indexAllocated].scrollText(loopCount)
 
 
-PUB scrollTextOnLine(line, pZString, direction) : indexAllocated 
-    '' place scolling text on line N, of pZString scrolling in direction using current text color
+PUB scrollTextOnLine(line, pZString, direction) : indexAllocated
+    '' Place scolling text on line N, of pZString scrolling in direction using current text color
     indexAllocated := scrollColoredTextOnLn(line, pZString, direction, currTextColor)
 
 
 PUB scrollColoredTextOnLn(line, pZString, direction, rgbColor) : indexAllocated  | cLineIndex, cColumnIndex, widthInChars, sRowPixIndex, sColumnPixIndex
-    '' place scolling text on line N [0 - N-1], of pZString scrolling in direction using rgbColor
+    '' Place scolling text on line N [0 - N-1], of pZString scrolling in direction using rgbColor
     'debug("dsp:scrollColoredTextOnLn()")
     ' ensure we are asked to use a good location
     cLineIndex := 0 #> line <# maxTextLines - 1
@@ -274,13 +274,13 @@ PUB scrollColoredTextOnLn(line, pZString, direction, rgbColor) : indexAllocated
     indexAllocated := scrollTextAtRCOfColor(sRowPixIndex, sColumnPixIndex, widthInChars, pZString, direction, rgbColor)
 
 
-PUB scrollTextAtRC(row, column, widthInChars, pZString, direction) : indexAllocated 
-    '' place scolling text at absolute R,C, of pZString scrolling in direction using current text color
+PUB scrollTextAtRC(row, column, widthInChars, pZString, direction) : indexAllocated
+    '' Place scolling text at absolute R,C, of pZString scrolling in direction using current text color
     indexAllocated := scrollTextAtRCOfColor(row, column, widthInChars, pZString, direction, currTextColor)
 
 
 PUB scrollTextAtRCOfColor(row, column, widthInChars, pZString, direction, rgbColor) : indexAllocated
-    '' place scolling text at absolute R,C, of pZString scrolling in direction using rgbColor
+    '' Place scolling text at absolute R,C, of pZString scrolling in direction using rgbColor
     indexAllocated := nextFreeScroller()
     'debug("dsp:scrollTextAtRCOfColor() ", udec(indexAllocated))
     scroller[indexAllocated].scrollTextAtRCOfColor(row, column, widthInChars, pZString, direction, rgbColor)
@@ -315,11 +315,11 @@ PRI nextFreeScroller() : scrollerIndexToUse | scrollerIndex
 { --------------     Basic Graphics     -------------- }
 
 PUB drawBox(topRow, leftColumn, width, height, filled)
-    '' Draw draw box outline/filled of width x height at R,C (using current text color)
+    '' Draw box outline/filled of width x height at R,C (using current text color)
     drawBoxOfColor(topRow, leftColumn, width, height, filled, currTextColor)
 
 PUB drawBoxOfColor(topRow, leftColumn, width, height, filled, rgbColor) | rightColumn, bottomRow, rowIndex
-    '' Draw draw box outline/filled of width x height at R,C using rgbColor
+    '' Draw box outline/filled of width x height at R,C using rgbColor
     rightColumn := leftColumn + width - 1
     bottomRow := topRow + height - 1
     if filled == TRUE
@@ -345,11 +345,11 @@ PUB drawLineOfColor(fmRow, fmColumn, toRow, toColumn, rgbColor) | row, column, d
     toColumn :=  0 #> toColumn <# screen.MAX_DISPLAY_COLUMNS - 1
     if fmRow == toRow
         ' draw Horizontal Line
-        repeat column from fmColumn to toColumn 
+        repeat column from fmColumn to toColumn
             pixels.drawPixelAtRC(fmRow, column, rgbColor)
     elseif fmColumn == toColumn
         ' draw Vertical Line
-        repeat row from fmRow to toRow 
+        repeat row from fmRow to toRow
             pixels.drawPixelAtRC(row, fmColumn, rgbColor)
     else
         dx := (toColumn - fmColumn)
@@ -363,7 +363,7 @@ PUB drawLineOfColor(fmRow, fmColumn, toRow, toColumn, rgbColor) | row, column, d
         column := fmColumn
         row := fmRow
         ctr := 1
-        repeat while (ctr <= incr) 
+        repeat while (ctr <= incr)
             pixels.drawPixelAtRC(row, column, rgbColor)
             column += dx
             row += dy
@@ -390,7 +390,6 @@ PRI isDebugLocn(nRow, nCol) : status
         status := TRUE ' FALSE  ' turn off debug
 
 
-
 CON { license }
 
 {{
@@ -419,6 +418,5 @@ CON { license }
   OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
   SOFTWARE.
  =================================================================================================
- 
-}}
 
+}}