summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorQMK Bot <hello@qmk.fm>2021-04-19 03:08:31 +0000
committerQMK Bot <hello@qmk.fm>2021-04-19 03:08:31 +0000
commit7728b0f966c9ccad42c573bb10193de1398f5503 (patch)
tree7dd82835f2e7b31dc9411ebe38f2befa3934152e
parent0a9e18fae13654ab6d8d85a9867fc10a4261103f (diff)
parenta0089aa34519ec4fcf7cee6a352424e4b7cba7da (diff)
Merge remote-tracking branch 'origin/master' into develop
-rw-r--r--drivers/qwiic/micro_oled.c2
-rw-r--r--keyboards/cannonkeys/satisfaction75/config.h12
-rw-r--r--keyboards/cannonkeys/satisfaction75/i2c_master.c124
-rw-r--r--keyboards/cannonkeys/satisfaction75/satisfaction75.c2
4 files changed, 15 insertions, 125 deletions
diff --git a/drivers/qwiic/micro_oled.c b/drivers/qwiic/micro_oled.c
index c7a4ee081d..bbeb140cbe 100644
--- a/drivers/qwiic/micro_oled.c
+++ b/drivers/qwiic/micro_oled.c
@@ -206,6 +206,8 @@ void clear_screen(void) {
send_data(0);
}
}
+
+ memset(micro_oled_screen_current, 0, LCDWIDTH * LCDHEIGHT / 8);
}
/** \brief Clear SSD1306's memory.
diff --git a/keyboards/cannonkeys/satisfaction75/config.h b/keyboards/cannonkeys/satisfaction75/config.h
index dfb624a0d7..e100cc99b1 100644
--- a/keyboards/cannonkeys/satisfaction75/config.h
+++ b/keyboards/cannonkeys/satisfaction75/config.h
@@ -51,6 +51,18 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
/* define if matrix has ghost */
//#define MATRIX_HAS_GHOST
+// I2C config
+#define I2C_DRIVER I2CD1
+#define I2C1_SCL_BANK GPIOB
+#define I2C1_SCL 6
+#define I2C1_SDA 7
+#define I2C1_SCL_PAL_MODE 1
+#define I2C1_SDA_PAL_MODE 1
+#define I2C1_TIMINGR_PRESC 0x00U
+#define I2C1_TIMINGR_SCLDEL 0x03U
+#define I2C1_TIMINGR_SDADEL 0x01U
+#define I2C1_TIMINGR_SCLH 0x03U
+#define I2C1_TIMINGR_SCLL 0x09U
/* Set 0 if debouncing isn't needed */
#define DEBOUNCE 5
diff --git a/keyboards/cannonkeys/satisfaction75/i2c_master.c b/keyboards/cannonkeys/satisfaction75/i2c_master.c
deleted file mode 100644
index d87f7668d5..0000000000
--- a/keyboards/cannonkeys/satisfaction75/i2c_master.c
+++ /dev/null
@@ -1,124 +0,0 @@
-/* Copyright 2018 Jack Humbert
- * Copyright 2018 Yiancar
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-/* This library is only valid for STM32 processors.
- * This library follows the convention of the AVR i2c_master library.
- * As a result addresses are expected to be already shifted (addr << 1).
- * I2CD1 is the default driver which corresponds to pins B6 and B7. This
- * can be changed.
- * Please ensure that HAL_USE_I2C is TRUE in the halconf.h file and that
- * STM32_I2C_USE_I2C1 is TRUE in the mcuconf.h file. Pins B6 and B7 are used
- * but using any other I2C pins should be trivial.
- */
-
-#include "i2c_master.h"
-#include "quantum.h"
-#include <string.h>
-#include <hal.h>
-
-static uint8_t i2c_address;
-
-// This configures the I2C clock to 400khz assuming a 48Mhz clock
-// For more info : https://www.st.com/en/embedded-software/stsw-stm32126.html
-static const I2CConfig i2cconfig = {
- STM32_TIMINGR_PRESC(0x00U) |
- STM32_TIMINGR_SCLDEL(0x03U) | STM32_TIMINGR_SDADEL(0x01U) |
- STM32_TIMINGR_SCLH(0x03U) | STM32_TIMINGR_SCLL(0x09U),
- 0,
- 0
-};
-
-static i2c_status_t chibios_to_qmk(const msg_t status) {
- switch (status) {
- case I2C_NO_ERROR:
- return I2C_STATUS_SUCCESS;
- case I2C_TIMEOUT:
- return I2C_STATUS_TIMEOUT;
- // I2C_BUS_ERROR, I2C_ARBITRATION_LOST, I2C_ACK_FAILURE, I2C_OVERRUN, I2C_PEC_ERROR, I2C_SMB_ALERT
- default:
- return I2C_STATUS_ERROR;
- }
-}
-
-__attribute__ ((weak))
-void i2c_init(void)
-{
- // Try releasing special pins for a short time
- palSetPadMode(GPIOB, 6, PAL_MODE_INPUT);
- palSetPadMode(GPIOB, 7, PAL_MODE_INPUT);
-
- chThdSleepMilliseconds(10);
-
- palSetPadMode(GPIOB, 6, PAL_MODE_ALTERNATE(1) | PAL_STM32_OTYPE_OPENDRAIN);
- palSetPadMode(GPIOB, 7, PAL_MODE_ALTERNATE(1) | PAL_STM32_OTYPE_OPENDRAIN);
-
- //i2cInit(); //This is invoked by halInit() so no need to redo it.
-}
-
-i2c_status_t i2c_start(uint8_t address)
-{
- i2c_address = address;
- i2cStart(&I2C_DRIVER, &i2cconfig);
- return I2C_STATUS_SUCCESS;
-}
-
-i2c_status_t i2c_transmit(uint8_t address, const uint8_t* data, uint16_t length, uint16_t timeout)
-{
- i2c_address = address;
- i2cStart(&I2C_DRIVER, &i2cconfig);
- i2cAcquireBus(&I2C_DRIVER);
- msg_t status = i2cMasterTransmitTimeout(&I2C_DRIVER, (i2c_address >> 1), data, length, 0, 0, TIME_MS2I(timeout));
- i2cReleaseBus(&I2C_DRIVER);
- return chibios_to_qmk(status);
-}
-
-i2c_status_t i2c_receive(uint8_t address, uint8_t* data, uint16_t length, uint16_t timeout)
-{
- i2c_address = address;
- i2cStart(&I2C_DRIVER, &i2cconfig);
- msg_t status = i2cMasterReceiveTimeout(&I2C_DRIVER, (i2c_address >> 1), data, length, TIME_MS2I(timeout));
- return chibios_to_qmk(status);
-}
-
-i2c_status_t i2c_writeReg(uint8_t devaddr, uint8_t regaddr, const uint8_t* data, uint16_t length, uint16_t timeout)
-{
- i2c_address = devaddr;
- i2cStart(&I2C_DRIVER, &i2cconfig);
-
- uint8_t complete_packet[length + 1];
- for(uint8_t i = 0; i < length; i++)
- {
- complete_packet[i+1] = data[i];
- }
- complete_packet[0] = regaddr;
-
- msg_t status = i2cMasterTransmitTimeout(&I2C_DRIVER, (i2c_address >> 1), complete_packet, length + 1, 0, 0, TIME_MS2I(timeout));
- return chibios_to_qmk(status);
-}
-
-i2c_status_t i2c_readReg(uint8_t devaddr, uint8_t regaddr, uint8_t* data, uint16_t length, uint16_t timeout)
-{
- i2c_address = devaddr;
- i2cStart(&I2C_DRIVER, &i2cconfig);
- msg_t status = i2cMasterTransmitTimeout(&I2C_DRIVER, (i2c_address >> 1), &regaddr, 1, data, length, TIME_MS2I(timeout));
- return chibios_to_qmk(status);
-}
-
-void i2c_stop(void)
-{
- i2cStop(&I2C_DRIVER);
-}
diff --git a/keyboards/cannonkeys/satisfaction75/satisfaction75.c b/keyboards/cannonkeys/satisfaction75/satisfaction75.c
index fd85b8230b..47c9a9d503 100644
--- a/keyboards/cannonkeys/satisfaction75/satisfaction75.c
+++ b/keyboards/cannonkeys/satisfaction75/satisfaction75.c
@@ -380,7 +380,7 @@ void matrix_init_kb(void)
}
-void matrix_scan_kb(void) {
+void housekeeping_task_kb(void) {
rtcGetTime(&RTCD1, &last_timespec);
uint16_t minutes_since_midnight = last_timespec.millisecond / 1000 / 60;