jaseg/matelight
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'mainhall-tmp'

Browse source 
Conflicts:
	firmware/main.c
This commit is contained in:
jaseg 2014-07-25 20:08:49 +02:00
commit d5c8d1de1d
1 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

8
firmware/main.c
View file

@ -54,10 +54,10 @@ unsigned const char const FUCKED_UP_BOTTLE_MAP[CRATE_SIZE] = {
}; };
unsigned const char const CRATE_MAP[CRATE_COUNT] = { unsigned const char const CRATE_MAP[CRATE_COUNT] = {
0x07, 0x05, 0x03, 0x01, 0x31, 0x33, 0x35, 0x37, 0x36, 0x34, 0x32, 0x30, 0x11, 0x13, 0x15, 0x17,
0x06, 0x04, 0x02, 0x00, 0x30, 0x32, 0x34, 0x36, 0x37, 0x35, 0x33, 0x31, 0x10, 0x12, 0x14, 0x16,
0x17, 0x15, 0x13, 0x11, 0x21, 0x23, 0x25, 0x27, 0x27, 0x25, 0x23, 0x21, 0x01, 0x03, 0x05, 0x07,
0x16, 0x14, 0x12, 0x10, 0x20, 0x22, 0x24, 0x26 0x26, 0x24, 0x22, 0x20, 0x00, 0x02, 0x04, 0x06
}; };
#define SYSTICKS_PER_SECOND 100 #define SYSTICKS_PER_SECOND 100