diff options
Diffstat (limited to 'drivers/chibios')
| -rw-r--r-- | drivers/chibios/analog.c | 321 | ||||
| -rw-r--r-- | drivers/chibios/analog.h | 41 | ||||
| -rw-r--r-- | drivers/chibios/i2c_master.c | 121 | ||||
| -rw-r--r-- | drivers/chibios/i2c_master.h | 113 | ||||
| -rw-r--r-- | drivers/chibios/serial.c | 290 | ||||
| -rw-r--r-- | drivers/chibios/serial.h | 62 | ||||
| -rw-r--r-- | drivers/chibios/serial_usart.c | 208 | ||||
| -rw-r--r-- | drivers/chibios/serial_usart.h | 90 | ||||
| -rw-r--r-- | drivers/chibios/serial_usart_duplex.c | 261 | ||||
| -rw-r--r-- | drivers/chibios/spi_master.c | 148 | ||||
| -rw-r--r-- | drivers/chibios/spi_master.h | 80 | ||||
| -rw-r--r-- | drivers/chibios/uart.c | 50 | ||||
| -rw-r--r-- | drivers/chibios/uart.h | 77 | ||||
| -rw-r--r-- | drivers/chibios/usbpd_stm32g4.c | 76 | ||||
| -rw-r--r-- | drivers/chibios/ws2812.c | 114 | ||||
| -rw-r--r-- | drivers/chibios/ws2812_pwm.c | 311 | ||||
| -rw-r--r-- | drivers/chibios/ws2812_spi.c | 159 | 
17 files changed, 0 insertions, 2522 deletions
diff --git a/drivers/chibios/analog.c b/drivers/chibios/analog.c deleted file mode 100644 index 8c476fcac2..0000000000 --- a/drivers/chibios/analog.c +++ /dev/null @@ -1,321 +0,0 @@ -/* Copyright 2019 Drew Mills - * - * 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/>. - */ - -#include "quantum.h" -#include "analog.h" -#include <ch.h> -#include <hal.h> - -#if !HAL_USE_ADC -#    error "You need to set HAL_USE_ADC to TRUE in your halconf.h to use the ADC." -#endif - -#if !STM32_ADC_USE_ADC1 && !STM32_ADC_USE_ADC2 && !STM32_ADC_USE_ADC3 && !STM32_ADC_USE_ADC4 -#    error "You need to set one of the 'STM32_ADC_USE_ADCx' settings to TRUE in your mcuconf.h to use the ADC." -#endif - -#if STM32_ADC_DUAL_MODE -#    error "STM32 ADC Dual Mode is not supported at this time." -#endif - -#if STM32_ADCV3_OVERSAMPLING -#    error "STM32 ADCV3 Oversampling is not supported at this time." -#endif - -// Otherwise assume V3 -#if defined(STM32F0XX) || defined(STM32L0XX) -#    define USE_ADCV1 -#elif defined(STM32F1XX) || defined(STM32F2XX) || defined(STM32F4XX) -#    define USE_ADCV2 -#endif - -// BODGE to make v2 look like v1,3 and 4 -#ifdef USE_ADCV2 -#    if !defined(ADC_SMPR_SMP_1P5) && defined(ADC_SAMPLE_3) -#        define ADC_SMPR_SMP_1P5 ADC_SAMPLE_3 -#        define ADC_SMPR_SMP_7P5 ADC_SAMPLE_15 -#        define ADC_SMPR_SMP_13P5 ADC_SAMPLE_28 -#        define ADC_SMPR_SMP_28P5 ADC_SAMPLE_56 -#        define ADC_SMPR_SMP_41P5 ADC_SAMPLE_84 -#        define ADC_SMPR_SMP_55P5 ADC_SAMPLE_112 -#        define ADC_SMPR_SMP_71P5 ADC_SAMPLE_144 -#        define ADC_SMPR_SMP_239P5 ADC_SAMPLE_480 -#    endif - -#    if !defined(ADC_SMPR_SMP_1P5) && defined(ADC_SAMPLE_1P5) -#        define ADC_SMPR_SMP_1P5 ADC_SAMPLE_1P5 -#        define ADC_SMPR_SMP_7P5 ADC_SAMPLE_7P5 -#        define ADC_SMPR_SMP_13P5 ADC_SAMPLE_13P5 -#        define ADC_SMPR_SMP_28P5 ADC_SAMPLE_28P5 -#        define ADC_SMPR_SMP_41P5 ADC_SAMPLE_41P5 -#        define ADC_SMPR_SMP_55P5 ADC_SAMPLE_55P5 -#        define ADC_SMPR_SMP_71P5 ADC_SAMPLE_71P5 -#        define ADC_SMPR_SMP_239P5 ADC_SAMPLE_239P5 -#    endif - -// we still sample at 12bit, but scale down to the requested bit range -#    define ADC_CFGR1_RES_12BIT 12 -#    define ADC_CFGR1_RES_10BIT 10 -#    define ADC_CFGR1_RES_8BIT 8 -#    define ADC_CFGR1_RES_6BIT 6 -#endif - -/* User configurable ADC options */ -#ifndef ADC_COUNT -#    if defined(STM32F0XX) || defined(STM32F1XX) || defined(STM32F4XX) -#        define ADC_COUNT 1 -#    elif defined(STM32F3XX) -#        define ADC_COUNT 4 -#    else -#        error "ADC_COUNT has not been set for this ARM microcontroller." -#    endif -#endif - -#ifndef ADC_NUM_CHANNELS -#    define ADC_NUM_CHANNELS 1 -#elif ADC_NUM_CHANNELS != 1 -#    error "The ARM ADC implementation currently only supports reading one channel at a time." -#endif - -#ifndef ADC_BUFFER_DEPTH -#    define ADC_BUFFER_DEPTH 1 -#endif - -// For more sampling rate options, look at hal_adc_lld.h in ChibiOS -#ifndef ADC_SAMPLING_RATE -#    define ADC_SAMPLING_RATE ADC_SMPR_SMP_1P5 -#endif - -// Options are 12, 10, 8, and 6 bit. -#ifndef ADC_RESOLUTION -#    ifdef ADC_CFGR_RES_10BITS  // ADCv3, ADCv4 -#        define ADC_RESOLUTION ADC_CFGR_RES_10BITS -#    else  // ADCv1, ADCv5, or the bodge for ADCv2 above -#        define ADC_RESOLUTION ADC_CFGR1_RES_10BIT -#    endif -#endif - -static ADCConfig   adcCfg = {}; -static adcsample_t sampleBuffer[ADC_NUM_CHANNELS * ADC_BUFFER_DEPTH]; - -// Initialize to max number of ADCs, set to empty object to initialize all to false. -static bool adcInitialized[ADC_COUNT] = {}; - -// TODO: add back TR handling??? -static ADCConversionGroup adcConversionGroup = { -    .circular     = FALSE, -    .num_channels = (uint16_t)(ADC_NUM_CHANNELS), -#if defined(USE_ADCV1) -    .cfgr1 = ADC_CFGR1_CONT | ADC_RESOLUTION, -    .smpr  = ADC_SAMPLING_RATE, -#elif defined(USE_ADCV2) -#    if !defined(STM32F1XX) -    .cr2 = ADC_CR2_SWSTART,  // F103 seem very unhappy with, F401 seems very unhappy without... -#    endif -    .smpr2 = ADC_SMPR2_SMP_AN0(ADC_SAMPLING_RATE) | ADC_SMPR2_SMP_AN1(ADC_SAMPLING_RATE) | ADC_SMPR2_SMP_AN2(ADC_SAMPLING_RATE) | ADC_SMPR2_SMP_AN3(ADC_SAMPLING_RATE) | ADC_SMPR2_SMP_AN4(ADC_SAMPLING_RATE) | ADC_SMPR2_SMP_AN5(ADC_SAMPLING_RATE) | ADC_SMPR2_SMP_AN6(ADC_SAMPLING_RATE) | ADC_SMPR2_SMP_AN7(ADC_SAMPLING_RATE) | ADC_SMPR2_SMP_AN8(ADC_SAMPLING_RATE) | ADC_SMPR2_SMP_AN9(ADC_SAMPLING_RATE), -    .smpr1 = ADC_SMPR1_SMP_AN10(ADC_SAMPLING_RATE) | ADC_SMPR1_SMP_AN11(ADC_SAMPLING_RATE) | ADC_SMPR1_SMP_AN12(ADC_SAMPLING_RATE) | ADC_SMPR1_SMP_AN13(ADC_SAMPLING_RATE) | ADC_SMPR1_SMP_AN14(ADC_SAMPLING_RATE) | ADC_SMPR1_SMP_AN15(ADC_SAMPLING_RATE), -#else -    .cfgr = ADC_CFGR_CONT | ADC_RESOLUTION, -    .smpr = {ADC_SMPR1_SMP_AN0(ADC_SAMPLING_RATE) | ADC_SMPR1_SMP_AN1(ADC_SAMPLING_RATE) | ADC_SMPR1_SMP_AN2(ADC_SAMPLING_RATE) | ADC_SMPR1_SMP_AN3(ADC_SAMPLING_RATE) | ADC_SMPR1_SMP_AN4(ADC_SAMPLING_RATE) | ADC_SMPR1_SMP_AN5(ADC_SAMPLING_RATE) | ADC_SMPR1_SMP_AN6(ADC_SAMPLING_RATE) | ADC_SMPR1_SMP_AN7(ADC_SAMPLING_RATE) | ADC_SMPR1_SMP_AN8(ADC_SAMPLING_RATE) | ADC_SMPR1_SMP_AN9(ADC_SAMPLING_RATE), ADC_SMPR2_SMP_AN10(ADC_SAMPLING_RATE) | ADC_SMPR2_SMP_AN11(ADC_SAMPLING_RATE) | ADC_SMPR2_SMP_AN12(ADC_SAMPLING_RATE) | ADC_SMPR2_SMP_AN13(ADC_SAMPLING_RATE) | ADC_SMPR2_SMP_AN14(ADC_SAMPLING_RATE) | ADC_SMPR2_SMP_AN15(ADC_SAMPLING_RATE) | ADC_SMPR2_SMP_AN16(ADC_SAMPLING_RATE) | ADC_SMPR2_SMP_AN17(ADC_SAMPLING_RATE) | ADC_SMPR2_SMP_AN18(ADC_SAMPLING_RATE)}, -#endif -}; - -// clang-format off -__attribute__((weak)) adc_mux pinToMux(pin_t pin) { -    switch (pin) { -#if defined(STM32F0XX) -        case A0:  return TO_MUX( ADC_CHSELR_CHSEL0,  0 ); -        case A1:  return TO_MUX( ADC_CHSELR_CHSEL1,  0 ); -        case A2:  return TO_MUX( ADC_CHSELR_CHSEL2,  0 ); -        case A3:  return TO_MUX( ADC_CHSELR_CHSEL3,  0 ); -        case A4:  return TO_MUX( ADC_CHSELR_CHSEL4,  0 ); -        case A5:  return TO_MUX( ADC_CHSELR_CHSEL5,  0 ); -        case A6:  return TO_MUX( ADC_CHSELR_CHSEL6,  0 ); -        case A7:  return TO_MUX( ADC_CHSELR_CHSEL7,  0 ); -        case B0:  return TO_MUX( ADC_CHSELR_CHSEL8,  0 ); -        case B1:  return TO_MUX( ADC_CHSELR_CHSEL9,  0 ); -        case C0:  return TO_MUX( ADC_CHSELR_CHSEL10, 0 ); -        case C1:  return TO_MUX( ADC_CHSELR_CHSEL11, 0 ); -        case C2:  return TO_MUX( ADC_CHSELR_CHSEL12, 0 ); -        case C3:  return TO_MUX( ADC_CHSELR_CHSEL13, 0 ); -        case C4:  return TO_MUX( ADC_CHSELR_CHSEL14, 0 ); -        case C5:  return TO_MUX( ADC_CHSELR_CHSEL15, 0 ); -#elif defined(STM32F3XX) -        case A0:  return TO_MUX( ADC_CHANNEL_IN1,  0 ); -        case A1:  return TO_MUX( ADC_CHANNEL_IN2,  0 ); -        case A2:  return TO_MUX( ADC_CHANNEL_IN3,  0 ); -        case A3:  return TO_MUX( ADC_CHANNEL_IN4,  0 ); -        case A4:  return TO_MUX( ADC_CHANNEL_IN1,  1 ); -        case A5:  return TO_MUX( ADC_CHANNEL_IN2,  1 ); -        case A6:  return TO_MUX( ADC_CHANNEL_IN3,  1 ); -        case A7:  return TO_MUX( ADC_CHANNEL_IN4,  1 ); -        case B0:  return TO_MUX( ADC_CHANNEL_IN12, 2 ); -        case B1:  return TO_MUX( ADC_CHANNEL_IN1,  2 ); -        case B2:  return TO_MUX( ADC_CHANNEL_IN12, 1 ); -        case B12: return TO_MUX( ADC_CHANNEL_IN3,  3 ); -        case B13: return TO_MUX( ADC_CHANNEL_IN5,  2 ); -        case B14: return TO_MUX( ADC_CHANNEL_IN4,  3 ); -        case B15: return TO_MUX( ADC_CHANNEL_IN5,  3 ); -        case C0:  return TO_MUX( ADC_CHANNEL_IN6,  0 ); // Can also be ADC2 -        case C1:  return TO_MUX( ADC_CHANNEL_IN7,  0 ); // Can also be ADC2 -        case C2:  return TO_MUX( ADC_CHANNEL_IN8,  0 ); // Can also be ADC2 -        case C3:  return TO_MUX( ADC_CHANNEL_IN9,  0 ); // Can also be ADC2 -        case C4:  return TO_MUX( ADC_CHANNEL_IN5,  1 ); -        case C5:  return TO_MUX( ADC_CHANNEL_IN11, 1 ); -        case D8:  return TO_MUX( ADC_CHANNEL_IN12, 3 ); -        case D9:  return TO_MUX( ADC_CHANNEL_IN13, 3 ); -        case D10: return TO_MUX( ADC_CHANNEL_IN7,  2 ); // Can also be ADC4 -        case D11: return TO_MUX( ADC_CHANNEL_IN8,  2 ); // Can also be ADC4 -        case D12: return TO_MUX( ADC_CHANNEL_IN9,  2 ); // Can also be ADC4 -        case D13: return TO_MUX( ADC_CHANNEL_IN10, 2 ); // Can also be ADC4 -        case D14: return TO_MUX( ADC_CHANNEL_IN11, 2 ); // Can also be ADC4 -        case E7:  return TO_MUX( ADC_CHANNEL_IN13, 2 ); -        case E8:  return TO_MUX( ADC_CHANNEL_IN6,  2 ); // Can also be ADC4 -        case E9:  return TO_MUX( ADC_CHANNEL_IN2,  2 ); -        case E10: return TO_MUX( ADC_CHANNEL_IN14, 2 ); -        case E11: return TO_MUX( ADC_CHANNEL_IN15, 2 ); -        case E12: return TO_MUX( ADC_CHANNEL_IN16, 2 ); -        case E13: return TO_MUX( ADC_CHANNEL_IN3,  2 ); -        case E14: return TO_MUX( ADC_CHANNEL_IN1,  3 ); -        case E15: return TO_MUX( ADC_CHANNEL_IN2,  3 ); -        case F2:  return TO_MUX( ADC_CHANNEL_IN10, 0 ); // Can also be ADC2 -        case F4:  return TO_MUX( ADC_CHANNEL_IN5,  0 ); -#elif defined(STM32F4XX) -        case A0:  return TO_MUX( ADC_CHANNEL_IN0,  0 ); -        case A1:  return TO_MUX( ADC_CHANNEL_IN1,  0 ); -        case A2:  return TO_MUX( ADC_CHANNEL_IN2,  0 ); -        case A3:  return TO_MUX( ADC_CHANNEL_IN3,  0 ); -        case A4:  return TO_MUX( ADC_CHANNEL_IN4,  0 ); -        case A5:  return TO_MUX( ADC_CHANNEL_IN5,  0 ); -        case A6:  return TO_MUX( ADC_CHANNEL_IN6,  0 ); -        case A7:  return TO_MUX( ADC_CHANNEL_IN7,  0 ); -        case B0:  return TO_MUX( ADC_CHANNEL_IN8,  0 ); -        case B1:  return TO_MUX( ADC_CHANNEL_IN9,  0 ); -        case C0:  return TO_MUX( ADC_CHANNEL_IN10, 0 ); -        case C1:  return TO_MUX( ADC_CHANNEL_IN11, 0 ); -        case C2:  return TO_MUX( ADC_CHANNEL_IN12, 0 ); -        case C3:  return TO_MUX( ADC_CHANNEL_IN13, 0 ); -        case C4:  return TO_MUX( ADC_CHANNEL_IN14, 0 ); -        case C5:  return TO_MUX( ADC_CHANNEL_IN15, 0 ); -#    if STM32_ADC_USE_ADC3 -        case F3:  return TO_MUX( ADC_CHANNEL_IN9,  2 ); -        case F4:  return TO_MUX( ADC_CHANNEL_IN14, 2 ); -        case F5:  return TO_MUX( ADC_CHANNEL_IN15, 2 ); -        case F6:  return TO_MUX( ADC_CHANNEL_IN4,  2 ); -        case F7:  return TO_MUX( ADC_CHANNEL_IN5,  2 ); -        case F8:  return TO_MUX( ADC_CHANNEL_IN6,  2 ); -        case F9:  return TO_MUX( ADC_CHANNEL_IN7,  2 ); -        case F10: return TO_MUX( ADC_CHANNEL_IN8,  2 ); -#    endif -#elif defined(STM32F1XX) -        case A0:  return TO_MUX( ADC_CHANNEL_IN0,  0 ); -        case A1:  return TO_MUX( ADC_CHANNEL_IN1,  0 ); -        case A2:  return TO_MUX( ADC_CHANNEL_IN2,  0 ); -        case A3:  return TO_MUX( ADC_CHANNEL_IN3,  0 ); -        case A4:  return TO_MUX( ADC_CHANNEL_IN4,  0 ); -        case A5:  return TO_MUX( ADC_CHANNEL_IN5,  0 ); -        case A6:  return TO_MUX( ADC_CHANNEL_IN6,  0 ); -        case A7:  return TO_MUX( ADC_CHANNEL_IN7,  0 ); -        case B0:  return TO_MUX( ADC_CHANNEL_IN8,  0 ); -        case B1:  return TO_MUX( ADC_CHANNEL_IN9,  0 ); -        case C0:  return TO_MUX( ADC_CHANNEL_IN10, 0 ); -        case C1:  return TO_MUX( ADC_CHANNEL_IN11, 0 ); -        case C2:  return TO_MUX( ADC_CHANNEL_IN12, 0 ); -        case C3:  return TO_MUX( ADC_CHANNEL_IN13, 0 ); -        case C4:  return TO_MUX( ADC_CHANNEL_IN14, 0 ); -        case C5:  return TO_MUX( ADC_CHANNEL_IN15, 0 ); -        // STM32F103x[C-G] in 144-pin packages also have analog inputs on F6...F10, but they are on ADC3, and the -        // ChibiOS ADC driver for STM32F1xx currently supports only ADC1, therefore these pins are not usable. -#endif -    } - -    // return an adc that would never be used so intToADCDriver will bail out -    return TO_MUX(0, 0xFF); -} -// clang-format on - -static inline ADCDriver* intToADCDriver(uint8_t adcInt) { -    switch (adcInt) { -#if STM32_ADC_USE_ADC1 -        case 0: -            return &ADCD1; -#endif -#if STM32_ADC_USE_ADC2 -        case 1: -            return &ADCD2; -#endif -#if STM32_ADC_USE_ADC3 -        case 2: -            return &ADCD3; -#endif -#if STM32_ADC_USE_ADC4 -        case 3: -            return &ADCD4; -#endif -    } - -    return NULL; -} - -static inline void manageAdcInitializationDriver(uint8_t adc, ADCDriver* adcDriver) { -    if (!adcInitialized[adc]) { -        adcStart(adcDriver, &adcCfg); -        adcInitialized[adc] = true; -    } -} - -int16_t analogReadPin(pin_t pin) { -    palSetLineMode(pin, PAL_MODE_INPUT_ANALOG); - -    return adc_read(pinToMux(pin)); -} - -int16_t analogReadPinAdc(pin_t pin, uint8_t adc) { -    palSetLineMode(pin, PAL_MODE_INPUT_ANALOG); - -    adc_mux target = pinToMux(pin); -    target.adc     = adc; -    return adc_read(target); -} - -int16_t adc_read(adc_mux mux) { -#if defined(USE_ADCV1) -    // TODO: fix previous assumption of only 1 input... -    adcConversionGroup.chselr = 1 << mux.input; /*no macro to convert N to ADC_CHSELR_CHSEL1*/ -#elif defined(USE_ADCV2) -    adcConversionGroup.sqr3 = ADC_SQR3_SQ1_N(mux.input); -#else -    adcConversionGroup.sqr[0] = ADC_SQR1_SQ1_N(mux.input); -#endif - -    ADCDriver* targetDriver = intToADCDriver(mux.adc); -    if (!targetDriver) { -        return 0; -    } - -    manageAdcInitializationDriver(mux.adc, targetDriver); -    if (adcConvert(targetDriver, &adcConversionGroup, &sampleBuffer[0], ADC_BUFFER_DEPTH) != MSG_OK) { -        return 0; -    } - -#ifdef USE_ADCV2 -    // fake 12-bit -> N-bit scale -    return (*sampleBuffer) >> (12 - ADC_RESOLUTION); -#else -    // already handled as part of adcConvert -    return *sampleBuffer; -#endif -} diff --git a/drivers/chibios/analog.h b/drivers/chibios/analog.h deleted file mode 100644 index e61c394265..0000000000 --- a/drivers/chibios/analog.h +++ /dev/null @@ -1,41 +0,0 @@ -/* Copyright 2019 Drew Mills - * - * 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/>. - */ - -#pragma once - -#include <stdint.h> -#include "quantum.h" - -#ifdef __cplusplus -extern "C" { -#endif - -typedef struct { -    uint16_t input; -    uint8_t  adc; -} adc_mux; -#define TO_MUX(i, a) \ -    (adc_mux) { i, a } - -int16_t analogReadPin(pin_t pin); -int16_t analogReadPinAdc(pin_t pin, uint8_t adc); -adc_mux pinToMux(pin_t pin); - -int16_t adc_read(adc_mux mux); - -#ifdef __cplusplus -} -#endif diff --git a/drivers/chibios/i2c_master.c b/drivers/chibios/i2c_master.c deleted file mode 100644 index fc4bb2ab37..0000000000 --- a/drivers/chibios/i2c_master.c +++ /dev/null @@ -1,121 +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 "quantum.h" -#include "i2c_master.h" -#include <string.h> -#include <hal.h> - -static uint8_t i2c_address; - -static const I2CConfig i2cconfig = { -#if defined(USE_I2CV1_CONTRIB) -    I2C1_CLOCK_SPEED, -#elif defined(USE_I2CV1) -    I2C1_OPMODE, -    I2C1_CLOCK_SPEED, -    I2C1_DUTY_CYCLE, -#else -    // This configures the I2C clock to 400khz assuming a 72Mhz clock -    // For more info : https://www.st.com/en/embedded-software/stsw-stm32126.html -    STM32_TIMINGR_PRESC(I2C1_TIMINGR_PRESC) | STM32_TIMINGR_SCLDEL(I2C1_TIMINGR_SCLDEL) | STM32_TIMINGR_SDADEL(I2C1_TIMINGR_SDADEL) | STM32_TIMINGR_SCLH(I2C1_TIMINGR_SCLH) | STM32_TIMINGR_SCLL(I2C1_TIMINGR_SCLL), 0, 0 -#endif -}; - -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) { -    static bool is_initialised = false; -    if (!is_initialised) { -        is_initialised = true; - -        // Try releasing special pins for a short time -        palSetPadMode(I2C1_SCL_BANK, I2C1_SCL, PAL_MODE_INPUT); -        palSetPadMode(I2C1_SDA_BANK, I2C1_SDA, PAL_MODE_INPUT); - -        chThdSleepMilliseconds(10); -#if defined(USE_GPIOV1) -        palSetPadMode(I2C1_SCL_BANK, I2C1_SCL, I2C1_SCL_PAL_MODE); -        palSetPadMode(I2C1_SDA_BANK, I2C1_SDA, I2C1_SDA_PAL_MODE); -#else -        palSetPadMode(I2C1_SCL_BANK, I2C1_SCL, PAL_MODE_ALTERNATE(I2C1_SCL_PAL_MODE) | PAL_STM32_OTYPE_OPENDRAIN); -        palSetPadMode(I2C1_SDA_BANK, I2C1_SDA, PAL_MODE_ALTERNATE(I2C1_SDA_PAL_MODE) | PAL_STM32_OTYPE_OPENDRAIN); -#endif -    } -} - -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); -    msg_t status = i2cMasterTransmitTimeout(&I2C_DRIVER, (i2c_address >> 1), data, length, 0, 0, TIME_MS2I(timeout)); -    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), ®addr, 1, data, length, TIME_MS2I(timeout)); -    return chibios_to_qmk(&status); -} - -void i2c_stop(void) { i2cStop(&I2C_DRIVER); } diff --git a/drivers/chibios/i2c_master.h b/drivers/chibios/i2c_master.h deleted file mode 100644 index c68109acbd..0000000000 --- a/drivers/chibios/i2c_master.h +++ /dev/null @@ -1,113 +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 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. - */ -#pragma once - -#include <ch.h> -#include <hal.h> - -#ifdef I2C1_BANK -#    define I2C1_SCL_BANK I2C1_BANK -#    define I2C1_SDA_BANK I2C1_BANK -#endif - -#ifndef I2C1_SCL_BANK -#    define I2C1_SCL_BANK GPIOB -#endif - -#ifndef I2C1_SDA_BANK -#    define I2C1_SDA_BANK GPIOB -#endif - -#ifndef I2C1_SCL -#    define I2C1_SCL 6 -#endif -#ifndef I2C1_SDA -#    define I2C1_SDA 7 -#endif - -#ifdef USE_I2CV1 -#    ifndef I2C1_OPMODE -#        define I2C1_OPMODE OPMODE_I2C -#    endif -#    ifndef I2C1_CLOCK_SPEED -#        define I2C1_CLOCK_SPEED 100000 /* 400000 */ -#    endif -#    ifndef I2C1_DUTY_CYCLE -#        define I2C1_DUTY_CYCLE STD_DUTY_CYCLE /* FAST_DUTY_CYCLE_2 */ -#    endif -#else -// The default timing values below configures the I2C clock to 400khz assuming a 72Mhz clock -// For more info : https://www.st.com/en/embedded-software/stsw-stm32126.html -#    ifndef I2C1_TIMINGR_PRESC -#        define I2C1_TIMINGR_PRESC 0U -#    endif -#    ifndef I2C1_TIMINGR_SCLDEL -#        define I2C1_TIMINGR_SCLDEL 7U -#    endif -#    ifndef I2C1_TIMINGR_SDADEL -#        define I2C1_TIMINGR_SDADEL 0U -#    endif -#    ifndef I2C1_TIMINGR_SCLH -#        define I2C1_TIMINGR_SCLH 38U -#    endif -#    ifndef I2C1_TIMINGR_SCLL -#        define I2C1_TIMINGR_SCLL 129U -#    endif -#endif - -#ifndef I2C_DRIVER -#    define I2C_DRIVER I2CD1 -#endif - -#ifdef USE_GPIOV1 -#    ifndef I2C1_SCL_PAL_MODE -#        define I2C1_SCL_PAL_MODE PAL_MODE_STM32_ALTERNATE_OPENDRAIN -#    endif -#    ifndef I2C1_SDA_PAL_MODE -#        define I2C1_SDA_PAL_MODE PAL_MODE_STM32_ALTERNATE_OPENDRAIN -#    endif -#else -// The default PAL alternate modes are used to signal that the pins are used for I2C -#    ifndef I2C1_SCL_PAL_MODE -#        define I2C1_SCL_PAL_MODE 4 -#    endif -#    ifndef I2C1_SDA_PAL_MODE -#        define I2C1_SDA_PAL_MODE 4 -#    endif -#endif - -typedef int16_t i2c_status_t; - -#define I2C_STATUS_SUCCESS (0) -#define I2C_STATUS_ERROR (-1) -#define I2C_STATUS_TIMEOUT (-2) - -void         i2c_init(void); -i2c_status_t i2c_start(uint8_t address); -i2c_status_t i2c_transmit(uint8_t address, const uint8_t* data, uint16_t length, uint16_t timeout); -i2c_status_t i2c_receive(uint8_t address, uint8_t* data, uint16_t length, uint16_t timeout); -i2c_status_t i2c_writeReg(uint8_t devaddr, uint8_t regaddr, const uint8_t* data, uint16_t length, uint16_t timeout); -i2c_status_t i2c_readReg(uint8_t devaddr, uint8_t regaddr, uint8_t* data, uint16_t length, uint16_t timeout); -void         i2c_stop(void); diff --git a/drivers/chibios/serial.c b/drivers/chibios/serial.c deleted file mode 100644 index 54f7e1321f..0000000000 --- a/drivers/chibios/serial.c +++ /dev/null @@ -1,290 +0,0 @@ -/* - * WARNING: be careful changing this code, it is very timing dependent - */ - -#include "quantum.h" -#include "serial.h" -#include "wait.h" - -#include <hal.h> - -// TODO: resolve/remove build warnings -#if defined(RGBLIGHT_ENABLE) && defined(RGBLED_SPLIT) && defined(PROTOCOL_CHIBIOS) && defined(WS2812_DRIVER_BITBANG) -#    warning "RGBLED_SPLIT not supported with bitbang WS2812 driver" -#endif - -// default wait implementation cannot be called within interrupt -//   this method seems to be more accurate than GPT timers -#if PORT_SUPPORTS_RT == FALSE -#    error "chSysPolledDelayX method not supported on this platform" -#else -#    undef wait_us -#    define wait_us(x) chSysPolledDelayX(US2RTC(STM32_SYSCLK, x)) -#endif - -#ifndef SELECT_SOFT_SERIAL_SPEED -#    define SELECT_SOFT_SERIAL_SPEED 1 -// TODO: correct speeds... -//  0: about 189kbps (Experimental only) -//  1: about 137kbps (default) -//  2: about 75kbps -//  3: about 39kbps -//  4: about 26kbps -//  5: about 20kbps -#endif - -// Serial pulse period in microseconds. At the moment, going lower than 12 causes communication failure -#if SELECT_SOFT_SERIAL_SPEED == 0 -#    define SERIAL_DELAY 12 -#elif SELECT_SOFT_SERIAL_SPEED == 1 -#    define SERIAL_DELAY 16 -#elif SELECT_SOFT_SERIAL_SPEED == 2 -#    define SERIAL_DELAY 24 -#elif SELECT_SOFT_SERIAL_SPEED == 3 -#    define SERIAL_DELAY 32 -#elif SELECT_SOFT_SERIAL_SPEED == 4 -#    define SERIAL_DELAY 48 -#elif SELECT_SOFT_SERIAL_SPEED == 5 -#    define SERIAL_DELAY 64 -#else -#    error invalid SELECT_SOFT_SERIAL_SPEED value -#endif - -inline static void serial_delay(void) { wait_us(SERIAL_DELAY); } -inline static void serial_delay_half(void) { wait_us(SERIAL_DELAY / 2); } -inline static void serial_delay_blip(void) { wait_us(1); } -inline static void serial_output(void) { setPinOutput(SOFT_SERIAL_PIN); } -inline static void serial_input(void) { setPinInputHigh(SOFT_SERIAL_PIN); } -inline static bool serial_read_pin(void) { return !!readPin(SOFT_SERIAL_PIN); } -inline static void serial_low(void) { writePinLow(SOFT_SERIAL_PIN); } -inline static void serial_high(void) { writePinHigh(SOFT_SERIAL_PIN); } - -void interrupt_handler(void *arg); - -// Use thread + palWaitLineTimeout instead of palSetLineCallback -//  - Methods like setPinOutput and palEnableLineEvent/palDisableLineEvent -//    cause the interrupt to lock up, which would limit to only receiving data... -static THD_WORKING_AREA(waThread1, 128); -static THD_FUNCTION(Thread1, arg) { -    (void)arg; -    chRegSetThreadName("blinker"); -    while (true) { -        palWaitLineTimeout(SOFT_SERIAL_PIN, TIME_INFINITE); -        interrupt_handler(NULL); -    } -} - -static SSTD_t *Transaction_table      = NULL; -static uint8_t Transaction_table_size = 0; - -void soft_serial_initiator_init(SSTD_t *sstd_table, int sstd_table_size) { -    Transaction_table      = sstd_table; -    Transaction_table_size = (uint8_t)sstd_table_size; - -    serial_output(); -    serial_high(); -} - -void soft_serial_target_init(SSTD_t *sstd_table, int sstd_table_size) { -    Transaction_table      = sstd_table; -    Transaction_table_size = (uint8_t)sstd_table_size; - -    serial_input(); - -    palEnablePadEvent(PAL_PORT(SOFT_SERIAL_PIN), PAL_PAD(SOFT_SERIAL_PIN), PAL_EVENT_MODE_FALLING_EDGE); -    chThdCreateStatic(waThread1, sizeof(waThread1), HIGHPRIO, Thread1, NULL); -} - -// Used by the master to synchronize timing with the slave. -static void __attribute__((noinline)) sync_recv(void) { -    serial_input(); -    // This shouldn't hang if the slave disconnects because the -    // serial line will float to high if the slave does disconnect. -    while (!serial_read_pin()) { -    } - -    serial_delay(); -} - -// Used by the slave to send a synchronization signal to the master. -static void __attribute__((noinline)) sync_send(void) { -    serial_output(); - -    serial_low(); -    serial_delay(); - -    serial_high(); -} - -// Reads a byte from the serial line -static uint8_t __attribute__((noinline)) serial_read_byte(void) { -    uint8_t byte = 0; -    serial_input(); -    for (uint8_t i = 0; i < 8; ++i) { -        byte = (byte << 1) | serial_read_pin(); -        serial_delay(); -    } - -    return byte; -} - -// Sends a byte with MSB ordering -static void __attribute__((noinline)) serial_write_byte(uint8_t data) { -    uint8_t b = 8; -    serial_output(); -    while (b--) { -        if (data & (1 << b)) { -            serial_high(); -        } else { -            serial_low(); -        } -        serial_delay(); -    } -} - -// interrupt handle to be used by the slave device -void interrupt_handler(void *arg) { -    chSysLockFromISR(); - -    sync_send(); - -    // read mid pulses -    serial_delay_blip(); - -    uint8_t checksum_computed = 0; -    int     sstd_index        = 0; - -#ifdef SERIAL_USE_MULTI_TRANSACTION -    sstd_index = serial_read_byte(); -    sync_send(); -#endif - -    SSTD_t *trans = &Transaction_table[sstd_index]; -    for (int i = 0; i < trans->initiator2target_buffer_size; ++i) { -        trans->initiator2target_buffer[i] = serial_read_byte(); -        sync_send(); -        checksum_computed += trans->initiator2target_buffer[i]; -    } -    checksum_computed ^= 7; -    uint8_t checksum_received = serial_read_byte(); -    sync_send(); - -    // wait for the sync to finish sending -    serial_delay(); - -    uint8_t checksum = 0; -    for (int i = 0; i < trans->target2initiator_buffer_size; ++i) { -        serial_write_byte(trans->target2initiator_buffer[i]); -        sync_send(); -        serial_delay_half(); -        checksum += trans->target2initiator_buffer[i]; -    } -    serial_write_byte(checksum ^ 7); -    sync_send(); - -    // wait for the sync to finish sending -    serial_delay(); - -    *trans->status = (checksum_computed == checksum_received) ? TRANSACTION_ACCEPTED : TRANSACTION_DATA_ERROR; - -    // end transaction -    serial_input(); - -    // TODO: remove extra delay between transactions -    serial_delay(); - -    chSysUnlockFromISR(); -} - -///////// -//  start transaction by initiator -// -// int  soft_serial_transaction(int sstd_index) -// -// Returns: -//    TRANSACTION_END -//    TRANSACTION_NO_RESPONSE -//    TRANSACTION_DATA_ERROR -// this code is very time dependent, so we need to disable interrupts -#ifndef SERIAL_USE_MULTI_TRANSACTION -int soft_serial_transaction(void) { -    int sstd_index = 0; -#else -int soft_serial_transaction(int sstd_index) { -#endif - -    if (sstd_index > Transaction_table_size) return TRANSACTION_TYPE_ERROR; -    SSTD_t *trans = &Transaction_table[sstd_index]; - -    // TODO: remove extra delay between transactions -    serial_delay(); - -    // this code is very time dependent, so we need to disable interrupts -    chSysLock(); - -    // signal to the slave that we want to start a transaction -    serial_output(); -    serial_low(); -    serial_delay_blip(); - -    // wait for the slaves response -    serial_input(); -    serial_high(); -    serial_delay(); - -    // check if the slave is present -    if (serial_read_pin()) { -        // slave failed to pull the line low, assume not present -        dprintf("serial::NO_RESPONSE\n"); -        chSysUnlock(); -        return TRANSACTION_NO_RESPONSE; -    } - -    // if the slave is present syncronize with it - -    uint8_t checksum = 0; -    // send data to the slave -#ifdef SERIAL_USE_MULTI_TRANSACTION -    serial_write_byte(sstd_index);  // first chunk is transaction id -    sync_recv(); -#endif -    for (int i = 0; i < trans->initiator2target_buffer_size; ++i) { -        serial_write_byte(trans->initiator2target_buffer[i]); -        sync_recv(); -        checksum += trans->initiator2target_buffer[i]; -    } -    serial_write_byte(checksum ^ 7); -    sync_recv(); - -    serial_delay(); -    serial_delay();  // read mid pulses - -    // receive data from the slave -    uint8_t checksum_computed = 0; -    for (int i = 0; i < trans->target2initiator_buffer_size; ++i) { -        trans->target2initiator_buffer[i] = serial_read_byte(); -        sync_recv(); -        checksum_computed += trans->target2initiator_buffer[i]; -    } -    checksum_computed ^= 7; -    uint8_t checksum_received = serial_read_byte(); - -    sync_recv(); -    serial_delay(); - -    if ((checksum_computed) != (checksum_received)) { -        dprintf("serial::FAIL[%u,%u,%u]\n", checksum_computed, checksum_received, sstd_index); -        serial_output(); -        serial_high(); - -        chSysUnlock(); -        return TRANSACTION_DATA_ERROR; -    } - -    // always, release the line when not in use -    serial_high(); -    serial_output(); - -    chSysUnlock(); -    return TRANSACTION_END; -} diff --git a/drivers/chibios/serial.h b/drivers/chibios/serial.h deleted file mode 100644 index 0c1857d52e..0000000000 --- a/drivers/chibios/serial.h +++ /dev/null @@ -1,62 +0,0 @@ -#pragma once - -#include <stdbool.h> - -// ///////////////////////////////////////////////////////////////// -// Need Soft Serial defines in config.h -// ///////////////////////////////////////////////////////////////// -// ex. -//  #define SOFT_SERIAL_PIN ??   // ?? = D0,D1,D2,D3,E6 -//  OPTIONAL: #define SELECT_SOFT_SERIAL_SPEED ? // ? = 1,2,3,4,5 -//                                               //  1: about 137kbps (default) -//                                               //  2: about 75kbps -//                                               //  3: about 39kbps -//                                               //  4: about 26kbps -//                                               //  5: about 20kbps -// -// //// USE simple API (using signle-type transaction function) -//   /* nothing */ -// //// USE flexible API (using multi-type transaction function) -//   #define SERIAL_USE_MULTI_TRANSACTION -// -// ///////////////////////////////////////////////////////////////// - -// Soft Serial Transaction Descriptor -typedef struct _SSTD_t { -    uint8_t *status; -    uint8_t  initiator2target_buffer_size; -    uint8_t *initiator2target_buffer; -    uint8_t  target2initiator_buffer_size; -    uint8_t *target2initiator_buffer; -} SSTD_t; -#define TID_LIMIT(table) (sizeof(table) / sizeof(SSTD_t)) - -// initiator is transaction start side -void soft_serial_initiator_init(SSTD_t *sstd_table, int sstd_table_size); -// target is interrupt accept side -void soft_serial_target_init(SSTD_t *sstd_table, int sstd_table_size); - -// initiator result -#define TRANSACTION_END 0 -#define TRANSACTION_NO_RESPONSE 0x1 -#define TRANSACTION_DATA_ERROR 0x2 -#define TRANSACTION_TYPE_ERROR 0x4 -#ifndef SERIAL_USE_MULTI_TRANSACTION -int soft_serial_transaction(void); -#else -int soft_serial_transaction(int sstd_index); -#endif - -// target status -// *SSTD_t.status has -//   initiator: -//       TRANSACTION_END -//    or TRANSACTION_NO_RESPONSE -//    or TRANSACTION_DATA_ERROR -//   target: -//       TRANSACTION_DATA_ERROR -//    or TRANSACTION_ACCEPTED -#define TRANSACTION_ACCEPTED 0x8 -#ifdef SERIAL_USE_MULTI_TRANSACTION -int soft_serial_get_and_clean_status(int sstd_index); -#endif diff --git a/drivers/chibios/serial_usart.c b/drivers/chibios/serial_usart.c deleted file mode 100644 index cae29388c3..0000000000 --- a/drivers/chibios/serial_usart.c +++ /dev/null @@ -1,208 +0,0 @@ -/* Copyright 2021 QMK - * - * 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 3 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/>. - */ - -#include "serial_usart.h" - -#ifndef USE_GPIOV1 -// The default PAL alternate modes are used to signal that the pins are used for USART -#    ifndef SERIAL_USART_TX_PAL_MODE -#        define SERIAL_USART_TX_PAL_MODE 7 -#    endif -#endif - -#ifndef SERIAL_USART_DRIVER -#    define SERIAL_USART_DRIVER SD1 -#endif - -#ifdef SOFT_SERIAL_PIN -#    define SERIAL_USART_TX_PIN SOFT_SERIAL_PIN -#endif - -static inline msg_t sdWriteHalfDuplex(SerialDriver* driver, uint8_t* data, uint8_t size) { -    msg_t ret = sdWrite(driver, data, size); - -    // Half duplex requires us to read back the data we just wrote - just throw it away -    uint8_t dump[size]; -    sdRead(driver, dump, size); - -    return ret; -} -#undef sdWrite -#define sdWrite sdWriteHalfDuplex - -static inline msg_t sdWriteTimeoutHalfDuplex(SerialDriver* driver, uint8_t* data, uint8_t size, uint32_t timeout) { -    msg_t ret = sdWriteTimeout(driver, data, size, timeout); - -    // Half duplex requires us to read back the data we just wrote - just throw it away -    uint8_t dump[size]; -    sdReadTimeout(driver, dump, size, timeout); - -    return ret; -} -#undef sdWriteTimeout -#define sdWriteTimeout sdWriteTimeoutHalfDuplex - -static inline void sdClear(SerialDriver* driver) { -    while (sdGetTimeout(driver, TIME_IMMEDIATE) != MSG_TIMEOUT) { -        // Do nothing with the data -    } -} - -static SerialConfig sdcfg = { -    (SERIAL_USART_SPEED),  // speed - mandatory -    (SERIAL_USART_CR1),    // CR1 -    (SERIAL_USART_CR2),    // CR2 -    (SERIAL_USART_CR3)     // CR3 -}; - -void handle_soft_serial_slave(void); - -/* - * This thread runs on the slave and responds to transactions initiated - * by the master - */ -static THD_WORKING_AREA(waSlaveThread, 2048); -static THD_FUNCTION(SlaveThread, arg) { -    (void)arg; -    chRegSetThreadName("slave_transport"); - -    while (true) { -        handle_soft_serial_slave(); -    } -} - -__attribute__((weak)) void usart_init(void) { -#if defined(USE_GPIOV1) -    palSetLineMode(SERIAL_USART_TX_PIN, PAL_MODE_STM32_ALTERNATE_OPENDRAIN); -#else -    palSetLineMode(SERIAL_USART_TX_PIN, PAL_MODE_ALTERNATE(SERIAL_USART_TX_PAL_MODE) | PAL_STM32_OTYPE_OPENDRAIN); -#endif - -#if defined(USART_REMAP) -    USART_REMAP; -#endif -} - -void usart_master_init(void) { -    usart_init(); - -    sdcfg.cr3 |= USART_CR3_HDSEL; -    sdStart(&SERIAL_USART_DRIVER, &sdcfg); -} - -void usart_slave_init(void) { -    usart_init(); - -    sdcfg.cr3 |= USART_CR3_HDSEL; -    sdStart(&SERIAL_USART_DRIVER, &sdcfg); - -    // Start transport thread -    chThdCreateStatic(waSlaveThread, sizeof(waSlaveThread), HIGHPRIO, SlaveThread, NULL); -} - -static SSTD_t* Transaction_table      = NULL; -static uint8_t Transaction_table_size = 0; - -void soft_serial_initiator_init(SSTD_t* sstd_table, int sstd_table_size) { -    Transaction_table      = sstd_table; -    Transaction_table_size = (uint8_t)sstd_table_size; - -    usart_master_init(); -} - -void soft_serial_target_init(SSTD_t* sstd_table, int sstd_table_size) { -    Transaction_table      = sstd_table; -    Transaction_table_size = (uint8_t)sstd_table_size; - -    usart_slave_init(); -} - -void handle_soft_serial_slave(void) { -    uint8_t sstd_index = sdGet(&SERIAL_USART_DRIVER);  // first chunk is always transaction id -    SSTD_t* trans      = &Transaction_table[sstd_index]; - -    // Always write back the sstd_index as part of a basic handshake -    sstd_index ^= HANDSHAKE_MAGIC; -    sdWrite(&SERIAL_USART_DRIVER, &sstd_index, sizeof(sstd_index)); - -    if (trans->initiator2target_buffer_size) { -        sdRead(&SERIAL_USART_DRIVER, trans->initiator2target_buffer, trans->initiator2target_buffer_size); -    } - -    if (trans->target2initiator_buffer_size) { -        sdWrite(&SERIAL_USART_DRIVER, trans->target2initiator_buffer, trans->target2initiator_buffer_size); -    } - -    if (trans->status) { -        *trans->status = TRANSACTION_ACCEPTED; -    } -} - -///////// -//  start transaction by initiator -// -// int  soft_serial_transaction(int sstd_index) -// -// Returns: -//    TRANSACTION_END -//    TRANSACTION_NO_RESPONSE -//    TRANSACTION_DATA_ERROR -#ifndef SERIAL_USE_MULTI_TRANSACTION -int soft_serial_transaction(void) { -    uint8_t sstd_index = 0; -#else -int soft_serial_transaction(int index) { -    uint8_t sstd_index = index; -#endif - -    if (sstd_index > Transaction_table_size) return TRANSACTION_TYPE_ERROR; -    SSTD_t* trans = &Transaction_table[sstd_index]; -    msg_t   res   = 0; - -    sdClear(&SERIAL_USART_DRIVER); - -    // First chunk is always transaction id -    sdWriteTimeout(&SERIAL_USART_DRIVER, &sstd_index, sizeof(sstd_index), TIME_MS2I(SERIAL_USART_TIMEOUT)); - -    uint8_t sstd_index_shake = 0xFF; - -    // Which we always read back first so that we can error out correctly -    //   - due to the half duplex limitations on return codes, we always have to read *something* -    //   - without the read, write only transactions *always* succeed, even during the boot process where the slave is not ready -    res = sdReadTimeout(&SERIAL_USART_DRIVER, &sstd_index_shake, sizeof(sstd_index_shake), TIME_MS2I(SERIAL_USART_TIMEOUT)); -    if (res < 0 || (sstd_index_shake != (sstd_index ^ HANDSHAKE_MAGIC))) { -        dprintf("serial::usart_shake NO_RESPONSE\n"); -        return TRANSACTION_NO_RESPONSE; -    } - -    if (trans->initiator2target_buffer_size) { -        res = sdWriteTimeout(&SERIAL_USART_DRIVER, trans->initiator2target_buffer, trans->initiator2target_buffer_size, TIME_MS2I(SERIAL_USART_TIMEOUT)); -        if (res < 0) { -            dprintf("serial::usart_transmit NO_RESPONSE\n"); -            return TRANSACTION_NO_RESPONSE; -        } -    } - -    if (trans->target2initiator_buffer_size) { -        res = sdReadTimeout(&SERIAL_USART_DRIVER, trans->target2initiator_buffer, trans->target2initiator_buffer_size, TIME_MS2I(SERIAL_USART_TIMEOUT)); -        if (res < 0) { -            dprintf("serial::usart_receive NO_RESPONSE\n"); -            return TRANSACTION_NO_RESPONSE; -        } -    } - -    return TRANSACTION_END; -} diff --git a/drivers/chibios/serial_usart.h b/drivers/chibios/serial_usart.h deleted file mode 100644 index fee7b4d159..0000000000 --- a/drivers/chibios/serial_usart.h +++ /dev/null @@ -1,90 +0,0 @@ -/* Copyright 2021 QMK - * - * 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 3 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/>. - */ - -#pragma once - -#include "quantum.h" -#include "serial.h" -#include "printf.h" - -#include <ch.h> -#include <hal.h> - -#ifndef USART_CR1_M0 -#    define USART_CR1_M0 USART_CR1_M  // some platforms (f1xx) dont have this so -#endif - -#ifndef SERIAL_USART_CR1 -#    define SERIAL_USART_CR1 (USART_CR1_PCE | USART_CR1_PS | USART_CR1_M0)  // parity enable, odd parity, 9 bit length -#endif - -#ifndef SERIAL_USART_CR2 -#    define SERIAL_USART_CR2 (USART_CR2_STOP_1)  // 2 stop bits -#endif - -#ifndef SERIAL_USART_CR3 -#    define SERIAL_USART_CR3 0 -#endif - -#if defined(USART1_REMAP) -#    define USART_REMAP                             \ -        do {                                        \ -            (AFIO->MAPR |= AFIO_MAPR_USART1_REMAP); \ -        } while (0) -#elif defined(USART2_REMAP) -#    define USART_REMAP                             \ -        do {                                        \ -            (AFIO->MAPR |= AFIO_MAPR_USART2_REMAP); \ -        } while (0) -#elif defined(USART3_PARTIALREMAP) -#    define USART_REMAP                                          \ -        do {                                                     \ -            (AFIO->MAPR |= AFIO_MAPR_USART3_REMAP_PARTIALREMAP); \ -        } while (0) -#elif defined(USART3_FULLREMAP) -#    define USART_REMAP                                       \ -        do {                                                  \ -            (AFIO->MAPR |= AFIO_MAPR_USART3_REMAP_FULLREMAP); \ -        } while (0) -#endif - -#ifndef SELECT_SOFT_SERIAL_SPEED -#    define SELECT_SOFT_SERIAL_SPEED 1 -#endif - -#ifdef SERIAL_USART_SPEED -// Allow advanced users to directly set SERIAL_USART_SPEED -#elif SELECT_SOFT_SERIAL_SPEED == 0 -#    define SERIAL_USART_SPEED 460800 -#elif SELECT_SOFT_SERIAL_SPEED == 1 -#    define SERIAL_USART_SPEED 230400 -#elif SELECT_SOFT_SERIAL_SPEED == 2 -#    define SERIAL_USART_SPEED 115200 -#elif SELECT_SOFT_SERIAL_SPEED == 3 -#    define SERIAL_USART_SPEED 57600 -#elif SELECT_SOFT_SERIAL_SPEED == 4 -#    define SERIAL_USART_SPEED 38400 -#elif SELECT_SOFT_SERIAL_SPEED == 5 -#    define SERIAL_USART_SPEED 19200 -#else -#    error invalid SELECT_SOFT_SERIAL_SPEED value -#endif - -#ifndef SERIAL_USART_TIMEOUT -#    define SERIAL_USART_TIMEOUT 100 -#endif - -#define HANDSHAKE_MAGIC 7 diff --git a/drivers/chibios/serial_usart_duplex.c b/drivers/chibios/serial_usart_duplex.c deleted file mode 100644 index cc9b889ac2..0000000000 --- a/drivers/chibios/serial_usart_duplex.c +++ /dev/null @@ -1,261 +0,0 @@ -/* Copyright 2021 QMK - * - * 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 3 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/>. - */ - -#include "serial_usart.h" - -#include <stdatomic.h> - -#if !defined(USE_GPIOV1) -// The default PAL alternate modes are used to signal that the pins are used for USART -#    if !defined(SERIAL_USART_TX_PAL_MODE) -#        define SERIAL_USART_TX_PAL_MODE 7 -#    endif -#    if !defined(SERIAL_USART_RX_PAL_MODE) -#        define SERIAL_USART_RX_PAL_MODE 7 -#    endif -#endif - -#if !defined(SERIAL_USART_DRIVER) -#    define SERIAL_USART_DRIVER UARTD1 -#endif - -#if !defined(SERIAL_USART_TX_PIN) -#    define SERIAL_USART_TX_PIN A9 -#endif - -#if !defined(SERIAL_USART_RX_PIN) -#    define SERIAL_USART_RX_PIN A10 -#endif - -#define SIGNAL_HANDSHAKE_RECEIVED 0x1 - -void        handle_transactions_slave(uint8_t sstd_index); -static void receive_transaction_handshake(UARTDriver* uartp, uint16_t received_handshake); - -/* - * UART driver configuration structure. We use the blocking DMA enabled API and - * the rxchar callback to receive handshake tokens but only on the slave halve. - */ -// clang-format off -static UARTConfig uart_config = { -    .txend1_cb = NULL, -    .txend2_cb = NULL, -    .rxend_cb = NULL, -    .rxchar_cb = NULL, -    .rxerr_cb = NULL, -    .timeout_cb = NULL, -    .speed = (SERIAL_USART_SPEED), -    .cr1 = (SERIAL_USART_CR1), -    .cr2 = (SERIAL_USART_CR2), -    .cr3 = (SERIAL_USART_CR3) -}; -// clang-format on - -static SSTD_t*              Transaction_table      = NULL; -static uint8_t              Transaction_table_size = 0; -static atomic_uint_least8_t handshake              = 0xFF; -static thread_reference_t   tp_target              = NULL; - -/* - * This callback is invoked when a character is received but the application - * was not ready to receive it, the character is passed as parameter. - * Receive transaction table index from initiator, which doubles as basic handshake token. */ -static void receive_transaction_handshake(UARTDriver* uartp, uint16_t received_handshake) { -    /* Check if received handshake is not a valid transaction id. -     * Please note that we can still catch a seemingly valid handshake -     * i.e. a byte from a ongoing transfer which is in the allowed range. -     * So this check mainly prevents any obviously wrong handshakes and -     * subsequent wakeups of the receiving thread, which is a costly operation. */ -    if (received_handshake > Transaction_table_size) { -        return; -    } - -    handshake = (uint8_t)received_handshake; -    chSysLockFromISR(); -    /* Wakeup receiving thread to start a transaction. */ -    chEvtSignalI(tp_target, (eventmask_t)SIGNAL_HANDSHAKE_RECEIVED); -    chSysUnlockFromISR(); -} - -__attribute__((weak)) void usart_init(void) { -#if defined(USE_GPIOV1) -    palSetLineMode(SERIAL_USART_TX_PIN, PAL_MODE_STM32_ALTERNATE_PUSHPULL); -    palSetLineMode(SERIAL_USART_RX_PIN, PAL_MODE_INPUT); -#else -    palSetLineMode(SERIAL_USART_TX_PIN, PAL_MODE_ALTERNATE(SERIAL_USART_TX_PAL_MODE) | PAL_STM32_OTYPE_PUSHPULL | PAL_STM32_OSPEED_HIGHEST); -    palSetLineMode(SERIAL_USART_RX_PIN, PAL_MODE_ALTERNATE(SERIAL_USART_RX_PAL_MODE) | PAL_STM32_OTYPE_PUSHPULL | PAL_STM32_OSPEED_HIGHEST); -#endif -} - -/* - * This thread runs on the slave half and reacts to transactions initiated from the master. - */ -static THD_WORKING_AREA(waSlaveThread, 1024); -static THD_FUNCTION(SlaveThread, arg) { -    (void)arg; -    chRegSetThreadName("slave_usart_tx_rx"); - -    while (true) { -        /* We sleep as long as there is no handshake waiting for us. */ -        chEvtWaitAny((eventmask_t)SIGNAL_HANDSHAKE_RECEIVED); -        handle_transactions_slave(handshake); -    } -} - -void soft_serial_target_init(SSTD_t* const sstd_table, int sstd_table_size) { -    Transaction_table      = sstd_table; -    Transaction_table_size = (uint8_t)sstd_table_size; -    usart_init(); - -#if defined(USART_REMAP) -    USART_REMAP; -#endif - -    tp_target = chThdCreateStatic(waSlaveThread, sizeof(waSlaveThread), HIGHPRIO, SlaveThread, NULL); - -    // Start receiving handshake tokens on slave halve -    uart_config.rxchar_cb = receive_transaction_handshake; -    uartStart(&SERIAL_USART_DRIVER, &uart_config); -} - -/** - * @brief React to transactions started by the master. - * This version uses duplex send and receive usart pheriphals and DMA backed transfers. - */ -void inline handle_transactions_slave(uint8_t sstd_index) { -    size_t  buffer_size = 0; -    msg_t   msg         = 0; -    SSTD_t* trans       = &Transaction_table[sstd_index]; - -    /* Send back the handshake which is XORed as a simple checksum, -     to signal that the slave is ready to receive possible transaction buffers  */ -    sstd_index ^= HANDSHAKE_MAGIC; -    buffer_size = (size_t)sizeof(sstd_index); -    msg         = uartSendTimeout(&SERIAL_USART_DRIVER, &buffer_size, &sstd_index, TIME_MS2I(SERIAL_USART_TIMEOUT)); - -    if (msg != MSG_OK) { -        if (trans->status) { -            *trans->status = TRANSACTION_NO_RESPONSE; -        } -        return; -    } - -    /* Receive transaction buffer from the master. If this transaction requires it.*/ -    buffer_size = (size_t)trans->initiator2target_buffer_size; -    if (buffer_size) { -        msg = uartReceiveTimeout(&SERIAL_USART_DRIVER, &buffer_size, trans->initiator2target_buffer, TIME_MS2I(SERIAL_USART_TIMEOUT)); -        if (msg != MSG_OK) { -            if (trans->status) { -                *trans->status = TRANSACTION_NO_RESPONSE; -            } -            return; -        } -    } - -    /* Send transaction buffer to the master. If this transaction requires it. */ -    buffer_size = (size_t)trans->target2initiator_buffer_size; -    if (buffer_size) { -        msg = uartSendFullTimeout(&SERIAL_USART_DRIVER, &buffer_size, trans->target2initiator_buffer, TIME_MS2I(SERIAL_USART_TIMEOUT)); -        if (msg != MSG_OK) { -            if (trans->status) { -                *trans->status = TRANSACTION_NO_RESPONSE; -            } -            return; -        } -    } - -    if (trans->status) { -        *trans->status = TRANSACTION_ACCEPTED; -    } -} - -void soft_serial_initiator_init(SSTD_t* const sstd_table, int sstd_table_size) { -    Transaction_table      = sstd_table; -    Transaction_table_size = (uint8_t)sstd_table_size; -    usart_init(); - -#if defined(SERIAL_USART_PIN_SWAP) -    uart_config.cr2 |= USART_CR2_SWAP;  // master has swapped TX/RX pins -#endif - -#if defined(USART_REMAP) -    USART_REMAP; -#endif - -    uartStart(&SERIAL_USART_DRIVER, &uart_config); -} - -/** - * @brief Start transaction from the master to the slave. - * This version uses duplex send and receive usart pheriphals and DMA backed transfers. - * - * @param index Transaction Table index of the transaction to start. - * @return int TRANSACTION_NO_RESPONSE in case of Timeout. - *             TRANSACTION_TYPE_ERROR in case of invalid transaction index. - *             TRANSACTION_END in case of success. - */ -#if !defined(SERIAL_USE_MULTI_TRANSACTION) -int soft_serial_transaction(void) { -    uint8_t sstd_index = 0; -#else -int soft_serial_transaction(int index) { -    uint8_t sstd_index = index; -#endif - -    if (sstd_index > Transaction_table_size) { -        return TRANSACTION_TYPE_ERROR; -    } - -    SSTD_t* const trans       = &Transaction_table[sstd_index]; -    msg_t         msg         = 0; -    size_t        buffer_size = (size_t)sizeof(sstd_index); - -    /* Send transaction table index to the slave, which doubles as basic handshake token. */ -    uartSendFullTimeout(&SERIAL_USART_DRIVER, &buffer_size, &sstd_index, TIME_MS2I(SERIAL_USART_TIMEOUT)); - -    uint8_t sstd_index_shake = 0xFF; -    buffer_size              = (size_t)sizeof(sstd_index_shake); - -    /* Receive the handshake token from the slave. The token was XORed by the slave as a simple checksum. -     If the tokens match, the master will start to send and receive possible transaction buffers. */ -    msg = uartReceiveTimeout(&SERIAL_USART_DRIVER, &buffer_size, &sstd_index_shake, TIME_MS2I(SERIAL_USART_TIMEOUT)); -    if (msg != MSG_OK || (sstd_index_shake != (sstd_index ^ HANDSHAKE_MAGIC))) { -        dprintln("USART: Handshake Failed"); -        return TRANSACTION_NO_RESPONSE; -    } - -    /* Send transaction buffer to the slave. If this transaction requires it. */ -    buffer_size = (size_t)trans->initiator2target_buffer_size; -    if (buffer_size) { -        msg = uartSendFullTimeout(&SERIAL_USART_DRIVER, &buffer_size, trans->initiator2target_buffer, TIME_MS2I(SERIAL_USART_TIMEOUT)); -        if (msg != MSG_OK) { -            dprintln("USART: Send Failed"); -            return TRANSACTION_NO_RESPONSE; -        } -    } - -    /* Receive transaction buffer from the slave. If this transaction requires it. */ -    buffer_size = (size_t)trans->target2initiator_buffer_size; -    if (buffer_size) { -        msg = uartReceiveTimeout(&SERIAL_USART_DRIVER, &buffer_size, trans->target2initiator_buffer, TIME_MS2I(SERIAL_USART_TIMEOUT)); -        if (msg != MSG_OK) { -            dprintln("USART: Receive Failed"); -            return TRANSACTION_NO_RESPONSE; -        } -    } - -    return TRANSACTION_END; -} diff --git a/drivers/chibios/spi_master.c b/drivers/chibios/spi_master.c deleted file mode 100644 index 4852a6eba4..0000000000 --- a/drivers/chibios/spi_master.c +++ /dev/null @@ -1,148 +0,0 @@ -/* Copyright 2020 Nick Brassel (tzarc) - * - *  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 3 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 <https://www.gnu.org/licenses/>. - */ - -#include "spi_master.h" - -#include "timer.h" - -static pin_t     currentSlavePin = NO_PIN; -static SPIConfig spiConfig       = {false, NULL, 0, 0, 0, 0}; - -__attribute__((weak)) void spi_init(void) { -    static bool is_initialised = false; -    if (!is_initialised) { -        is_initialised = true; - -        // Try releasing special pins for a short time -        palSetPadMode(PAL_PORT(SPI_SCK_PIN), PAL_PAD(SPI_SCK_PIN), PAL_MODE_INPUT); -        palSetPadMode(PAL_PORT(SPI_MOSI_PIN), PAL_PAD(SPI_MOSI_PIN), PAL_MODE_INPUT); -        palSetPadMode(PAL_PORT(SPI_MISO_PIN), PAL_PAD(SPI_MISO_PIN), PAL_MODE_INPUT); - -        chThdSleepMilliseconds(10); -#if defined(USE_GPIOV1) -        palSetPadMode(PAL_PORT(SPI_SCK_PIN), PAL_PAD(SPI_SCK_PIN), PAL_MODE_STM32_ALTERNATE_PUSHPULL); -        palSetPadMode(PAL_PORT(SPI_MOSI_PIN), PAL_PAD(SPI_MOSI_PIN), PAL_MODE_STM32_ALTERNATE_PUSHPULL); -        palSetPadMode(PAL_PORT(SPI_MISO_PIN), PAL_PAD(SPI_MISO_PIN), PAL_MODE_STM32_ALTERNATE_PUSHPULL); -#else -        palSetPadMode(PAL_PORT(SPI_SCK_PIN), PAL_PAD(SPI_SCK_PIN), PAL_MODE_ALTERNATE(SPI_SCK_PAL_MODE) | PAL_STM32_OTYPE_PUSHPULL | PAL_STM32_OSPEED_HIGHEST); -        palSetPadMode(PAL_PORT(SPI_MOSI_PIN), PAL_PAD(SPI_MOSI_PIN), PAL_MODE_ALTERNATE(SPI_MOSI_PAL_MODE) | PAL_STM32_OTYPE_PUSHPULL | PAL_STM32_OSPEED_HIGHEST); -        palSetPadMode(PAL_PORT(SPI_MISO_PIN), PAL_PAD(SPI_MISO_PIN), PAL_MODE_ALTERNATE(SPI_MISO_PAL_MODE) | PAL_STM32_OTYPE_PUSHPULL | PAL_STM32_OSPEED_HIGHEST); -#endif -    } -} - -bool spi_start(pin_t slavePin, bool lsbFirst, uint8_t mode, uint16_t divisor) { -    if (currentSlavePin != NO_PIN || slavePin == NO_PIN) { -        return false; -    } - -    uint16_t roundedDivisor = 2; -    while (roundedDivisor < divisor) { -        roundedDivisor <<= 1; -    } - -    if (roundedDivisor < 2 || roundedDivisor > 256) { -        return false; -    } - -    spiConfig.cr1 = 0; - -    if (lsbFirst) { -        spiConfig.cr1 |= SPI_CR1_LSBFIRST; -    } - -    switch (mode) { -        case 0: -            break; -        case 1: -            spiConfig.cr1 |= SPI_CR1_CPHA; -            break; -        case 2: -            spiConfig.cr1 |= SPI_CR1_CPOL; -            break; -        case 3: -            spiConfig.cr1 |= SPI_CR1_CPHA | SPI_CR1_CPOL; -            break; -    } - -    switch (roundedDivisor) { -        case 2: -            break; -        case 4: -            spiConfig.cr1 |= SPI_CR1_BR_0; -            break; -        case 8: -            spiConfig.cr1 |= SPI_CR1_BR_1; -            break; -        case 16: -            spiConfig.cr1 |= SPI_CR1_BR_1 | SPI_CR1_BR_0; -            break; -        case 32: -            spiConfig.cr1 |= SPI_CR1_BR_2; -            break; -        case 64: -            spiConfig.cr1 |= SPI_CR1_BR_2 | SPI_CR1_BR_0; -            break; -        case 128: -            spiConfig.cr1 |= SPI_CR1_BR_2 | SPI_CR1_BR_1; -            break; -        case 256: -            spiConfig.cr1 |= SPI_CR1_BR_2 | SPI_CR1_BR_1 | SPI_CR1_BR_0; -            break; -    } - -    currentSlavePin  = slavePin; -    spiConfig.ssport = PAL_PORT(slavePin); -    spiConfig.sspad  = PAL_PAD(slavePin); - -    setPinOutput(slavePin); -    spiStart(&SPI_DRIVER, &spiConfig); -    spiSelect(&SPI_DRIVER); - -    return true; -} - -spi_status_t spi_write(uint8_t data) { -    uint8_t rxData; -    spiExchange(&SPI_DRIVER, 1, &data, &rxData); - -    return rxData; -} - -spi_status_t spi_read(void) { -    uint8_t data = 0; -    spiReceive(&SPI_DRIVER, 1, &data); - -    return data; -} - -spi_status_t spi_transmit(const uint8_t *data, uint16_t length) { -    spiSend(&SPI_DRIVER, length, data); -    return SPI_STATUS_SUCCESS; -} - -spi_status_t spi_receive(uint8_t *data, uint16_t length) { -    spiReceive(&SPI_DRIVER, length, data); -    return SPI_STATUS_SUCCESS; -} - -void spi_stop(void) { -    if (currentSlavePin != NO_PIN) { -        spiUnselect(&SPI_DRIVER); -        spiStop(&SPI_DRIVER); -        currentSlavePin = NO_PIN; -    } -} diff --git a/drivers/chibios/spi_master.h b/drivers/chibios/spi_master.h deleted file mode 100644 index e93580e319..0000000000 --- a/drivers/chibios/spi_master.h +++ /dev/null @@ -1,80 +0,0 @@ -/* Copyright 2020 Nick Brassel (tzarc) - * - *  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 3 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 <https://www.gnu.org/licenses/>. - */ - -#pragma once - -#include <ch.h> -#include <hal.h> -#include <stdbool.h> - -#include "gpio.h" - -#ifndef SPI_DRIVER -#    define SPI_DRIVER SPID2 -#endif - -#ifndef SPI_SCK_PIN -#    define SPI_SCK_PIN B13 -#endif - -#ifndef SPI_SCK_PAL_MODE -#    define SPI_SCK_PAL_MODE 5 -#endif - -#ifndef SPI_MOSI_PIN -#    define SPI_MOSI_PIN B15 -#endif - -#ifndef SPI_MOSI_PAL_MODE -#    define SPI_MOSI_PAL_MODE 5 -#endif - -#ifndef SPI_MISO_PIN -#    define SPI_MISO_PIN B14 -#endif - -#ifndef SPI_MISO_PAL_MODE -#    define SPI_MISO_PAL_MODE 5 -#endif - -typedef int16_t spi_status_t; - -#define SPI_STATUS_SUCCESS (0) -#define SPI_STATUS_ERROR (-1) -#define SPI_STATUS_TIMEOUT (-2) - -#define SPI_TIMEOUT_IMMEDIATE (0) -#define SPI_TIMEOUT_INFINITE (0xFFFF) - -#ifdef __cplusplus -extern "C" { -#endif -void spi_init(void); - -bool spi_start(pin_t slavePin, bool lsbFirst, uint8_t mode, uint16_t divisor); - -spi_status_t spi_write(uint8_t data); - -spi_status_t spi_read(void); - -spi_status_t spi_transmit(const uint8_t *data, uint16_t length); - -spi_status_t spi_receive(uint8_t *data, uint16_t length); - -void spi_stop(void); -#ifdef __cplusplus -} -#endif diff --git a/drivers/chibios/uart.c b/drivers/chibios/uart.c deleted file mode 100644 index 030335b342..0000000000 --- a/drivers/chibios/uart.c +++ /dev/null @@ -1,50 +0,0 @@ -/* Copyright 2021 - * - *  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 3 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 <https://www.gnu.org/licenses/>. - */ - -#include "uart.h" - -#include "quantum.h" - -static SerialConfig serialConfig = {SERIAL_DEFAULT_BITRATE, SD1_CR1, SD1_CR2, SD1_CR3}; - -void uart_init(uint32_t baud) { -    static bool is_initialised = false; - -    if (!is_initialised) { -        is_initialised = true; - -        serialConfig.speed = baud; - -#if defined(USE_GPIOV1) -        palSetLineMode(SD1_TX_PIN, PAL_MODE_STM32_ALTERNATE_OPENDRAIN); -        palSetLineMode(SD1_RX_PIN, PAL_MODE_STM32_ALTERNATE_OPENDRAIN); -#else -        palSetLineMode(SD1_TX_PIN, PAL_MODE_ALTERNATE(SD1_TX_PAL_MODE) | PAL_STM32_OTYPE_OPENDRAIN); -        palSetLineMode(SD1_RX_PIN, PAL_MODE_ALTERNATE(SD1_RX_PAL_MODE) | PAL_STM32_OTYPE_OPENDRAIN); -#endif -        sdStart(&SERIAL_DRIVER, &serialConfig); -    } -} - -void uart_putchar(uint8_t c) { sdPut(&SERIAL_DRIVER, c); } - -uint8_t uart_getchar(void) { -    msg_t res = sdGet(&SERIAL_DRIVER); - -    return (uint8_t)res; -} - -bool uart_available(void) { return !sdGetWouldBlock(&SERIAL_DRIVER); } diff --git a/drivers/chibios/uart.h b/drivers/chibios/uart.h deleted file mode 100644 index b4e20e9fd3..0000000000 --- a/drivers/chibios/uart.h +++ /dev/null @@ -1,77 +0,0 @@ -/* Copyright 2021 - * - *  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 3 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 <https://www.gnu.org/licenses/>. - */ - -#pragma once - -#include <stdint.h> - -#include <hal.h> - -#ifndef SERIAL_DRIVER -#    define SERIAL_DRIVER SD1 -#endif - -#ifndef SD1_TX_PIN -#    define SD1_TX_PIN A9 -#endif - -#ifndef SD1_TX_PAL_MODE -#    define SD1_TX_PAL_MODE 7 -#endif - -#ifndef SD1_RX_PIN -#    define SD1_RX_PIN A10 -#endif - -#ifndef SD1_RX_PAL_MODE -#    define SD1_RX_PAL_MODE 7 -#endif - -#ifndef SD1_CTS_PIN -#    define SD1_CTS_PIN A11 -#endif - -#ifndef SD1_CTS_PAL_MODE -#    define SD1_CTS_PAL_MODE 7 -#endif - -#ifndef SD1_RTS_PIN -#    define SD1_RTS_PIN A12 -#endif - -#ifndef SD1_RTS_PAL_MODE -#    define SD1_RTS_PAL_MODE 7 -#endif - -#ifndef SD1_CR1 -#    define SD1_CR1 0 -#endif - -#ifndef SD1_CR2 -#    define SD1_CR2 0 -#endif - -#ifndef SD1_CR3 -#    define SD1_CR3 0 -#endif - -void uart_init(uint32_t baud); - -void uart_putchar(uint8_t c); - -uint8_t uart_getchar(void); - -bool uart_available(void); diff --git a/drivers/chibios/usbpd_stm32g4.c b/drivers/chibios/usbpd_stm32g4.c deleted file mode 100644 index f16ca8aeae..0000000000 --- a/drivers/chibios/usbpd_stm32g4.c +++ /dev/null @@ -1,76 +0,0 @@ -/* Copyright 2021 Nick Brassel (@tzarc) - * - * 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/>. - */ - -#include <quantum.h> - -#ifndef USBPD_UCPD1_CFG1 -#    define USBPD_UCPD1_CFG1 (UCPD_CFG1_PSC_UCPDCLK_0 | UCPD_CFG1_TRANSWIN_3 | UCPD_CFG1_IFRGAP_4 | UCPD_CFG1_HBITCLKDIV_4) -#endif  // USBPD_UCPD1_CFG1 - -// Initialises the USBPD subsystem -__attribute__((weak)) void usbpd_init(void) { -    // Disable dead-battery signals -    PWR->CR3 |= PWR_CR3_UCPD_DBDIS; -    // Enable the clock for the UCPD1 peripheral -    RCC->APB1ENR2 |= RCC_APB1ENR2_UCPD1EN; - -    // Copy the existing value -    uint32_t CFG1 = UCPD1->CFG1; -    // Force-disable UCPD1 before configuring -    CFG1 &= ~UCPD_CFG1_UCPDEN; -    // Configure UCPD1 -    CFG1 = USBPD_UCPD1_CFG1; -    // Apply the changes -    UCPD1->CFG1 = CFG1; -    // Enable UCPD1 -    UCPD1->CFG1 |= UCPD_CFG1_UCPDEN; - -    // Copy the existing value -    uint32_t CR = UCPD1->CR; -    // Clear out ANASUBMODE (irrelevant as a sink device) -    CR &= ~UCPD_CR_ANASUBMODE_Msk; -    // Advertise our capabilities as a sink, with both CC lines enabled -    CR |= UCPD_CR_ANAMODE | UCPD_CR_CCENABLE_Msk; -    // Apply the changes -    UCPD1->CR = CR; -} - -// Gets the current state of the USBPD allowance -__attribute__((weak)) usbpd_allowance_t usbpd_get_allowance(void) { -    uint32_t CR = UCPD1->CR; - -    int ucpd_enabled = (UCPD1->CFG1 & UCPD_CFG1_UCPDEN_Msk) >> UCPD_CFG1_UCPDEN_Pos; -    int anamode      = (CR & UCPD_CR_ANAMODE_Msk) >> UCPD_CR_ANAMODE_Pos; -    int cc_enabled   = (CR & UCPD_CR_CCENABLE_Msk) >> UCPD_CR_CCENABLE_Pos; - -    if (ucpd_enabled && anamode && cc_enabled) { -        uint32_t SR         = UCPD1->SR; -        int      vstate_cc1 = (SR & UCPD_SR_TYPEC_VSTATE_CC1_Msk) >> UCPD_SR_TYPEC_VSTATE_CC1_Pos; -        int      vstate_cc2 = (SR & UCPD_SR_TYPEC_VSTATE_CC2_Msk) >> UCPD_SR_TYPEC_VSTATE_CC2_Pos; -        int      vstate_max = vstate_cc1 > vstate_cc2 ? vstate_cc1 : vstate_cc2; -        switch (vstate_max) { -            case 0: -            case 1: -                return USBPD_500MA;  // Note that this is 500mA (i.e. max USB 2.0), not 900mA, as we're not using USB 3.1 as a sink device. -            case 2: -                return USBPD_1500MA; -            case 3: -                return USBPD_3000MA; -        } -    } - -    return USBPD_500MA; -}
\ No newline at end of file diff --git a/drivers/chibios/ws2812.c b/drivers/chibios/ws2812.c deleted file mode 100644 index 0d12e2fb79..0000000000 --- a/drivers/chibios/ws2812.c +++ /dev/null @@ -1,114 +0,0 @@ -#include "quantum.h" -#include "ws2812.h" -#include <ch.h> -#include <hal.h> - -/* Adapted from https://github.com/bigjosh/SimpleNeoPixelDemo/ */ - -#ifndef NOP_FUDGE -#    if defined(STM32F0XX) || defined(STM32F1XX) || defined(STM32F3XX) || defined(STM32F4XX) || defined(STM32L0XX) -#        define NOP_FUDGE 0.4 -#    else -#        error("NOP_FUDGE configuration required") -#        define NOP_FUDGE 1  // this just pleases the compile so the above error is easier to spot -#    endif -#endif - -// Push Pull or Open Drain Configuration -// Default Push Pull -#ifndef WS2812_EXTERNAL_PULLUP -#    define WS2812_OUTPUT_MODE PAL_MODE_OUTPUT_PUSHPULL -#else -#    define WS2812_OUTPUT_MODE PAL_MODE_OUTPUT_OPENDRAIN -#endif - -#define NUMBER_NOPS 6 -#define CYCLES_PER_SEC (STM32_SYSCLK / NUMBER_NOPS * NOP_FUDGE) -#define NS_PER_SEC (1000000000L)  // Note that this has to be SIGNED since we want to be able to check for negative values of derivatives -#define NS_PER_CYCLE (NS_PER_SEC / CYCLES_PER_SEC) -#define NS_TO_CYCLES(n) ((n) / NS_PER_CYCLE) - -#define wait_ns(x)                                  \ -    do {                                            \ -        for (int i = 0; i < NS_TO_CYCLES(x); i++) { \ -            __asm__ volatile("nop\n\t"              \ -                             "nop\n\t"              \ -                             "nop\n\t"              \ -                             "nop\n\t"              \ -                             "nop\n\t"              \ -                             "nop\n\t");            \ -        }                                           \ -    } while (0) - -// These are the timing constraints taken mostly from the WS2812 datasheets -// These are chosen to be conservative and avoid problems rather than for maximum throughput - -#define T1H 900           // Width of a 1 bit in ns -#define T1L (1250 - T1H)  // Width of a 1 bit in ns - -#define T0H 350           // Width of a 0 bit in ns -#define T0L (1250 - T0H)  // Width of a 0 bit in ns - -// The reset gap can be 6000 ns, but depending on the LED strip it may have to be increased -// to values like 600000 ns. If it is too small, the pixels will show nothing most of the time. -#define RES (1000 * WS2812_TRST_US)  // Width of the low gap between bits to cause a frame to latch - -void sendByte(uint8_t byte) { -    // WS2812 protocol wants most significant bits first -    for (unsigned char bit = 0; bit < 8; bit++) { -        bool is_one = byte & (1 << (7 - bit)); -        // using something like wait_ns(is_one ? T1L : T0L) here throws off timings -        if (is_one) { -            // 1 -            writePinHigh(RGB_DI_PIN); -            wait_ns(T1H); -            writePinLow(RGB_DI_PIN); -            wait_ns(T1L); -        } else { -            // 0 -            writePinHigh(RGB_DI_PIN); -            wait_ns(T0H); -            writePinLow(RGB_DI_PIN); -            wait_ns(T0L); -        } -    } -} - -void ws2812_init(void) { palSetLineMode(RGB_DI_PIN, WS2812_OUTPUT_MODE); } - -// Setleds for standard RGB -void ws2812_setleds(LED_TYPE *ledarray, uint16_t leds) { -    static bool s_init = false; -    if (!s_init) { -        ws2812_init(); -        s_init = true; -    } - -    // this code is very time dependent, so we need to disable interrupts -    chSysLock(); - -    for (uint8_t i = 0; i < leds; i++) { -        // WS2812 protocol dictates grb order -#if (WS2812_BYTE_ORDER == WS2812_BYTE_ORDER_GRB) -        sendByte(ledarray[i].g); -        sendByte(ledarray[i].r); -        sendByte(ledarray[i].b); -#elif (WS2812_BYTE_ORDER == WS2812_BYTE_ORDER_RGB) -        sendByte(ledarray[i].r); -        sendByte(ledarray[i].g); -        sendByte(ledarray[i].b); -#elif (WS2812_BYTE_ORDER == WS2812_BYTE_ORDER_BGR) -        sendByte(ledarray[i].b); -        sendByte(ledarray[i].g); -        sendByte(ledarray[i].r); -#endif - -#ifdef RGBW -        sendByte(ledarray[i].w); -#endif -    } - -    wait_ns(RES); - -    chSysUnlock(); -} diff --git a/drivers/chibios/ws2812_pwm.c b/drivers/chibios/ws2812_pwm.c deleted file mode 100644 index e6af55b6b3..0000000000 --- a/drivers/chibios/ws2812_pwm.c +++ /dev/null @@ -1,311 +0,0 @@ -#include "ws2812.h" -#include "quantum.h" -#include <hal.h> - -/* Adapted from https://github.com/joewa/WS2812-LED-Driver_ChibiOS/ */ - -#ifdef RGBW -#    error "RGBW not supported" -#endif - -#ifndef WS2812_PWM_DRIVER -#    define WS2812_PWM_DRIVER PWMD2  // TIMx -#endif -#ifndef WS2812_PWM_CHANNEL -#    define WS2812_PWM_CHANNEL 2  // Channel -#endif -#ifndef WS2812_PWM_PAL_MODE -#    define WS2812_PWM_PAL_MODE 2  // DI Pin's alternate function value -#endif -#ifndef WS2812_DMA_STREAM -#    define WS2812_DMA_STREAM STM32_DMA1_STREAM2  // DMA Stream for TIMx_UP -#endif -#ifndef WS2812_DMA_CHANNEL -#    define WS2812_DMA_CHANNEL 2  // DMA Channel for TIMx_UP -#endif -#if (STM32_DMA_SUPPORTS_DMAMUX == TRUE) && !defined(WS2812_DMAMUX_ID) -#    error "please consult your MCU's datasheet and specify in your config.h: #define WS2812_DMAMUX_ID STM32_DMAMUX1_TIM?_UP" -#endif - -#ifndef WS2812_PWM_COMPLEMENTARY_OUTPUT -#    define WS2812_PWM_OUTPUT_MODE PWM_OUTPUT_ACTIVE_HIGH -#else -#    if !STM32_PWM_USE_ADVANCED -#        error "WS2812_PWM_COMPLEMENTARY_OUTPUT requires STM32_PWM_USE_ADVANCED == TRUE" -#    endif -#    define WS2812_PWM_OUTPUT_MODE PWM_COMPLEMENTARY_OUTPUT_ACTIVE_HIGH -#endif - -// Push Pull or Open Drain Configuration -// Default Push Pull -#ifndef WS2812_EXTERNAL_PULLUP -#    if defined(USE_GPIOV1) -#        define WS2812_OUTPUT_MODE PAL_MODE_STM32_ALTERNATE_PUSHPULL -#    else -#        define WS2812_OUTPUT_MODE PAL_MODE_ALTERNATE(WS2812_PWM_PAL_MODE) | PAL_STM32_OTYPE_PUSHPULL | PAL_STM32_OSPEED_HIGHEST | PAL_STM32_PUPDR_FLOATING -#    endif -#else -#    if defined(USE_GPIOV1) -#        define WS2812_OUTPUT_MODE PAL_MODE_STM32_ALTERNATE_OPENDRAIN -#    else -#        define WS2812_OUTPUT_MODE PAL_MODE_ALTERNATE(WS2812_PWM_PAL_MODE) | PAL_STM32_OTYPE_OPENDRAIN | PAL_STM32_OSPEED_HIGHEST | PAL_STM32_PUPDR_FLOATING -#    endif -#endif - -#ifndef WS2812_PWM_TARGET_PERIOD -//#    define WS2812_PWM_TARGET_PERIOD 800000 // Original code is 800k...? -#    define WS2812_PWM_TARGET_PERIOD 80000  // TODO: work out why 10x less on f303/f4x1 -#endif - -/* --- PRIVATE CONSTANTS ---------------------------------------------------- */ - -#define WS2812_PWM_FREQUENCY (STM32_SYSCLK / 2)                             /**< Clock frequency of PWM, must be valid with respect to system clock! */ -#define WS2812_PWM_PERIOD (WS2812_PWM_FREQUENCY / WS2812_PWM_TARGET_PERIOD) /**< Clock period in ticks. 1 / 800kHz = 1.25 uS (as per datasheet) */ - -/** - * @brief   Number of bit-periods to hold the data line low at the end of a frame - * - * The reset period for each frame is defined in WS2812_TRST_US. - * Calculate the number of zeroes to add at the end assuming 1.25 uS/bit: - */ -#define WS2812_RESET_BIT_N (1000 * WS2812_TRST_US / 1250) -#define WS2812_COLOR_BIT_N (RGBLED_NUM * 24)                   /**< Number of data bits */ -#define WS2812_BIT_N (WS2812_COLOR_BIT_N + WS2812_RESET_BIT_N) /**< Total number of bits in a frame */ - -/** - * @brief   High period for a zero, in ticks - * - * Per the datasheet: - * WS2812: - * - T0H: 200 nS to 500 nS, inclusive - * - T0L: 650 nS to 950 nS, inclusive - * WS2812B: - * - T0H: 200 nS to 500 nS, inclusive - * - T0L: 750 nS to 1050 nS, inclusive - * - * The duty cycle is calculated for a high period of 350 nS. - */ -#define WS2812_DUTYCYCLE_0 (WS2812_PWM_FREQUENCY / (1000000000 / 350)) - -/** - * @brief   High period for a one, in ticks - * - * Per the datasheet: - * WS2812: - * - T1H: 550 nS to 850 nS, inclusive - * - T1L: 450 nS to 750 nS, inclusive - * WS2812B: - * - T1H: 750 nS to 1050 nS, inclusive - * - T1L: 200 nS to 500 nS, inclusive - * - * The duty cycle is calculated for a high period of 800 nS. - * This is in the middle of the specifications of the WS2812 and WS2812B. - */ -#define WS2812_DUTYCYCLE_1 (WS2812_PWM_FREQUENCY / (1000000000 / 800)) - -/* --- PRIVATE MACROS ------------------------------------------------------- */ - -/** - * @brief   Determine the index in @ref ws2812_frame_buffer "the frame buffer" of a given bit - * - * @param[in] led:                  The led index [0, @ref RGBLED_NUM) - * @param[in] byte:                 The byte number [0, 2] - * @param[in] bit:                  The bit number [0, 7] - * - * @return                          The bit index - */ -#define WS2812_BIT(led, byte, bit) (24 * (led) + 8 * (byte) + (7 - (bit))) - -#if (WS2812_BYTE_ORDER == WS2812_BYTE_ORDER_GRB) -/** - * @brief   Determine the index in @ref ws2812_frame_buffer "the frame buffer" of a given red bit - * - * @note    The red byte is the middle byte in the color packet - * - * @param[in] led:                  The led index [0, @ref RGBLED_NUM) - * @param[in] bit:                  The bit number [0, 7] - * - * @return                          The bit index - */ -#    define WS2812_RED_BIT(led, bit) WS2812_BIT((led), 1, (bit)) - -/** - * @brief   Determine the index in @ref ws2812_frame_buffer "the frame buffer" of a given green bit - * - * @note    The red byte is the first byte in the color packet - * - * @param[in] led:                  The led index [0, @ref RGBLED_NUM) - * @param[in] bit:                  The bit number [0, 7] - * - * @return                          The bit index - */ -#    define WS2812_GREEN_BIT(led, bit) WS2812_BIT((led), 0, (bit)) - -/** - * @brief   Determine the index in @ref ws2812_frame_buffer "the frame buffer" of a given blue bit - * - * @note    The red byte is the last byte in the color packet - * - * @param[in] led:                  The led index [0, @ref RGBLED_NUM) - * @param[in] bit:                  The bit index [0, 7] - * - * @return                          The bit index - */ -#    define WS2812_BLUE_BIT(led, bit) WS2812_BIT((led), 2, (bit)) - -#elif (WS2812_BYTE_ORDER == WS2812_BYTE_ORDER_RGB) -/** - * @brief   Determine the index in @ref ws2812_frame_buffer "the frame buffer" of a given red bit - * - * @note    The red byte is the middle byte in the color packet - * - * @param[in] led:                  The led index [0, @ref RGBLED_NUM) - * @param[in] bit:                  The bit number [0, 7] - * - * @return                          The bit index - */ -#    define WS2812_RED_BIT(led, bit) WS2812_BIT((led), 0, (bit)) - -/** - * @brief   Determine the index in @ref ws2812_frame_buffer "the frame buffer" of a given green bit - * - * @note    The red byte is the first byte in the color packet - * - * @param[in] led:                  The led index [0, @ref RGBLED_NUM) - * @param[in] bit:                  The bit number [0, 7] - * - * @return                          The bit index - */ -#    define WS2812_GREEN_BIT(led, bit) WS2812_BIT((led), 1, (bit)) - -/** - * @brief   Determine the index in @ref ws2812_frame_buffer "the frame buffer" of a given blue bit - * - * @note    The red byte is the last byte in the color packet - * - * @param[in] led:                  The led index [0, @ref RGBLED_NUM) - * @param[in] bit:                  The bit index [0, 7] - * - * @return                          The bit index - */ -#    define WS2812_BLUE_BIT(led, bit) WS2812_BIT((led), 2, (bit)) - -#elif (WS2812_BYTE_ORDER == WS2812_BYTE_ORDER_BGR) -/** - * @brief   Determine the index in @ref ws2812_frame_buffer "the frame buffer" of a given red bit - * - * @note    The red byte is the middle byte in the color packet - * - * @param[in] led:                  The led index [0, @ref RGBLED_NUM) - * @param[in] bit:                  The bit number [0, 7] - * - * @return                          The bit index - */ -#    define WS2812_RED_BIT(led, bit) WS2812_BIT((led), 2, (bit)) - -/** - * @brief   Determine the index in @ref ws2812_frame_buffer "the frame buffer" of a given green bit - * - * @note    The red byte is the first byte in the color packet - * - * @param[in] led:                  The led index [0, @ref RGBLED_NUM) - * @param[in] bit:                  The bit number [0, 7] - * - * @return                          The bit index - */ -#    define WS2812_GREEN_BIT(led, bit) WS2812_BIT((led), 1, (bit)) - -/** - * @brief   Determine the index in @ref ws2812_frame_buffer "the frame buffer" of a given blue bit - * - * @note    The red byte is the last byte in the color packet - * - * @param[in] led:                  The led index [0, @ref RGBLED_NUM) - * @param[in] bit:                  The bit index [0, 7] - * - * @return                          The bit index - */ -#    define WS2812_BLUE_BIT(led, bit) WS2812_BIT((led), 0, (bit)) -#endif - -/* --- PRIVATE VARIABLES ---------------------------------------------------- */ - -static uint32_t ws2812_frame_buffer[WS2812_BIT_N + 1]; /**< Buffer for a frame */ - -/* --- PUBLIC FUNCTIONS ----------------------------------------------------- */ -/* - * Gedanke: Double-buffer type transactions: double buffer transfers using two memory pointers for -the memory (while the DMA is reading/writing from/to a buffer, the application can -write/read to/from the other buffer). - */ - -void ws2812_init(void) { -    // Initialize led frame buffer -    uint32_t i; -    for (i = 0; i < WS2812_COLOR_BIT_N; i++) ws2812_frame_buffer[i] = WS2812_DUTYCYCLE_0;      // All color bits are zero duty cycle -    for (i = 0; i < WS2812_RESET_BIT_N; i++) ws2812_frame_buffer[i + WS2812_COLOR_BIT_N] = 0;  // All reset bits are zero - -    palSetLineMode(RGB_DI_PIN, WS2812_OUTPUT_MODE); - -    // PWM Configuration -    //#pragma GCC diagnostic ignored "-Woverride-init"  // Turn off override-init warning for this struct. We use the overriding ability to set a "default" channel config -    static const PWMConfig ws2812_pwm_config = { -        .frequency = WS2812_PWM_FREQUENCY, -        .period    = WS2812_PWM_PERIOD,  // Mit dieser Periode wird UDE-Event erzeugt und ein neuer Wert (Länge WS2812_BIT_N) vom DMA ins CCR geschrieben -        .callback  = NULL, -        .channels = -            { -                [0 ... 3]                = {.mode = PWM_OUTPUT_DISABLED, .callback = NULL},     // Channels default to disabled -                [WS2812_PWM_CHANNEL - 1] = {.mode = WS2812_PWM_OUTPUT_MODE, .callback = NULL},  // Turn on the channel we care about -            }, -        .cr2  = 0, -        .dier = TIM_DIER_UDE,  // DMA on update event for next period -    }; -    //#pragma GCC diagnostic pop  // Restore command-line warning options - -    // Configure DMA -    // dmaInit(); // Joe added this -    dmaStreamAlloc(WS2812_DMA_STREAM - STM32_DMA_STREAM(0), 10, NULL, NULL); -    dmaStreamSetPeripheral(WS2812_DMA_STREAM, &(WS2812_PWM_DRIVER.tim->CCR[WS2812_PWM_CHANNEL - 1]));  // Ziel ist der An-Zeit im Cap-Comp-Register -    dmaStreamSetMemory0(WS2812_DMA_STREAM, ws2812_frame_buffer); -    dmaStreamSetTransactionSize(WS2812_DMA_STREAM, WS2812_BIT_N); -    dmaStreamSetMode(WS2812_DMA_STREAM, STM32_DMA_CR_CHSEL(WS2812_DMA_CHANNEL) | STM32_DMA_CR_DIR_M2P | STM32_DMA_CR_PSIZE_WORD | STM32_DMA_CR_MSIZE_WORD | STM32_DMA_CR_MINC | STM32_DMA_CR_CIRC | STM32_DMA_CR_PL(3)); -    // M2P: Memory 2 Periph; PL: Priority Level - -#if (STM32_DMA_SUPPORTS_DMAMUX == TRUE) -    // If the MCU has a DMAMUX we need to assign the correct resource -    dmaSetRequestSource(WS2812_DMA_STREAM, WS2812_DMAMUX_ID); -#endif - -    // Start DMA -    dmaStreamEnable(WS2812_DMA_STREAM); - -    // Configure PWM -    // NOTE: It's required that preload be enabled on the timer channel CCR register. This is currently enabled in the -    // ChibiOS driver code, so we don't have to do anything special to the timer. If we did, we'd have to start the timer, -    // disable counting, enable the channel, and then make whatever configuration changes we need. -    pwmStart(&WS2812_PWM_DRIVER, &ws2812_pwm_config); -    pwmEnableChannel(&WS2812_PWM_DRIVER, WS2812_PWM_CHANNEL - 1, 0);  // Initial period is 0; output will be low until first duty cycle is DMA'd in -} - -void ws2812_write_led(uint16_t led_number, uint8_t r, uint8_t g, uint8_t b) { -    // Write color to frame buffer -    for (uint8_t bit = 0; bit < 8; bit++) { -        ws2812_frame_buffer[WS2812_RED_BIT(led_number, bit)]   = ((r >> bit) & 0x01) ? WS2812_DUTYCYCLE_1 : WS2812_DUTYCYCLE_0; -        ws2812_frame_buffer[WS2812_GREEN_BIT(led_number, bit)] = ((g >> bit) & 0x01) ? WS2812_DUTYCYCLE_1 : WS2812_DUTYCYCLE_0; -        ws2812_frame_buffer[WS2812_BLUE_BIT(led_number, bit)]  = ((b >> bit) & 0x01) ? WS2812_DUTYCYCLE_1 : WS2812_DUTYCYCLE_0; -    } -} - -// Setleds for standard RGB -void ws2812_setleds(LED_TYPE* ledarray, uint16_t leds) { -    static bool s_init = false; -    if (!s_init) { -        ws2812_init(); -        s_init = true; -    } - -    for (uint16_t i = 0; i < leds; i++) { -        ws2812_write_led(i, ledarray[i].r, ledarray[i].g, ledarray[i].b); -    } -} diff --git a/drivers/chibios/ws2812_spi.c b/drivers/chibios/ws2812_spi.c deleted file mode 100644 index 377a929b94..0000000000 --- a/drivers/chibios/ws2812_spi.c +++ /dev/null @@ -1,159 +0,0 @@ -#include "quantum.h" -#include "ws2812.h" - -/* Adapted from https://github.com/gamazeps/ws2812b-chibios-SPIDMA/ */ - -#ifdef RGBW -#    error "RGBW not supported" -#endif - -// Define the spi your LEDs are plugged to here -#ifndef WS2812_SPI -#    define WS2812_SPI SPID1 -#endif - -#ifndef WS2812_SPI_MOSI_PAL_MODE -#    define WS2812_SPI_MOSI_PAL_MODE 5 -#endif - -#ifndef WS2812_SPI_SCK_PAL_MODE -#    define WS2812_SPI_SCK_PAL_MODE 5 -#endif - -// Push Pull or Open Drain Configuration -// Default Push Pull -#ifndef WS2812_EXTERNAL_PULLUP -#    if defined(USE_GPIOV1) -#        define WS2812_MOSI_OUTPUT_MODE PAL_MODE_STM32_ALTERNATE_PUSHPULL -#    else -#        define WS2812_MOSI_OUTPUT_MODE PAL_MODE_ALTERNATE(WS2812_SPI_MOSI_PAL_MODE) | PAL_STM32_OTYPE_PUSHPULL -#    endif -#else -#    if defined(USE_GPIOV1) -#        define WS2812_MOSI_OUTPUT_MODE PAL_MODE_STM32_ALTERNATE_OPENDRAIN -#    else -#        define WS2812_MOSI_OUTPUT_MODE PAL_MODE_ALTERNATE(WS2812_SPI_MOSI_PAL_MODE) | PAL_STM32_OTYPE_OPENDRAIN -#    endif -#endif - -// Define SPI config speed -// baudrate should target 3.2MHz -// F072 fpclk = 48MHz -// 48/16 = 3Mhz -#if WS2812_SPI_DIVISOR == 2 -#    define WS2812_SPI_DIVISOR (0) -#elif WS2812_SPI_DIVISOR == 4 -#    define WS2812_SPI_DIVISOR (SPI_CR1_BR_0) -#elif WS2812_SPI_DIVISOR == 8 -#    define WS2812_SPI_DIVISOR (SPI_CR1_BR_1) -#elif WS2812_SPI_DIVISOR == 16  // same as default -#    define WS2812_SPI_DIVISOR (SPI_CR1_BR_1 | SPI_CR1_BR_0) -#elif WS2812_SPI_DIVISOR == 32 -#    define WS2812_SPI_DIVISOR (SPI_CR1_BR_2) -#elif WS2812_SPI_DIVISOR == 64 -#    define WS2812_SPI_DIVISOR (SPI_CR1_BR_2 | SPI_CR1_BR_0) -#elif WS2812_SPI_DIVISOR == 128 -#    define WS2812_SPI_DIVISOR (SPI_CR1_BR_2 | SPI_CR1_BR_1) -#elif WS2812_SPI_DIVISOR == 256 -#    define WS2812_SPI_DIVISOR (SPI_CR1_BR_2 | SPI_CR1_BR_1 | SPI_CR1_BR_0) -#else -#    define WS2812_SPI_DIVISOR (SPI_CR1_BR_1 | SPI_CR1_BR_0)  // default -#endif - -// Use SPI circular buffer -#ifdef WS2812_SPI_USE_CIRCULAR_BUFFER -#    define WS2812_SPI_BUFFER_MODE 1  // circular buffer -#else -#    define WS2812_SPI_BUFFER_MODE 0  // normal buffer -#endif - -#if defined(USE_GPIOV1) -#    define WS2812_SCK_OUTPUT_MODE PAL_MODE_STM32_ALTERNATE_PUSHPULL -#else -#    define WS2812_SCK_OUTPUT_MODE PAL_MODE_ALTERNATE(WS2812_SPI_SCK_PAL_MODE) | PAL_STM32_OTYPE_PUSHPULL -#endif - -#define BYTES_FOR_LED_BYTE 4 -#define NB_COLORS 3 -#define BYTES_FOR_LED (BYTES_FOR_LED_BYTE * NB_COLORS) -#define DATA_SIZE (BYTES_FOR_LED * RGBLED_NUM) -#define RESET_SIZE (1000 * WS2812_TRST_US / (2 * 1250)) -#define PREAMBLE_SIZE 4 - -static uint8_t txbuf[PREAMBLE_SIZE + DATA_SIZE + RESET_SIZE] = {0}; - -/* - * As the trick here is to use the SPI to send a huge pattern of 0 and 1 to - * the ws2812b protocol, we use this helper function to translate bytes into - * 0s and 1s for the LED (with the appropriate timing). - */ -static uint8_t get_protocol_eq(uint8_t data, int pos) { -    uint8_t eq = 0; -    if (data & (1 << (2 * (3 - pos)))) -        eq = 0b1110; -    else -        eq = 0b1000; -    if (data & (2 << (2 * (3 - pos)))) -        eq += 0b11100000; -    else -        eq += 0b10000000; -    return eq; -} - -static void set_led_color_rgb(LED_TYPE color, int pos) { -    uint8_t* tx_start = &txbuf[PREAMBLE_SIZE]; - -#if (WS2812_BYTE_ORDER == WS2812_BYTE_ORDER_GRB) -    for (int j = 0; j < 4; j++) tx_start[BYTES_FOR_LED * pos + j] = get_protocol_eq(color.g, j); -    for (int j = 0; j < 4; j++) tx_start[BYTES_FOR_LED * pos + BYTES_FOR_LED_BYTE + j] = get_protocol_eq(color.r, j); -    for (int j = 0; j < 4; j++) tx_start[BYTES_FOR_LED * pos + BYTES_FOR_LED_BYTE * 2 + j] = get_protocol_eq(color.b, j); -#elif (WS2812_BYTE_ORDER == WS2812_BYTE_ORDER_RGB) -    for (int j = 0; j < 4; j++) tx_start[BYTES_FOR_LED * pos + j] = get_protocol_eq(color.r, j); -    for (int j = 0; j < 4; j++) tx_start[BYTES_FOR_LED * pos + BYTES_FOR_LED_BYTE + j] = get_protocol_eq(color.g, j); -    for (int j = 0; j < 4; j++) tx_start[BYTES_FOR_LED * pos + BYTES_FOR_LED_BYTE * 2 + j] = get_protocol_eq(color.b, j); -#elif (WS2812_BYTE_ORDER == WS2812_BYTE_ORDER_BGR) -    for (int j = 0; j < 4; j++) tx_start[BYTES_FOR_LED * pos + j] = get_protocol_eq(color.b, j); -    for (int j = 0; j < 4; j++) tx_start[BYTES_FOR_LED * pos + BYTES_FOR_LED_BYTE + j] = get_protocol_eq(color.g, j); -    for (int j = 0; j < 4; j++) tx_start[BYTES_FOR_LED * pos + BYTES_FOR_LED_BYTE * 2 + j] = get_protocol_eq(color.r, j); -#endif -} - -void ws2812_init(void) { -    palSetLineMode(RGB_DI_PIN, WS2812_MOSI_OUTPUT_MODE); - -#ifdef WS2812_SPI_SCK_PIN -    palSetLineMode(WS2812_SPI_SCK_PIN, WS2812_SCK_OUTPUT_MODE); -#endif  // WS2812_SPI_SCK_PIN - -    // TODO: more dynamic baudrate -    static const SPIConfig spicfg = {WS2812_SPI_BUFFER_MODE, NULL, PAL_PORT(RGB_DI_PIN), PAL_PAD(RGB_DI_PIN), WS2812_SPI_DIVISOR}; - -    spiAcquireBus(&WS2812_SPI);     /* Acquire ownership of the bus.    */ -    spiStart(&WS2812_SPI, &spicfg); /* Setup transfer parameters.       */ -    spiSelect(&WS2812_SPI);         /* Slave Select assertion.          */ -#ifdef WS2812_SPI_USE_CIRCULAR_BUFFER -    spiStartSend(&WS2812_SPI, sizeof(txbuf) / sizeof(txbuf[0]), txbuf); -#endif -} - -void ws2812_setleds(LED_TYPE* ledarray, uint16_t leds) { -    static bool s_init = false; -    if (!s_init) { -        ws2812_init(); -        s_init = true; -    } - -    for (uint8_t i = 0; i < leds; i++) { -        set_led_color_rgb(ledarray[i], i); -    } - -    // Send async - each led takes ~0.03ms, 50 leds ~1.5ms, animations flushing faster than send will cause issues. -    // Instead spiSend can be used to send synchronously (or the thread logic can be added back). -#ifndef WS2812_SPI_USE_CIRCULAR_BUFFER -#    ifdef WS2812_SPI_SYNC -    spiSend(&WS2812_SPI, sizeof(txbuf) / sizeof(txbuf[0]), txbuf); -#    else -    spiStartSend(&WS2812_SPI, sizeof(txbuf) / sizeof(txbuf[0]), txbuf); -#    endif -#endif -}  | 
