brmlab/edubrm
4
0
Fork 0
mirror of https://github.com/brmlab/edubrm.git synced 2025-06-07 20:34:00 +02:00
Code Issues Projects Releases Packages Wiki Activity

fix shifts

Browse source
This commit is contained in:
Pavol Rusnak 2011-04-27 00:11:52 +02:00
parent af36fa43f0
commit 3e1c56c744
2 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

4
firmware/src/edubrm.c
View file

@ -17,8 +17,8 @@ void GetInReport (uint8_t src[], uint32_t length)
}
src[14] = 0;
src[14] |= (LPC_GPIO2->MASKED_ACCESS[1<<0] & (1<<0));
src[14] |= (LPC_GPIO2->MASKED_ACCESS[1<<6] & (1<<6));
src[14] |= (LPC_GPIO2->MASKED_ACCESS[1<<7] & (1<<7));
src[14] |= (LPC_GPIO2->MASKED_ACCESS[1<<6] & (1<<6)) >> 5;
src[14] |= (LPC_GPIO2->MASKED_ACCESS[1<<7] & (1<<7)) >> 5;
}

8
software/device.py
View file

@ -91,7 +91,7 @@ class Device:
randint(0,1), randint(0,1), randint(0,1)) # IO1 .. IO3
else:
i = self.epi.read(self.INSIZE)
return (i[0] + i[1]<<8, # AD0
i[2] + i[3]<<8, i[4] + i[5]<<8, i[6] + i[7]<<8, # AD1 .. AD3
i[9] + i[9]<<8, i[10] + i[11]<<8, i[12] + i[13]<<8, # AD4 .. AD6
i[14] & 0x01, (i[14] & 0x02) >> 1, (i[14] & 0x04) >> 2) # IO1 .. IO3
return (i[0] + (i[1]<<8), # AD0
i[2] + (i[3]<<8), i[4] + (i[5]<<8), i[6] + (i[7]<<8), # AD1 .. AD3
i[9] + (i[9]<<8), i[10] + (i[11]<<8), i[12] + (i[13]<<8), # AD4 .. AD6
i[14] & 0x01, (i[14] & 0x02) >> 1, (i[14] & 0x04) >> 2) # IO1 .. IO3