diff options
| author | jaseg <code@jaseg.net> | 2014-12-10 21:19:41 +0100 |
|---|---|---|
| committer | jaseg <code@jaseg.net> | 2014-12-10 21:19:41 +0100 |
| commit | 3c329decfa20dd3f2bcd3beb1f512b4e3daf809e (patch) | |
| tree | 68e461ef9f4573e28d5426ab4775f4ef2a3c8c11 /firmware/main.c | |
| parent | e36a4054f18973980a9321e84fd79ea38793a6a4 (diff) | |
| parent | 2387b0de02f6d51b848498443f9e8697c20bac5a (diff) | |
| download | matelight-3c329decfa20dd3f2bcd3beb1f512b4e3daf809e.tar.gz matelight-3c329decfa20dd3f2bcd3beb1f512b4e3daf809e.tar.bz2 matelight-3c329decfa20dd3f2bcd3beb1f512b4e3daf809e.zip | |
Merge branch 'master' of matelight:matelight
Conflicts:
host/server.py
Diffstat (limited to 'firmware/main.c')
| -rw-r--r-- | firmware/main.c | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/firmware/main.c b/firmware/main.c index 52b6360..cc5c458 100644 --- a/firmware/main.c +++ b/firmware/main.c @@ -40,24 +40,24 @@ #define CRATE_SIZE (CRATE_WIDTH*CRATE_HEIGHT) #define BUS_SIZE (CRATES_PER_BUS*CRATE_SIZE*BYTES_PER_PIXEL) unsigned const char const BOTTLE_MAP[CRATE_SIZE] = { - 17, 16, 15, 14, 13, - 18, 9, 10, 11, 12, - 19, 8, 7, 6, 5, - 0, 1, 2, 3, 4 + 4, 3, 2, 1, 0, + 5, 6, 7, 8,19, + 12, 11, 10, 9,18, + 13, 14, 15,16,17 }; unsigned const char const FUCKED_UP_BOTTLE_MAP[CRATE_SIZE] = { - 3, 4, 5, 6, 7, - 2, 11, 10, 9, 8, - 1, 12, 13, 14, 15, - 0, 19, 18, 17, 16 + 16,17, 18,19, 0, + 15,14, 13,12, 1, + 8, 9, 10,11, 2, + 7, 6, 5, 4, 3 }; unsigned const char const CRATE_MAP[CRATE_COUNT] = { - 0x07, 0x05, 0x03, 0x01, 0x10, 0x12, 0x14, 0x16, - 0x06, 0x04, 0x02, 0x00, 0x11, 0x13, 0x15, 0x17, - 0x26, 0x24, 0x22, 0x20, 0x31, 0x33, 0x35, 0x37, - 0x27, 0x25, 0x23, 0x21, 0x30, 0x32, 0x34, 0x36 + 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 |