Skip to content
Snippets Groups Projects
Commit a56d95e8 authored by Dean Camera's avatar Dean Camera
Browse files

Fix XPLAIN Dataflash and LED drivers.

parent efb6c357
Branches
Tags
No related merge requests found
...@@ -72,7 +72,7 @@ ...@@ -72,7 +72,7 @@
/** Mask for the first dataflash chip selected. */ /** Mask for the first dataflash chip selected. */
#define DATAFLASH_CHIP1 (1 << 5) #define DATAFLASH_CHIP1 (1 << 5)
#if BOAD == XPLAIN_REV1 #if (BOARD == BOARD_XPLAIN_REV1)
#define DATAFLASH_PAGE_SIZE 256 #define DATAFLASH_PAGE_SIZE 256
#define DATAFLASH_PAGES 2048 #define DATAFLASH_PAGES 2048
...@@ -112,8 +112,6 @@ ...@@ -112,8 +112,6 @@
*/ */
static inline void Dataflash_SendAddressBytes(uint16_t PageAddress, const uint16_t BufferByte) static inline void Dataflash_SendAddressBytes(uint16_t PageAddress, const uint16_t BufferByte)
{ {
PageAddress >>= 1;
Dataflash_SendByte(PageAddress >> 5); Dataflash_SendByte(PageAddress >> 5);
Dataflash_SendByte((PageAddress << 3) | (BufferByte >> 8)); Dataflash_SendByte((PageAddress << 3) | (BufferByte >> 8));
Dataflash_SendByte(BufferByte); Dataflash_SendByte(BufferByte);
......
...@@ -76,27 +76,27 @@ ...@@ -76,27 +76,27 @@
static inline void LEDs_Init(void) static inline void LEDs_Init(void)
{ {
DDRB |= LEDS_ALL_LEDS; DDRB |= LEDS_ALL_LEDS;
PORTB &= ~LEDS_ALL_LEDS; PORTB |= LEDS_ALL_LEDS;
} }
static inline void LEDs_TurnOnLEDs(const uint8_t LEDMask) static inline void LEDs_TurnOnLEDs(const uint8_t LEDMask)
{ {
PORTB |= LEDMask; PORTB &= ~LEDMask;
} }
static inline void LEDs_TurnOffLEDs(const uint8_t LEDMask) static inline void LEDs_TurnOffLEDs(const uint8_t LEDMask)
{ {
PORTB &= ~LEDMask; PORTB |= LEDMask;
} }
static inline void LEDs_SetAllLEDs(const uint8_t LEDMask) static inline void LEDs_SetAllLEDs(const uint8_t LEDMask)
{ {
PORTB = ((PORTB & ~LEDS_ALL_LEDS) | LEDMask); PORTB = ((PORTB | LEDS_ALL_LEDS) & ~LEDMask);
} }
static inline void LEDs_ChangeLEDs(const uint8_t LEDMask, const uint8_t ActiveMask) static inline void LEDs_ChangeLEDs(const uint8_t LEDMask, const uint8_t ActiveMask)
{ {
PORTB = ((PORTB & ~(LEDMask & LEDS_ALL_LEDS)) | (ActiveMask & LEDS_ALL_LEDS)); PORTB = ((PORTB | (LEDMask & LEDS_ALL_LEDS)) & (~ActiveMask & LEDS_ALL_LEDS));
} }
static inline void LEDs_ToggleLEDs(const uint8_t LEDMask) static inline void LEDs_ToggleLEDs(const uint8_t LEDMask)
...@@ -107,7 +107,7 @@ ...@@ -107,7 +107,7 @@
static inline uint8_t LEDs_GetLEDs(void) ATTR_WARN_UNUSED_RESULT; static inline uint8_t LEDs_GetLEDs(void) ATTR_WARN_UNUSED_RESULT;
static inline uint8_t LEDs_GetLEDs(void) static inline uint8_t LEDs_GetLEDs(void)
{ {
return (PORTB & LEDS_ALL_LEDS); return (~PORTB & LEDS_ALL_LEDS);
} }
#endif #endif
......
...@@ -84,7 +84,7 @@ ...@@ -84,7 +84,7 @@
#if (defined(__AVR_AT90USB162__) || defined(__AVR_AT90USB82__) || \ #if (defined(__AVR_AT90USB162__) || defined(__AVR_AT90USB82__) || \
defined(__AVR_ATmega32U2__) || defined(__AVR_ATmega16U2__) || defined(__AVR_ATmega8U2__)) defined(__AVR_ATmega32U2__) || defined(__AVR_ATmega16U2__) || defined(__AVR_ATmega8U2__))
#define USB_SERIES_2_AVR #define USB_SERIES_2_AVR
#elif (defined(__AVR_ATmega16U4__) || defined(__AVR_ATmega32U4__)) #elif (defined(__AVR_ATmega32U4__) || defined(__AVR_ATmega16U4__))
#define USB_SERIES_4_AVR #define USB_SERIES_4_AVR
#elif (defined(__AVR_ATmega32U6__) || defined(__AVR_AT90USB646__) || defined(__AVR_AT90USB1286__)) #elif (defined(__AVR_ATmega32U6__) || defined(__AVR_AT90USB646__) || defined(__AVR_AT90USB1286__))
#define USB_SERIES_6_AVR #define USB_SERIES_6_AVR
......
...@@ -32,6 +32,8 @@ ...@@ -32,6 +32,8 @@
* - Fixed AVRISP PDI race condition where the guard time between direction changes could be interpreted as a start bit * - Fixed AVRISP PDI race condition where the guard time between direction changes could be interpreted as a start bit
* - Fixed ADC_IsReadingComplete() returning an inverted result * - Fixed ADC_IsReadingComplete() returning an inverted result
* - Fixed blocking CDC streams not aborting when the host is disconnected * - Fixed blocking CDC streams not aborting when the host is disconnected
* - Fixed XPLAIN board Dataflash driver broken due to incorrect preprocessor commands
* - Fixed inverted XPLAIN LED driver output (LED turned on when it was supposed to be turned off, and vice-versa)
* *
* \section Sec_ChangeLog091223 Version 091223 * \section Sec_ChangeLog091223 Version 091223
* *
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment