From 00fc38435f0266872bdf35b0a943ac599ce57883 Mon Sep 17 00:00:00 2001 From: Jack Humbert Date: Thu, 22 Feb 2018 21:22:47 -0500 Subject: [PATCH] master working --- drivers/arm/twi2c.c | 54 +++++++++++++------ drivers/arm/twi2c.h | 5 +- .../boards/GENERIC_STM32_F303XC/board.c | 4 +- .../_qmk_handwire/keymaps/default/keymap.c | 4 +- keyboards/_qmk_handwire/matrix.c | 9 +++- 5 files changed, 55 insertions(+), 21 deletions(-) diff --git a/drivers/arm/twi2c.c b/drivers/arm/twi2c.c index 299e52eb2..2b9209f5d 100644 --- a/drivers/arm/twi2c.c +++ b/drivers/arm/twi2c.c @@ -23,10 +23,6 @@ #include "printf.h" #include "matrix.h" -#ifndef I2C_DRIVER - #define I2C_DRIVER I2CD1 -#endif - /** * I2C slave test routine. * @@ -37,8 +33,13 @@ * b) A write then read transaction - calls a message processor and returns the generated reply. * Stretches clock until reply available. */ +// static const I2CConfig masterI2CConfig = { +// 400000 +// }; -static const I2CConfig uniI2CConfig = { +I2CSlaveMsgCB twi2c_slave_message_process, catchError, clearAfterSend; + +static const I2CConfig slaveI2CConfig = { STM32_TIMINGR_PRESC(15U) | STM32_TIMINGR_SCLDEL(4U) | STM32_TIMINGR_SDADEL(2U) | STM32_TIMINGR_SCLH(15U) | STM32_TIMINGR_SCLL(21U), @@ -52,7 +53,7 @@ char initialReplyBody[50] = "Initial reply"; // 'Status' response if read uint32_t messageCounter = 0; /* Counts number of messages received to return as part of response */ -uint8_t rxBody[240]; /* stores last message master sent us (intentionally a few bytes smaller than txBody) */ +uint8_t rxBody[2]; /* stores last message master sent us (intentionally a few bytes smaller than txBody) */ uint8_t txBody[MATRIX_ROWS/2]; /* Return message buffer for computed replies */ BaseSequentialStream *chp = NULL; // Used for serial logging @@ -68,16 +69,26 @@ const I2CSlaveMsg echoRx = }; -// 'Empty' reply when nothing to say, and no message received. In RAM, to allow update +// // 'Empty' reply when nothing to say, and no message received. In RAM, to allow update I2CSlaveMsg initialReply = { - sizeof(initialReplyBody), /* trailing zero byte will be repeated as needed */ + sizeof(initialReplyBody), /* trailing zero byte will be repeated as needed */ (uint8_t *)initialReplyBody, NULL, /* do nothing on address match */ NULL, /* do nothing after reply sent */ catchError /* Error hook */ }; +// // 'Empty' reply when nothing to say, and no message received. In RAM, to allow update +// I2CSlaveMsg initialReply = +// { +// 0, /* trailing zero byte will be repeated as needed */ +// NULL, +// NULL, /* do nothing on address match */ +// NULL, /* do nothing after reply sent */ +// catchError /* Error hook */ +// }; + // Response to received messages I2CSlaveMsg echoReply = { /* this is in RAM so size may be updated */ @@ -129,7 +140,8 @@ void twi2c_slave_message_process(I2CDriver *i2cp) { // size_t len = i2cSlaveBytes(i2cp); // Number of bytes received - matrix_copy(txBody); + memset(txBody, 0, MATRIX_ROWS / 2 * sizeof(matrix_row_t)); + // matrix_copy(txBody); echoReply.size = MATRIX_ROWS / 2; i2cSlaveReplyI(i2cp, &echoReply); @@ -162,17 +174,18 @@ void twi2c_slave_init(void) { palSetPadMode(GPIOB, 8, PAL_MODE_ALTERNATE(4) | PAL_STM32_OTYPE_OPENDRAIN | PAL_STM32_PUPDR_PULLUP); - i2cStart(&I2C_DRIVER, &uniI2CConfig); + i2cStart(&I2C_DRIVER, &slaveI2CConfig); #if HAL_USE_I2C_SLAVE I2C_DRIVER.slaveTimeout = MS2ST(100); // Time for complete message #endif - i2cSlaveConfigure(&I2C_DRIVER, &echoRx, &initialReply); + // i2cSlaveConfigure(&I2C_DRIVER, &echoRx, &initialReply); + i2cSlaveConfigure(&I2C_DRIVER, &echoRx, &echoReply); // Enable match address after everything else set up i2cMatchAddress(&I2C_DRIVER, slaveI2Caddress/2); // i2cMatchAddress(&I2C_DRIVER, myOtherI2Caddress/2); -// i2cMatchAddress(&I2C_DRIVER, 0); /* "all call" */ + // i2cMatchAddress(&I2C_DRIVER, 0); /* "all call" */ printf("Slave I2C started\n\r"); @@ -186,9 +199,18 @@ void twi2c_slave_task(void) { } void twi2c_master_init(void) { - i2cStart(&I2C_DRIVER, &uniI2CConfig); -} -msg_t twi2c_master_send(i2caddr_t address, const uint8_t * txbuf, uint8_t * rxbuf, systime_t timeout) { - return i2cMasterTransmitTimeout(&I2C_DRIVER, address, txbuf, sizeof(txbuf), rxbuf, sizeof(rxbuf), timeout); + palSetGroupMode(GPIOB,8,9, PAL_MODE_INPUT); // Try releasing special pins for a short time + chThdSleepMilliseconds(10); + + palSetPadMode(GPIOB, 9, PAL_MODE_ALTERNATE(4) | PAL_STM32_OTYPE_OPENDRAIN | PAL_STM32_PUPDR_PULLUP); + palSetPadMode(GPIOB, 8, PAL_MODE_ALTERNATE(4) | PAL_STM32_OTYPE_OPENDRAIN | PAL_STM32_PUPDR_PULLUP); + + i2cStart(&I2C_DRIVER, &slaveI2CConfig); + + // try high drive (from kiibohd) + // I2C_DRIVER.i2c->C2 |= I2Cx_C2_HDRS; + // try glitch fixing (from kiibohd) + // I2C_DRIVER.i2c->FLT = 4; + } diff --git a/drivers/arm/twi2c.h b/drivers/arm/twi2c.h index 175572189..bc7a064a5 100644 --- a/drivers/arm/twi2c.h +++ b/drivers/arm/twi2c.h @@ -17,6 +17,10 @@ #include "ch.h" #include "hal.h" +#ifndef I2C_DRIVER + #define I2C_DRIVER I2CD1 +#endif + #define slaveI2Caddress 0x30 /* Address in our terms - halved by later code */ //#define myOtherI2Caddress 0x19 @@ -25,4 +29,3 @@ I2CSlaveMsgCB twi2c_slave_message_process, catchError, clearAfterSend; void twi2c_slave_init(void); void twi2c_master_init(void); -msg_t twi2c_master_send(i2caddr_t address, const uint8_t * txbuf, uint8_t * rxbuf, systime_t timeout); diff --git a/keyboards/_qmk_handwire/boards/GENERIC_STM32_F303XC/board.c b/keyboards/_qmk_handwire/boards/GENERIC_STM32_F303XC/board.c index 897f20a88..4331155df 100644 --- a/keyboards/_qmk_handwire/boards/GENERIC_STM32_F303XC/board.c +++ b/keyboards/_qmk_handwire/boards/GENERIC_STM32_F303XC/board.c @@ -62,13 +62,15 @@ const PALConfig pal_default_config = { }; #endif +void enter_bootloader_mode_if_requested(void); + /** * @brief Early initialization code. * @details This initialization must be performed just after stack setup * and before any other initialization. */ void __early_init(void) { - + enter_bootloader_mode_if_requested(); stm32_clock_init(); } diff --git a/keyboards/_qmk_handwire/keymaps/default/keymap.c b/keyboards/_qmk_handwire/keymaps/default/keymap.c index 2611f570c..4874eb91c 100644 --- a/keyboards/_qmk_handwire/keymaps/default/keymap.c +++ b/keyboards/_qmk_handwire/keymaps/default/keymap.c @@ -34,14 +34,14 @@ enum custom_keycodes { const uint16_t keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [0] = KEYMAP( - KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_0, KC_DEL, + RESET, KC_1, KC_2, KC_3, KC_4, KC_0, KC_DEL, KC_TAB, DEBUG, KC_W, KC_E, KC_R, KC_T, KC_HOME, KC_ESC, KC_A, KC_S, KC_D, KC_F, KC_G, KC_END, KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_N, KC_RCTL, KC_LEFT, KC_DOWN, KC_UP, KC_LGUI, KC_SPC, MO(2), MO(1), - KC_INS, KC_6, KC_7, KC_8, KC_9, KC_0, KC_BSPC, + KC_INS, KC_6, KC_7, KC_8, KC_9, KC_0, RESET, KC_PGUP, KC_Y, KC_U, KC_I, KC_O, DEBUG, KC_DEL, KC_PGDN, KC_H, KC_J, KC_K, KC_L, KC_COLN, KC_QUOT, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_ENT, diff --git a/keyboards/_qmk_handwire/matrix.c b/keyboards/_qmk_handwire/matrix.c index cbf4537bf..a651d3394 100644 --- a/keyboards/_qmk_handwire/matrix.c +++ b/keyboards/_qmk_handwire/matrix.c @@ -134,8 +134,15 @@ uint8_t other_matrix[MATRIX_ROWS] = { 0 }; void matrix_scan_master(void) { msg_t resp; - resp = twi2c_master_send(slaveI2Caddress/2, command, other_matrix, TIME_IMMEDIATE); + // resp = twi2c_master_send(slaveI2Caddress/2, command, 2, other_matrix, US2ST(100)); + // resp = i2cMasterTransmitTimeout(&I2C_DRIVER, slaveI2Caddress/2, command, 2, other_matrix, MATRIX_ROWS / 2, US2ST(100)); + resp = i2cMasterReceiveTimeout(&I2C_DRIVER, slaveI2Caddress/2, other_matrix, MATRIX_ROWS / 2, US2ST(100)); // printf("%x\n", resp); + // if (resp != MSG_OK) { + // for (i = 0; i < MATRIX_ROWS / 2; i++) { + // resp = i2cMasterReceiveTimeout(&I2C_DRIVER, slaveI2Caddress/2, other_matrix, MATRIX_ROWS / 2, US2ST(100)); + // } + // } if (resp == MSG_OK) { uint8_t * matrix_pointer;