Skip to content

Commit ecd0e28

Browse files
committed
shifting happens in pio code
1 parent 484a393 commit ecd0e28

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

src/dmd_interface_whitestar.pio

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,8 +44,8 @@ dotloop1:
4444
; in this loop, the bit value is multipled by 2 by shiting it one bit
4545
dotloop2:
4646
wait 0 gpio DOTCLK ; falling edge
47-
wait 1 gpio DOTCLK ; raising edge
4847
in null 1 ; left padding
48+
wait 1 gpio DOTCLK ; raising edge
4949
in pins 1 ; read pin data
5050
jmp x-- dotloop2
5151

src/dmd_reader.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -599,7 +599,7 @@ bool init()
599599
lcd_pixelsperbyte = 8 / lcd_bitsperpixel;
600600
lcd_planesperframe = 2; // in Whitestar, there's a MSB and a LSB plane
601601
lcd_lineoversampling = LINEOVERSAMPLING_2X; // in Whitestar each line is sent twice
602-
lcd_mergeplanes = MERGEPLANES_ADDSHIFT; // required for correct 2bpp merge
602+
lcd_mergeplanes = MERGEPLANES_ADD; // Shifting happen in pio code
603603
} else if (dmd_type == DMD_SPIKE1) {
604604
dmd_pio = pio0;
605605
offset = pio_add_program(dmd_pio, &dmd_reader_spike_program);
@@ -642,7 +642,7 @@ bool init()
642642
lcd_height = 32;
643643
lcd_bitsperpixel = 4;
644644
lcd_pixelsperbyte = 8 / lcd_bitsperpixel;
645-
lcd_planesperframe = 1; // in SAM there is one planes
645+
lcd_planesperframe = 1; // in SAM there is one plane
646646
lcd_lineoversampling = LINEOVERSAMPLING_4X; // with 4x line oversampling
647647
lcd_mergeplanes = MERGEPLANES_ADD;
648648
} else if (dmd_type == DMD_DESEGA) {

0 commit comments

Comments
 (0)