aboutsummaryrefslogtreecommitdiff
path: root/firmware
diff options
context:
space:
mode:
authorjaseg <jaseg@jaseg.net>2014-07-25 20:08:49 +0200
committerjaseg <jaseg@jaseg.net>2014-07-25 20:08:49 +0200
commitd5c8d1de1dd8a360a76d6ff66766e96f70cb50c2 (patch)
treec7cf90258cad02579a983db0dc3879c5de04b774 /firmware
parent49cd6259ba0b556deb167b3fb76a61c3b344a786 (diff)
parent50813d444ead5cc92a448f0a7feff6b22fba06cd (diff)
downloadmatelight-d5c8d1de1dd8a360a76d6ff66766e96f70cb50c2.tar.gz
matelight-d5c8d1de1dd8a360a76d6ff66766e96f70cb50c2.tar.bz2
matelight-d5c8d1de1dd8a360a76d6ff66766e96f70cb50c2.zip
Merge branch 'mainhall-tmp'
Conflicts: firmware/main.c
Diffstat (limited to 'firmware')
-rw-r--r--firmware/main.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/firmware/main.c b/firmware/main.c
index 55abeae..cc5c458 100644
--- a/firmware/main.c
+++ b/firmware/main.c
@@ -54,10 +54,10 @@ unsigned const char const FUCKED_UP_BOTTLE_MAP[CRATE_SIZE] = {
};
unsigned const char const CRATE_MAP[CRATE_COUNT] = {
- 0x07, 0x05, 0x03, 0x01, 0x31, 0x33, 0x35, 0x37,
- 0x06, 0x04, 0x02, 0x00, 0x30, 0x32, 0x34, 0x36,
- 0x17, 0x15, 0x13, 0x11, 0x21, 0x23, 0x25, 0x27,
- 0x16, 0x14, 0x12, 0x10, 0x20, 0x22, 0x24, 0x26
+ 0x36, 0x34, 0x32, 0x30, 0x11, 0x13, 0x15, 0x17,
+ 0x37, 0x35, 0x33, 0x31, 0x10, 0x12, 0x14, 0x16,
+ 0x27, 0x25, 0x23, 0x21, 0x01, 0x03, 0x05, 0x07,
+ 0x26, 0x24, 0x22, 0x20, 0x00, 0x02, 0x04, 0x06
};
#define SYSTICKS_PER_SECOND 100