Merge pull request #232 from ironsheep/p2-cube-support

update to p2 Cube supporting version v0.9.0

Author: PropGit

libraries/community/p2/All/isp_hub75_matrix/README.md

@@ -6,7 +6,9 @@ Language: Spin2 / Pasm2
 
 Created: 03-DEC-2020
 
-Upadted: 19-FEB-2021
+Updated: 12-MAY-2021
+
+Version: 0.9.0
 
 Category: display
 

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

@@ -79,8 +79,8 @@ PUB correctedColor(color) : adjustedColor
     '' Correct a color using generic gamma
     adjustedColor := color
     'return
-    'adjustedColor := ((color * defaultBrightness) >> 8) & $ff
     adjustedColor := byte[@gamma][adjustedColor]
+    adjustedColor := ((adjustedColor * defaultBrightness) >> 8) & $ff
     adjustedColor := dutyCycleForIntensity(adjustedColor)
 
 PUB gammaPeek(color) : adjustedColor | gammmaIndex, lowColor, highColor
@@ -109,7 +109,6 @@ PUB gammaPeek(color) : adjustedColor | gammmaIndex, lowColor, highColor
 PUB correctedSingleColor(led, colorValue) : adjustedColor | pGammaTable
     '' Correct the color for a specific LED (R, G, or B)
     adjustedColor := colorValue
-    'adjustedColor := ((adjustedColor * defaultBrightness) >> 8) & $ff
     case led
         LED_RED:
             pGammaTable := @gamma
@@ -122,6 +121,7 @@ PUB correctedSingleColor(led, colorValue) : adjustedColor | pGammaTable
 
     if bGammaEnable
         adjustedColor := byte[pGammaTable][adjustedColor]
+    adjustedColor := ((adjustedColor * defaultBrightness) >> 8) & $ff
     adjustedColor := dutyCycleForIntensity(adjustedColor)
 
 PUB rgbColorFromDegrees(degrees) : rcbColor | offset60, fract60, red, green, blue

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:088163fc8a12bf2ac9731d0475a485f16a0fe252b35aa2995c3865d092427751
-size 17320
+oid sha256:54b510f568034f6431a0feabf1ca84e343e0ae5df2c056b9670844f41013c564
+size 23227

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

@@ -44,8 +44,8 @@ PRI loadBitmap(pBitmapFile) | nPanelCol, nPanelRow, blue, green, red, haveError,
         abort
 
    ' fill screen buffer
-    repeat nPanelRow from 0 to screen.MAX_PHYSICAL_ROWS - 1
-        repeat nPanelCol from 0 to screen.MAX_PHYSICAL_COLUMNS - 1
+    repeat nPanelRow from 0 to screen.MAX_DISPLAY_ROWS - 1
+        repeat nPanelCol from 0 to screen.MAX_DISPLAY_COLUMNS - 1
             'debug("loadBitmap() - RC=(", udec_(nPanelRow), ", ", udec_(nPanelCol), ")")
             showDebug := FALSE
             if isDebugLocn(nPanelRow, nPanelCol)
@@ -101,7 +101,7 @@ PRI validateBmpFile(pBmpFileImage) : bValidStatus | pFileHeader, i, iStart, iEnd
     ' XYZZYpnl debug(" - Img-start @0x", uhex_(iStart))
     ' XYZZYpnl debug(" - Img-end @0x", uhex_(iEnd))
 
-    if biWidth <> screen.MAX_PHYSICAL_COLUMNS or biHeight <> screen.MAX_PHYSICAL_ROWS
+    if biWidth <> screen.MAX_DISPLAY_COLUMNS or biHeight <> screen.MAX_DISPLAY_ROWS
         ' XYZZYpnl debug(" !! invalid BMP size! [NOT 64x32]")
         bValidStatus := FALSE
 
@@ -123,11 +123,11 @@ PRI validateBmpFile(pBmpFileImage) : bValidStatus | pFileHeader, i, iStart, iEnd
     'screen.dbgMemDump(@fileEndMsg, iEnd-32-1, 32)
 
 PRI get24BitBMPColorForRC(nRow, nColumn) : red, green, blue | pixColorAddr
-	if(nRow > screen.MAX_PHYSICAL_ROWS - 1)
-		debug("- ERROR bad nRow value [", udec_(nRow), " > ", udec_(screen.MAX_PHYSICAL_ROWS - 1), "]")
+	if(nRow > screen.MAX_DISPLAY_ROWS - 1)
+		debug("- ERROR bad nRow value [", udec_(nRow), " > ", udec_(screen.MAX_DISPLAY_ROWS - 1), "]")
 
-	if(nColumn > screen.MAX_PHYSICAL_COLUMNS - 1)
-		debug("- ERROR bad nColumn value [", udec_(nColumn), " > ", udec_(screen.MAX_PHYSICAL_COLUMNS - 1), "]")
+	if(nColumn > screen.MAX_DISPLAY_COLUMNS - 1)
+		debug("- ERROR bad nColumn value [", udec_(nColumn), " > ", udec_(screen.MAX_DISPLAY_COLUMNS - 1), "]")
 
     pixColorAddr := getPixelAddressForBMPRowColumn(nRow, nColumn)
     ' our intername .bmp file byte order is BGR!
@@ -137,7 +137,7 @@ PRI get24BitBMPColorForRC(nRow, nColumn) : red, green, blue | pixColorAddr
 
 PRI getPixelAddressForBMPRowColumn(nRow, nColumn) : pixColorAddr | rowIndex, columnIndex, nOffset, fileBitsBase, showDebug
 	' Row is inverted in .BMP file...
-	rowIndex := (screen.MAX_PHYSICAL_ROWS - 1) - nRow
+	rowIndex := (screen.MAX_DISPLAY_ROWS - 1) - nRow
 
 	' Column is normal in file...
 	columnIndex := nColumn
@@ -148,7 +148,7 @@ PRI getPixelAddressForBMPRowColumn(nRow, nColumn) : pixColorAddr | rowIndex, col
         showDebug := TRUE ' FALSE  ' turn off debug
 
 	' now offset is simple (just multiply by 3! [bytes of color])
-    nOffset := ((rowIndex * screen.MAX_PHYSICAL_COLUMNS) + columnIndex) * screen.DISPLAY_BYTES_PER_COLOR
+    nOffset := ((rowIndex * screen.MAX_DISPLAY_COLUMNS) + columnIndex) * screen.DISPLAY_BYTES_PER_COLOR
 
     fileBitsBase := @byte[pBitmapFileInMemory][bfOffBits]   ' get base of image in file (skip header)
     pixColorAddr := @byte[fileBitsBase][nOffset]    ' add in offset to 24-bit color