andras/ad_astra
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix issue from copypaste

Browse source
This commit is contained in:
schmelczerandras 2020-04-20 17:36:45 +02:00
parent 3da2a7a7c2
commit 62853bcedc
2 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

6
ad_astra/AdAstra/src/driver/display/display.c
View file

@ -95,7 +95,7 @@ static void compositePixelColumn(uint8_t x, uint8_t invertedMask, uint8_t fill)
display.compositingBuffer[x] = (display.compositingBuffer[x] & (~invertedMask)) | fill; display.compositingBuffer[x] = (display.compositingBuffer[x] & (~invertedMask)) | fill;
} }
void drawBitmapFromProgMem(Rectangle boundingBox, uint16_t const data[boundingBox.size.x][(boundingBox.size.y + 7) / 8], bool isMirrored) { void drawBitmapFromProgMem(Rectangle boundingBox, uint16_t const bitmap[boundingBox.size.x][(boundingBox.size.y + 7) / 8], bool isMirrored) {
boundingBox.position = substract(boundingBox.position, display.compositingWindow.position); boundingBox.position = substract(boundingBox.position, display.compositingWindow.position);
uint8_t spriteY = max(0, -boundingBox.position.y); uint8_t spriteY = max(0, -boundingBox.position.y);
@ -103,14 +103,14 @@ void drawBitmapFromProgMem(Rectangle boundingBox, uint16_t const data[boundingBo
for (uint8_t x = max(0, -boundingBox.position.x); x < boundingBox.size.x && boundingBox.position.x + x < DISPLAY_WIDTH_IN_PIXELS; x++) { for (uint8_t x = max(0, -boundingBox.position.x); x < boundingBox.size.x && boundingBox.position.x + x < DISPLAY_WIDTH_IN_PIXELS; x++) {
uint8_t spriteX = isMirrored ? boundingBox.size.x - x - 1 : x; uint8_t spriteX = isMirrored ? boundingBox.size.x - x - 1 : x;
uint16_t currentPixelColumn = loadWordEEPROM(&data[spriteX][spriteYByte]); uint16_t currentPixelColumn = loadWordEEPROM(&bitmap[spriteX][spriteYByte]);
uint8_t fill, invertedMask; uint8_t fill, invertedMask;
if (boundingBox.position.y >= 0) { if (boundingBox.position.y >= 0) {
fill = (currentPixelColumn & 0x00FF) << boundingBox.position.y; fill = (currentPixelColumn & 0x00FF) << boundingBox.position.y;
invertedMask = currentPixelColumn >> 8 << boundingBox.position.y; invertedMask = currentPixelColumn >> 8 << boundingBox.position.y;
} else { } else {
uint16_t lowerPixelColumn = spriteYByte + 1 < (boundingBox.size.y + 7) / 8 ? loadWordEEPROM(&data[spriteX][spriteYByte + 1]) : 0; uint16_t lowerPixelColumn = spriteYByte + 1 < (boundingBox.size.y + 7) / 8 ? loadWordEEPROM(&bitmap[spriteX][spriteYByte + 1]) : 0;
uint8_t shift = spriteY % 8; uint8_t shift = spriteY % 8;
uint8_t inverseShift = 8 - shift; uint8_t inverseShift = 8 - shift;

2
ad_astra/AdAstra/src/driver/infra/infra.h
View file

@ -10,7 +10,7 @@
*/ */
#define INFRA_ADDRESS 255 #define INFRA_ADDRESS 255
#define IR_PIN PB4 #define IR_PIN PB3
#define REPEAT_CODE 1 #define REPEAT_CODE 1
typedef void (*OnCommandReceived)(uint8_t); typedef void (*OnCommandReceived)(uint8_t);