From 7cb4fe0944b839f28dfd96a88a772cd6a8b58019 Mon Sep 17 00:00:00 2001
From: Selene ToyKeeper
Date: Thu, 2 Nov 2023 17:16:25 -0600
Subject: reorganized project files (part 1) (just moved files, didn't change
 the contents yet,  and nothing will work without updating #includes and build
 scripts and stuff)

---
 hwdef-emisar-d4k-3ch.h | 248 -------------------------------------------------
 1 file changed, 248 deletions(-)
 delete mode 100644 hwdef-emisar-d4k-3ch.h

(limited to 'hwdef-emisar-d4k-3ch.h')

diff --git a/hwdef-emisar-d4k-3ch.h b/hwdef-emisar-d4k-3ch.h
deleted file mode 100644
index 2e83fbe..0000000
--- a/hwdef-emisar-d4k-3ch.h
+++ /dev/null
@@ -1,248 +0,0 @@
-// Emisar D4K 3-channel hwdef
-// Copyright (C) 2023 Selene ToyKeeper
-// SPDX-License-Identifier: GPL-3.0-or-later
-#pragma once
-
-/*
- * Pin / Name / Function
- *   1    PA6   LED 4 PWM (linear) (PWM1B)
- *   2    PA5   R: red aux LED (PWM0B)
- *   3    PA4   G: green aux LED
- *   4    PA3   B: blue aux LED
- *   5    PA2   button LED
- *   6    PA1   3rd LED opamp enable
- *   7    PA0   4th LED opamp enable
- *   8    GND   GND
- *   9    VCC   VCC
- *  10    PC5   (none)
- *  11    PC4   (none)
- *  12    PC3   RESET
- *  13    PC2   (none)
- *  14    PC1   SCK
- *  15    PC0   main 2 LEDs PWM (linear) (PWM0A) (8-bit only)
- *  16    PB3   3rd LED PWM (linear) (PWM1A)
- *  17    PB2   MISO
- *  18    PB1   MOSI / battery voltage (ADC6)
- *  19    PB0   main 2 LEDs opamp enable
- *  20    PA7   e-switch (PCINT7)
- *      ADC12   thermal sensor
- *
- * PWM speed + resolution is dynamic on 2 channels,
- * and 8-bit 16 kHz on 1 channel.
- *
- * Note: Some hardware might swap the wires at build time!
- * It might be wired 8/16/16 (8-bit LEDs 1+2) or 16/16/8 (8-bit LED 4).
- * So this code should support both wire layouts.
- */
-
-#define ATTINY 1634
-#include <avr/io.h>
-
-#define HWDEF_C_FILE hwdef-emisar-d4k-3ch.c
-
-// allow using aux LEDs as extra channel modes
-#include "chan-rgbaux.h"
-
-// channel modes:
-// - 1. main 2 LEDs only (8/16/16 wiring) or LED 4 only (16/16/8)
-// - 2. 3rd LED only
-// - 3. 4th LED only (8/16/16 wiring) or main 2 LEDs only (16/16/8)
-// - 4. all 3 channels (equal amounts)
-// - 5. 2ch blend (3rd + 4th LEDs, 8/16/16 wiring)
-// - 6. 2ch blend (3rd + 4th LEDs, 16/16/8 wiring)
-// - 7. 3ch blend (HSV style)
-// - 8. 3ch auto blend (red-warm-cool style, led4-led3-main2)
-// - 9+. RGB aux (hidden)
-#define NUM_CHANNEL_MODES   (8 + NUM_RGB_AUX_CHANNEL_MODES)
-enum channel_modes_e {
-    CM_MAIN2 = 0,
-    CM_LED3,
-    CM_LED4,
-    CM_ALL,
-    CM_BLEND34A,  // 8 / [16+16]
-    CM_BLEND34B,  // 16 / [16+8]
-    CM_HSV,
-    CM_AUTO3,
-    RGB_AUX_ENUMS
-};
-
-#define CHANNEL_MODES_ENABLED 0b0000000000001111
-#define USE_CHANNEL_MODE_ARGS
-// _, _, _, _, 128=middle CCT, 128=middle CCT, 213=purple, _
-#define CHANNEL_MODE_ARGS 0,0,0,0,128,128,213,0,RGB_AUX_CM_ARGS
-#define USE_CUSTOM_CHANNEL_3H_MODES
-#define USE_CIRCULAR_TINT_3H
-
-// can use some of the common handlers
-#define USE_CALC_2CH_BLEND
-#define USE_HSV2RGB
-
-
-#define PWM_CHANNELS 1  // old, remove this
-
-#define PWM_BITS      16     // 0 to 16383 at variable Hz, not 0 to 255 at 16 kHz
-#define PWM_GET       PWM_GET16
-#define PWM_DATATYPE  uint16_t
-#define PWM_DATATYPE2 uint32_t  // only needs 32-bit if ramp values go over 255
-#define PWM1_DATATYPE uint16_t  // 15-bit PWM+DSM ramp
-
-// dynamic PWM
-#define PWM_TOP       ICR1   // holds the TOP value for for variable-resolution PWM
-#define PWM_TOP_INIT  255    // highest value used in top half of ramp
-#define PWM_CNT       TCNT1  // for checking / resetting phase
-#define PWM_CNT2      TCNT0  // for checking / resetting phase
-// (max is (255 << 7), because it's 8-bit PWM plus 7 bits of DSM)
-#define DSM_TOP       (255<<7) // 15-bit resolution leaves 1 bit for carry
-
-// timer interrupt for DSM
-#define DSM_vect     TIMER0_OVF_vect
-#define DSM_INTCTRL  TIMSK
-#define DSM_OVF_bm   (1<<TOIE0)
-
-#define DELAY_FACTOR 90  // less time in delay() because more time spent in interrupts
-
-// main 2 LEDs / 1st channel (2 LEDs)
-uint16_t main2_dsm_lvl;
-uint8_t main2_pwm, main2_dsm;
-#define MAIN2_PWM_PIN PC0
-#define MAIN2_PWM_LVL OCR0A   // OCR0A is the output compare register for PC0
-#define MAIN2_ENABLE_PIN  PB0    // Opamp power
-#define MAIN2_ENABLE_PORT PORTB  // control port for PB0
-
-// LED 3 / 2nd channel (1 LED)
-uint16_t led3_dsm_lvl;
-uint8_t led3_pwm, led3_dsm;
-#define LED3_PWM_PIN PB3
-#define LED3_PWM_LVL OCR1A   // OCR1A is the output compare register for PB3
-#define LED3_ENABLE_PIN  PA1    // Opamp power
-#define LED3_ENABLE_PORT PORTA  // control port for PA1
-
-// LED 4 / 3rd channel (1 LED)
-uint16_t led4_dsm_lvl;
-uint8_t led4_pwm, led4_dsm;
-#define LED4_PWM_PIN PA6
-#define LED4_PWM_LVL OCR1B  // OCR1B is the output compare register for PA6
-#define LED4_ENABLE_PIN  PA0    // Opamp power
-#define LED4_ENABLE_PORT PORTA  // control port for PA0
-
-// e-switch
-#ifndef SWITCH_PIN
-#define SWITCH_PIN   PA7     // pin 20
-#define SWITCH_PCINT PCINT7  // pin 20 pin change interrupt
-#define SWITCH_PCIE  PCIE0   // PCIE1 is for PCINT[7:0]
-#define SWITCH_PCMSK PCMSK0  // PCMSK1 is for PCINT[7:0]
-#define SWITCH_PORT  PINA    // PINA or PINB or PINC
-#define SWITCH_PUE   PUEA    // pullup group A
-#define PCINT_vect   PCINT0_vect  // ISR for PCINT[7:0]
-#endif
-
-#define USE_VOLTAGE_DIVIDER  // use a dedicated pin, not VCC, because VCC input is flattened
-#define VOLTAGE_PIN PB1      // Pin 18 / PB1 / ADC6
-// pin to ADC mappings are in DS table 19-4
-#define VOLTAGE_ADC      ADC6D  // digital input disable pin for PB1
-// DIDR0/DIDR1 mappings are in DS section 19.13.5, 19.13.6
-#define VOLTAGE_ADC_DIDR DIDR1  // DIDR channel for ADC6D
-// DS tables 19-3, 19-4
-// Bit   7     6     5      4     3    2    1    0
-//     REFS1 REFS0 REFEN ADC0EN MUX3 MUX2 MUX1 MUX0
-// MUX[3:0] = 0, 1, 1, 0 for ADC6 / PB1
-// divided by ...
-// REFS[1:0] = 1, 0 for internal 1.1V reference
-// other bits reserved
-#define ADMUX_VOLTAGE_DIVIDER 0b10000110
-#define ADC_PRSCL   0x07    // clk/128
-
-// Raw ADC readings at 4.4V and 2.2V
-// calibrate the voltage readout here
-// estimated / calculated values are:
-//   (voltage - D1) * (R2/(R2+R1) * 1024 / 1.1)
-// D1, R1, R2 = 0, 330, 100
-#ifndef ADC_44
-//#define ADC_44 981  // raw value at 4.40V
-#define ADC_44 967  // manually tweaked so 4.16V will blink out 4.2
-#endif
-#ifndef ADC_22
-//#define ADC_22 489  // raw value at 2.20V
-#define ADC_22 482  // manually tweaked so 4.16V will blink out 4.2
-#endif
-
-// this light has aux LEDs under the optic
-#define AUXLED_R_PIN    PA5    // pin 2
-#define AUXLED_G_PIN    PA4    // pin 3
-#define AUXLED_B_PIN    PA3    // pin 4
-#define AUXLED_RGB_PORT PORTA  // PORTA or PORTB or PORTC
-#define AUXLED_RGB_DDR  DDRA   // DDRA or DDRB or DDRC
-#define AUXLED_RGB_PUE  PUEA   // PUEA or PUEB or PUEC
-
-#define BUTTON_LED_PIN  PA2    // pin 5
-#define BUTTON_LED_PORT PORTA  // for all "PA" pins
-#define BUTTON_LED_DDR  DDRA   // for all "PA" pins
-#define BUTTON_LED_PUE  PUEA   // for all "PA" pins
-
-// this light has three aux LED channels: R, G, B
-#define USE_AUX_RGB_LEDS
-// the aux LEDs are front-facing, so turn them off while main LEDs are on
-// it also has an independent LED in the button
-#define USE_BUTTON_LED
-
-
-inline void hwdef_setup() {
-    // enable output ports
-    DDRC = (1 << MAIN2_PWM_PIN);
-    DDRB = (1 << LED3_PWM_PIN)
-         | (1 << MAIN2_ENABLE_PIN)
-         ;
-    DDRA = (1 << LED4_PWM_PIN)
-         | (1 << LED4_ENABLE_PIN)
-         | (1 << LED3_ENABLE_PIN)
-         | (1 << AUXLED_R_PIN)
-         | (1 << AUXLED_G_PIN)
-         | (1 << AUXLED_B_PIN)
-         | (1 << BUTTON_LED_PIN)
-         ;
-
-    // configure PWM
-    // Setup PWM. F_pwm = F_clkio / 2 / N / TOP, where N = prescale factor, TOP = top of counter
-    // pre-scale for timer: N = 1
-    // Linear opamp PWM for both 16-bit channels
-    // WGM1[3:0]: 1,0,1,0: PWM, Phase Correct, adjustable (DS table 12-5)
-    // WGM1[3:0]: 1,1,1,0: PWM, Fast, adjustable (DS table 12-5)
-    // CS1[2:0]:    0,0,1: clk/1 (No prescaling) (DS table 12-6)
-    // COM1A[1:0]:    1,0: PWM OC1A in the normal direction (DS table 12-4)
-    // COM1B[1:0]:    1,0: PWM OC1B in the normal direction (DS table 12-4)
-    TCCR1A  = (1<<WGM11)  | (0<<WGM10)   // adjustable PWM (TOP=ICR1) (DS table 12-5)
-            | (1<<COM1A1) | (0<<COM1A0)  // PWM 1A in normal direction (DS table 12-4)
-            | (1<<COM1B1) | (0<<COM1B0)  // PWM 1B in normal direction (DS table 12-4)
-            ;
-    TCCR1B  = (0<<CS12)   | (0<<CS11) | (1<<CS10)  // clk/1 (no prescaling) (DS table 12-6)
-            //| (1<<WGM13)  | (1<<WGM12)  // fast adjustable PWM (DS table 12-5)
-            | (1<<WGM13)  | (0<<WGM12)  // phase-correct adjustable PWM (DS table 12-5)
-            ;
-    // set PWM resolution
-    PWM_TOP = PWM_TOP_INIT;
-
-    // 8-bit PWM channel (LEDs 1+2 or LED 4)
-    // WGM0[2:0]: 0,0,1: PWM, Phase Correct, 8-bit (DS table 11-8)
-    // CS0[2:0]:  0,0,1: clk/1 (No prescaling) (DS table 11-9)
-    // COM0A[1:0]:  1,0: PWM OC0A in the normal direction (DS table 11-4)
-    // COM0B[1:0]:  1,0: PWM OC0B in the normal direction (DS table 11-7)
-    TCCR0A  = (0<<WGM01)  | (1<<WGM00)   // 8-bit (TOP=0xFF) (DS table 11-8)
-            | (1<<COM0A1) | (0<<COM0A0)  // PWM 0A in normal direction (DS table 11-4)
-            //| (1<<COM0B1) | (0<<COM0B0)  // PWM 0B in normal direction (DS table 11-7)
-            ;
-    TCCR0B  = (0<<CS02)   | (0<<CS01) | (1<<CS00)  // clk/1 (no prescaling) (DS table 11-9)
-            | (0<<WGM02)  // phase-correct PWM (DS table 11-8)
-            ;
-
-    // set up interrupt for delta-sigma modulation
-    // (moved to hwdef.c functions so it can be enabled/disabled based on ramp level)
-    //DSM_INTCTRL |= DSM_OVF_bm;  // interrupt once for each timer cycle
-
-    // set up e-switch
-    SWITCH_PUE = (1 << SWITCH_PIN);  // pull-up for e-switch
-    SWITCH_PCMSK = (1 << SWITCH_PCINT);  // enable pin change interrupt
-}
-
-
-#define LAYOUT_DEFINED
-
-- 
cgit v1.2.3