From 8fa7bb422921b625520b22595ce1edfda4beaa22 Mon Sep 17 00:00:00 2001 From: Selene ToyKeeper Date: Tue, 2 May 2023 04:47:38 -0600 Subject: converted Wurkkos TS10 build (and made its ramp smoother w/ better low modes) --- hwdef-wurkkos-ts10.h | 146 +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 146 insertions(+) create mode 100644 hwdef-wurkkos-ts10.h (limited to 'hwdef-wurkkos-ts10.h') diff --git a/hwdef-wurkkos-ts10.h b/hwdef-wurkkos-ts10.h new file mode 100644 index 0000000..c150add --- /dev/null +++ b/hwdef-wurkkos-ts10.h @@ -0,0 +1,146 @@ +// Wurkkos TS10 driver layout +// Copyright (C) 2022-2023 (FIXME) +// SPDX-License-Identifier: GPL-3.0-or-later +#pragma once + +/* + * (based on BLF Q8-t1616 driver layout) + * Driver pinout: + * eSwitch: PA5 + * Aux LED: PB5 + * PWM FET: PB0 (TCA0 WO0) + * PWM 1x7135: PB1 (TCA0 WO1) + * Voltage: VCC + */ + +#define ATTINY 1616 +#include + +#define HWDEF_C_FILE hwdef-wurkkos-ts10.c + +// allow using aux LEDs as extra channel modes +#include "chan-aux.h" + +#define USE_CHANNEL_MODES +// channel modes: +// * 0. FET+7135 stacked +// * 1. aux LEDs +#define NUM_CHANNEL_MODES 2 +#define CM_MAIN 0 +#define CM_AUX 1 + + +#define DEFAULT_CHANNEL_MODE CM_MAIN + +#define CHANNEL_MODES_ENABLED 0b00000001 +#define CHANNEL_HAS_ARGS 0b00000000 + +#define SET_LEVEL_MODES set_level_main, \ + set_level_aux +// gradual ticking for thermal regulation +#define GRADUAL_TICK_MODES gradual_tick_main, \ + gradual_tick_null + + +#define PWM_CHANNELS 2 // old, remove this + +#define PWM_BITS 16 // dynamic 16-bit, but never goes over 255 +#define PWM_GET PWM_GET8 +#define PWM_DATATYPE uint16_t // is used for PWM_TOPS (which goes way over 255) +#define PWM_DATATYPE2 uint16_t // only needs 32-bit if ramp values go over 255 +#define PWM1_DATATYPE uint8_t // 1x7135 ramp +#define PWM2_DATATYPE uint8_t // DD FET ramp + +// PWM parameters of both channels are tied together because they share a counter +#define PWM_TOP TCA0.SINGLE.PERBUF // holds the TOP value for for variable-resolution PWM +#define PWM_TOP_INIT 255 // highest value used in top half of ramp +// not necessary when double-buffered "BUF" registers are used +#define PWM_CNT TCA0.SINGLE.CNT // for resetting phase after each TOP adjustment + +// 1x7135 channel +#define CH1_PIN PB1 +#define CH1_PWM TCA0.SINGLE.CMP1BUF // CMP1 is the output compare register for PB1 + +// DD FET channel +#define CH2_PIN PB0 +#define CH2_PWM TCA0.SINGLE.CMP0BUF // CMP0 is the output compare register for PB0 + +// e-switch +#define SWITCH_PIN PIN5_bp +//#define SWITCH_PCINT PCINT0 +#define SWITCH_PORT VPORTA.IN +#define SWITCH_ISC_REG PORTA.PIN2CTRL +#define SWITCH_VECT PORTA_PORT_vect +#define SWITCH_INTFLG VPORTA.INTFLAGS +//#define PCINT_vect PCINT0_vect + +// average drop across diode on this hardware +#ifndef VOLTAGE_FUDGE_FACTOR +#define VOLTAGE_FUDGE_FACTOR 7 // add 0.35V +#endif + +// front-facing aux LEDs +#define AUXLED_PIN PIN5_bp +#define AUXLED_PORT PORTB + +void set_level_main(uint8_t level); + +bool gradual_tick_main(uint8_t gt); + + +inline void hwdef_setup() { + + // set up the system clock to run at 10 MHz instead of the default 3.33 MHz + _PROTECTED_WRITE( CLKCTRL.MCLKCTRLB, + CLKCTRL_PDIV_2X_gc | CLKCTRL_PEN_bm ); + + //VPORTA.DIR = ...; + // Outputs: Aux LED and PWMs + VPORTB.DIR = PIN0_bm + | PIN1_bm + | PIN5_bm; + //VPORTC.DIR = ...; + + // enable pullups on the unused pins to reduce power + PORTA.PIN0CTRL = PORT_PULLUPEN_bm; + PORTA.PIN1CTRL = PORT_PULLUPEN_bm; + PORTA.PIN2CTRL = PORT_PULLUPEN_bm; + PORTA.PIN3CTRL = PORT_PULLUPEN_bm; + PORTA.PIN4CTRL = PORT_PULLUPEN_bm; + PORTA.PIN5CTRL = PORT_PULLUPEN_bm | PORT_ISC_BOTHEDGES_gc; // eSwitch + PORTA.PIN6CTRL = PORT_PULLUPEN_bm; + PORTA.PIN7CTRL = PORT_PULLUPEN_bm; + + //PORTB.PIN0CTRL = PORT_PULLUPEN_bm; // FET channel + //PORTB.PIN1CTRL = PORT_PULLUPEN_bm; // 7135 channel + PORTB.PIN2CTRL = PORT_PULLUPEN_bm; + PORTB.PIN3CTRL = PORT_PULLUPEN_bm; + PORTB.PIN4CTRL = PORT_PULLUPEN_bm; + //PORTB.PIN5CTRL = PORT_PULLUPEN_bm; // Aux LED + + PORTC.PIN0CTRL = PORT_PULLUPEN_bm; + PORTC.PIN1CTRL = PORT_PULLUPEN_bm; + PORTC.PIN2CTRL = PORT_PULLUPEN_bm; + PORTC.PIN3CTRL = PORT_PULLUPEN_bm; + + // set up the PWM + // https://ww1.microchip.com/downloads/en/DeviceDoc/ATtiny1614-16-17-DataSheet-DS40002204A.pdf + // PB0 is TCA0:WO0, use TCA_SINGLE_CMP0EN_bm + // PB1 is TCA0:WO1, use TCA_SINGLE_CMP1EN_bm + // PB2 is TCA0:WO2, use TCA_SINGLE_CMP2EN_bm + // For Fast (Single Slope) PWM use TCA_SINGLE_WGMODE_SINGLESLOPE_gc + // For Phase Correct (Dual Slope) PWM use TCA_SINGLE_WGMODE_DSBOTTOM_gc + // See the manual for other pins, clocks, configs, portmux, etc + TCA0.SINGLE.CTRLB = TCA_SINGLE_CMP0EN_bm + | TCA_SINGLE_CMP1EN_bm + | TCA_SINGLE_WGMODE_DSBOTTOM_gc; + TCA0.SINGLE.CTRLA = TCA_SINGLE_CLKSEL_DIV1_gc + | TCA_SINGLE_ENABLE_bm; + + PWM_TOP = PWM_TOP_INIT; + +} + + +#define LAYOUT_DEFINED + -- cgit v1.2.3 From a72dbab22d7dd159c35c42961af9f51ff38959d7 Mon Sep 17 00:00:00 2001 From: Selene ToyKeeper Date: Mon, 17 Jul 2023 13:00:21 -0600 Subject: fixed Wurkkos builds (using new refactor) --- hwdef-wurkkos-ts10.h | 19 ++++--------------- 1 file changed, 4 insertions(+), 15 deletions(-) (limited to 'hwdef-wurkkos-ts10.h') diff --git a/hwdef-wurkkos-ts10.h b/hwdef-wurkkos-ts10.h index c150add..4af6a84 100644 --- a/hwdef-wurkkos-ts10.h +++ b/hwdef-wurkkos-ts10.h @@ -21,25 +21,18 @@ // allow using aux LEDs as extra channel modes #include "chan-aux.h" -#define USE_CHANNEL_MODES // channel modes: // * 0. FET+7135 stacked // * 1. aux LEDs #define NUM_CHANNEL_MODES 2 -#define CM_MAIN 0 -#define CM_AUX 1 - +enum CHANNEL_MODES { + CM_MAIN = 0, + CM_AUX +}; #define DEFAULT_CHANNEL_MODE CM_MAIN #define CHANNEL_MODES_ENABLED 0b00000001 -#define CHANNEL_HAS_ARGS 0b00000000 - -#define SET_LEVEL_MODES set_level_main, \ - set_level_aux -// gradual ticking for thermal regulation -#define GRADUAL_TICK_MODES gradual_tick_main, \ - gradual_tick_null #define PWM_CHANNELS 2 // old, remove this @@ -83,10 +76,6 @@ #define AUXLED_PIN PIN5_bp #define AUXLED_PORT PORTB -void set_level_main(uint8_t level); - -bool gradual_tick_main(uint8_t gt); - inline void hwdef_setup() { -- cgit v1.2.3 From 05015b37f89f508482946160fe716fa239d0e005 Mon Sep 17 00:00:00 2001 From: Selene ToyKeeper Date: Fri, 27 Oct 2023 03:24:25 -0600 Subject: converted blf-q8-t1616 to new API, using wurkkos-ts10 and wurkkos-ts25 as a base (since the Q8 driver was the direct predecessor to those Wurkkos drivers, they're almost identical) --- hwdef-wurkkos-ts10.h | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'hwdef-wurkkos-ts10.h') diff --git a/hwdef-wurkkos-ts10.h b/hwdef-wurkkos-ts10.h index 4af6a84..e693c99 100644 --- a/hwdef-wurkkos-ts10.h +++ b/hwdef-wurkkos-ts10.h @@ -1,5 +1,5 @@ // Wurkkos TS10 driver layout -// Copyright (C) 2022-2023 (FIXME) +// Copyright (C) 2021-2023 gchart, Selene ToyKeeper // SPDX-License-Identifier: GPL-3.0-or-later #pragma once @@ -32,6 +32,7 @@ enum CHANNEL_MODES { #define DEFAULT_CHANNEL_MODE CM_MAIN +// right-most bit first, modes are in fedcba9876543210 order #define CHANNEL_MODES_ENABLED 0b00000001 @@ -84,10 +85,10 @@ inline void hwdef_setup() { CLKCTRL_PDIV_2X_gc | CLKCTRL_PEN_bm ); //VPORTA.DIR = ...; - // Outputs: Aux LED and PWMs - VPORTB.DIR = PIN0_bm - | PIN1_bm - | PIN5_bm; + // Outputs + VPORTB.DIR = PIN0_bm // DD FET + | PIN1_bm // 7135 + | PIN5_bm; // Aux LED //VPORTC.DIR = ...; // enable pullups on the unused pins to reduce power -- cgit v1.2.3