From 6fe2eeffb35c58c6dc72c018b80d2bee17631263 Mon Sep 17 00:00:00 2001 From: sanni Date: Sun, 27 Feb 2022 13:19:35 +0100 Subject: [PATCH] Fix NES LED/LCD conflict with HW4 --- Cart_Reader/Cart_Reader.ino | 6 +++--- Cart_Reader/NES.ino | 12 ++++++------ 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/Cart_Reader/Cart_Reader.ino b/Cart_Reader/Cart_Reader.ino index a328d80..2c51552 100644 --- a/Cart_Reader/Cart_Reader.ino +++ b/Cart_Reader/Cart_Reader.ino @@ -4,8 +4,8 @@ This project represents a community-driven effort to provide an easy to build and easy to modify cartridge dumper. - Date: 23.02.2022 - Version: 7.7 + Date: 27.02.2022 + Version: 7.8 SD lib: https://github.com/greiman/SdFat OLED lib: https://github.com/adafruit/Adafruit_SSD1306 @@ -45,7 +45,7 @@ **********************************************************************************/ -char ver[5] = "7.7"; +char ver[5] = "7.8"; /****************************************** Libraries diff --git a/Cart_Reader/NES.ino b/Cart_Reader/NES.ino index 94e3957..7875a66 100644 --- a/Cart_Reader/NES.ino +++ b/Cart_Reader/NES.ino @@ -115,12 +115,12 @@ static const byte PROGMEM mapsize [] = { #define CHR_WRITE_LOW PORTF &= ~(1<<2) // RGB LED COMMON ANODE -#define LED_RED_OFF PORTB |= (1<<6) -#define LED_RED_ON PORTB &= ~(1<<6) -#define LED_GREEN_OFF PORTB |= (1<<5) -#define LED_GREEN_ON PORTB &= ~(1<<5) -#define LED_BLUE_OFF PORTB |= (1<<4) -#define LED_BLUE_ON PORTB &= ~(1<<4) +#define LED_RED_OFF setColor_RGB(0, 0, 0) +#define LED_RED_ON setColor_RGB(255, 0, 0) +#define LED_GREEN_OFF setColor_RGB(0, 0, 0) +#define LED_GREEN_ON setColor_RGB(0, 255, 0) +#define LED_BLUE_OFF setColor_RGB(0, 0, 0) +#define LED_BLUE_ON setColor_RGB(0, 0, 255) #define MODE_READ { PORTK = 0xFF; DDRK = 0; } #define MODE_WRITE DDRK = 0xFF