Skip to content

Commit 0e764a3

Browse files
committed
Some updates to get pocketscrollers showing something "reasonable". Still some ghosting, but progress.
1 parent 8a6337c commit 0e764a3

File tree

4 files changed

+12
-5
lines changed

4 files changed

+12
-5
lines changed

src/channeloutput/BBBMatrix.cpp

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -741,9 +741,14 @@ int BBBMatrix::Init(Json::Value config) {
741741

742742
pru = root["pru"].asInt();
743743

744+
#ifdef PLATFORM_BB64
745+
// PRU -> PRU data transfer not working yet
746+
m_singlePRU = true;
747+
#else
744748
if (root.isMember("singlePRU")) {
745749
m_singlePRU = root["singlePRU"].asBool();
746750
}
751+
#endif
747752
if (root.isMember("dataOffset")) {
748753
m_dataOffset = root["dataOffset"].asInt();
749754
m_dataOffset *= 1024; // dataOffset is in KB
@@ -1200,14 +1205,14 @@ int BBBMatrix::SendData(unsigned char* channelData) {
12001205
}
12011206
// long long cpyTime = GetTime();
12021207
if (m_curFrame == 0) {
1203-
// m_curFrame = m_numFrames - 1;
1204-
m_curFrame = 1;
1208+
m_curFrame = m_numFrames - 1;
12051209
} else {
12061210
m_curFrame--;
12071211
}
12081212

12091213
// make sure memory is flushed before command is set to 1
12101214
msync(ptr, m_fullFrameLen, MS_SYNC | MS_INVALIDATE);
1215+
__builtin___clear_cache(ptr, ptr + m_fullFrameLen);
12111216
m_pruData->address_dma = addr;
12121217

12131218
__asm__ __volatile__("" ::

src/pru/FalconMatrixCommon.asm

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ LDI32or16 .macro a, b
5252
READ_TO_FLUSH .macro
5353
//read the base line to make sure all SET/CLR are
5454
//flushed and out
55-
LBBO &out_clr, gpio_base_cache, GPIO_DATAOUT, 4
55+
LBBO &out_clr, gpio_base_cache, GPIO_DATAIN, 4
5656
.endm
5757

5858
CLOCK_HI .macro

src/pru/FalconPRUDefs.hp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,7 @@
4343
#define GPIO_DATAOUT (0x13C - 0x100)
4444
#define GPIO_CLRDATAOUT (0x190 - 0x100)
4545
#define GPIO_SETDATAOUT (0x194 - 0x100)
46+
#define GPIO_DATAIN GPIO_DATAOUT
4647

4748
#define GPIO_CLR_FIRST 1
4849
#define GPIO_SETCLRDATAOUT GPIO_CLRDATAOUT

www/co-ledPanels.php

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -101,8 +101,9 @@ function printLEDPanelGammaSelect($platform, $gamma)
101101
echo "<input type='number' min='0.1' max='5.0' step='0.1' value='$gamma' id='LEDPanelsGamma'>";
102102
}
103103

104-
function printLEDPanelInterleaveSelect($platform)
104+
function printLEDPanelInterleaveSelect()
105105
{
106+
global $settings;
106107
echo "<select id='LEDPanelInterleave' onchange='LEDPanelLayoutChanged();'>";
107108

108109
$values = array();
@@ -1483,7 +1484,7 @@ function LEDPanelsSizeChanged() {
14831484
<div class="row">
14841485
<div class="printSettingLabelCol col-md-2 col-lg-2"><span id='LEDPanelsInterleaveLabel'><b>Panel Interleave:</b></span></div>
14851486
<div class="printSettingFieldCol col-md-3 col-lg-3">
1486-
<?printLEDPanelInterleaveSelect($settings['Platform']);?>
1487+
<?printLEDPanelInterleaveSelect();?>
14871488
</div>
14881489
<?if ($settings['Platform'] == "Raspberry Pi") {?>
14891490
<div class="printSettingLabelCol col-md-2 col-lg-2"><span id='LEDPanelsOutputCPUPWMLabel'><b>Use CPU PWM:</b></span></div>

0 commit comments

Comments
 (0)