Leahnaya/TataconUSB
1
0
Fork 0
mirror of https://github.com/mon/TataconUSB.git synced 2026-04-26 01:31:18 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Nunchuck readiness fix

Browse Source
This commit is contained in:
William Toohey 2015-12-28 01:23:44 +10:00
parent 423a3abc1c
commit 9880107af5
2 changed files with 22 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
Firmware/Keyboard/Keyboard.c
View File

@ -112,29 +112,33 @@ static uint8_t nunchuckReady = 0;
#ifdef DEBUG
#define DEBUG_DELAY_MS 10
static uint8_t debugDelay = DEBUG_DELAY_MS * 10;
static uint8_t debugDelay = 100; // don't do anything for 100ms
#endif
//todo: neater
#define NUNCHUCK_ADDR (0x52 << 1)
void Nunchuck_back(void) {
nunchuckReady = 1;
// Turn LEDs off, it returned
CLEAR(LED_PORT, DON_LED_PIN);
CLEAR(LED_PORT, KAT_LED_PIN);
if(!nunchuckReady) {
nunchuckReady = 1;
// Turn LEDs off, it returned
CLEAR(LED_PORT, DON_LED_PIN);
CLEAR(LED_PORT, KAT_LED_PIN);
}
}
void Nunchuck_gone(void) {
i2c_stop();
nunchuckReady = 0;
// Turn LEDs on until it returns
SET(LED_PORT, DON_LED_PIN);
SET(LED_PORT, KAT_LED_PIN);
// Clear structs
for(int i = 0; i < KB_SWITCHES; i++) {
switches[i].state = 0;
if(switches[i].state != switches[i].lastReport) {
switchesChanged = 1;
if(nunchuckReady) {
nunchuckReady = 0;
// Turn LEDs on until it returns
SET(LED_PORT, DON_LED_PIN);
SET(LED_PORT, KAT_LED_PIN);
// Clear structs
for(int i = 0; i < KB_SWITCHES; i++) {
switches[i].state = 0;
if(switches[i].state != switches[i].lastReport) {
switchesChanged = 1;
}
}
}
}
@ -172,6 +176,7 @@ uint8_t Nunchuck_ReadByte(uint8_t address) {
i2c_start(NUNCHUCK_ADDR | I2C_READ);
data = i2c_readNak();
i2c_stop();
Nunchuck_back();
} else {
Nunchuck_gone();
}

3
Firmware/Keyboard/i2cmaster.S
View File

@ -19,6 +19,9 @@
; Tweaked by monty for true 400KHz operation at 8MHz system clock on an
; atmega16u2. Duty cycle adjusted for correct 400KHz spec adherence.
;
; 7 cycles = 0.875us high
; 13 cycles = 1.625us low
;
; USAGE
; These routines can be called from C, refere to file i2cmaster.h.
; See example test_i2cmaster.c