Skip to content

Commit

Permalink
added PIXLQ hardware config which tells the apps that the panel is an…
Browse files Browse the repository at this point in the history
… Adafruit 32x32 (when auto-detect is turned on)
  • Loading branch information
alinke committed Jul 27, 2015
1 parent a1f1f82 commit 90f2e18
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 2 deletions.
2 changes: 1 addition & 1 deletion firmware/app_layer_v1/protocol.h
Expand Up @@ -48,7 +48,7 @@
#include "protocol_defs.h"

// Human-readable string describing app firmware version.
#define FW_IMPL_VER "PIXLL009"//normal firmware, can only be 8 digits
#define FW_IMPL_VER "PIXL0009"//normal firmware, can only be 8 digits
// note the hardware version (not the firmware version you see above) is what we use for the board auto-detect from the software, this is set from the config build in the bootloader file
// the above just tells us the firmware version and whether or not low power firmware, denoted by the L

Expand Down
9 changes: 8 additions & 1 deletion firmware/bootloader_common/board.h
Expand Up @@ -49,6 +49,7 @@
#define BOARD_PIXLI025 BOARD_MINT_BASE + 30
#define BOARD_PIXLT025 BOARD_MINT_BASE + 35
#define BOARD_PIXLC025 BOARD_MINT_BASE + 40
#define BOARD_PIXLQ025 BOARD_MINT_BASE + 45

// add more boards here!

Expand Down Expand Up @@ -97,6 +98,10 @@
#ifndef __PIC24FJ256GB206__
#error Board and MCU mismatch - expecting PIC24FJ256GB206
#endif
#elif BOARD_VER == BOARD_PIXLQ025
#ifndef __PIC24FJ256GB206__
#error Board and MCU mismatch - expecting PIC24FJ256GB206
#endif
#else
#error Unknown board
#endif
Expand Down Expand Up @@ -132,6 +137,8 @@
#define HW_IMPL_VER "PIXLT025"
#elif BOARD_VER == BOARD_PIXLC025
#define HW_IMPL_VER "PIXLC025"
#elif BOARD_VER == BOARD_PIXLQ025
#define HW_IMPL_VER "PIXLQ025"

#else
#error Unknown board
Expand All @@ -153,7 +160,7 @@
#define led_on() led = 0;
#define led_off() led = 1;
#define led_toggle() led = !led;
#elif BOARD_VER == BOARD_SPRK0020 || BOARD_VER == BOARD_PIXL0020 || BOARD_VER == BOARD_PIXL0025 || BOARD_VER == BOARD_PIXLI025 || BOARD_VER == BOARD_PIXLT025 || BOARD_VER == BOARD_PIXLC025
#elif BOARD_VER == BOARD_SPRK0020 || BOARD_VER == BOARD_PIXL0020 || BOARD_VER == BOARD_PIXL0025 || BOARD_VER == BOARD_PIXLI025 || BOARD_VER == BOARD_PIXLT025 || BOARD_VER == BOARD_PIXLC025 || BOARD_VER == BOARD_PIXLQ025
#define led_init() { _ODC12 = 1; _LATC12 = 1; _TRISC12 = 0; }
#define led_read() _RC12
#define led _LATC12
Expand Down
2 changes: 2 additions & 0 deletions firmware/device_bootloader/boot_protocol.c
Expand Up @@ -67,6 +67,8 @@
#define PLATFORM_ID "PIXLT025"
#elif BOARD_VER == BOARD_PIXLC025
#define PLATFORM_ID "PIXLC025"
#elif BOARD_VER == BOARD_PIXLQ025
#define PLATFORM_ID "PIXLQ025"
#else
#error Unknown board version - cannot determine platform ID
#endif
Expand Down

0 comments on commit 90f2e18

Please sign in to comment.