From 483c2e00f16953f6305fb1f8b7479c2b09ada792 Mon Sep 17 00:00:00 2001 From: Selene ToyKeeper Date: Fri, 11 Sep 2015 16:41:05 -0600 Subject: Refactored blf-a6 a bunch to export code to includes and make attiny portability a bit better. Moved MCU hardware options and pin layout to tk-attiny.h. Moved voltage and OTC hardcoded values to tk-calibration.h. Moved delay functions to tk-delay.h, and made it use BOGOMIPS instead of DELAY_TWEAK. Moved voltage ADC and most of the battcheck code to tk-voltage.h. Changed EEPLEN to EEPSIZE. Made 1.1V reference symbol consistent across MCUs to avoid repeated #if/#else clauses. --- tk-attiny.h | 90 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 90 insertions(+) create mode 100644 tk-attiny.h (limited to 'tk-attiny.h') diff --git a/tk-attiny.h b/tk-attiny.h new file mode 100644 index 0000000..003e915 --- /dev/null +++ b/tk-attiny.h @@ -0,0 +1,90 @@ +#ifndef TK_ATTINY_H +#define TK_ATTINY_H +/* + * Attiny portability header. + * This helps abstract away the differences between various attiny MCUs. + * + * Copyright (C) 2015 Selene ToyKeeper + * + * 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 . + * + */ + +// Choose your MCU here, or in the main .c file, or in the build script +//#define ATTINY 13 +//#define ATTINY 25 + +/******************** hardware-specific values **************************/ +#if (ATTINY == 13) + #define F_CPU 4800000UL + #define EEPSIZE 64 + #define V_REF REFS0 + #define BOGOMIPS 950 +#elif (ATTINY == 25) + #define F_CPU 8000000UL + #define EEPSIZE 128 + #define V_REF REFS1 + #define BOGOMIPS 2000 +#else + Hey, you need to define ATTINY. +#endif + + +/******************** I/O pin and register layout ************************/ +#ifdef FET_7135_LAYOUT +/* + * ---- + * -|1 8|- VCC + * OTC -|2 7|- Voltage ADC + * Star 3 -|3 6|- PWM (FET) + * GND -|4 5|- PWM (1x7135) + * ---- + */ + +#define STAR2_PIN PB0 // If this pin isn't used for ALT_PWM +#define STAR3_PIN PB4 // pin 3 + +#define CAP_PIN PB3 // pin 2, OTC +#define CAP_CHANNEL 0x03 // MUX 03 corresponds with PB3 (Star 4) +#define CAP_DIDR ADC3D // Digital input disable bit corresponding with PB3 + +#define PWM_PIN PB1 // pin 6, FET PWM +#define PWM_LVL OCR0B // OCR0B is the output compare register for PB1 +#define ALT_PWM_PIN PB0 // pin 5, 1x7135 PWM +#define ALT_PWM_LVL OCR0A // OCR0A is the output compare register for PB0 + +#define VOLTAGE_PIN PB2 // pin 7, voltage ADC +#define ADC_CHANNEL 0x01 // MUX 01 corresponds with PB2 +#define ADC_DIDR ADC1D // Digital input disable bit corresponding with PB2 +#define ADC_PRSCL 0x06 // clk/64 + +#endif // FET_7135_LAYOUT + +#ifdef FERRERO_ROCHER_LAYOUT +/* + * ---- + * -|1 8|- VCC + * E-switch -|2 7|- Voltage ADC + * Red LED -|3 6|- PWM + * GND -|4 5|- Green LED + * ---- + */ +// TODO: fill in this section, update Ferrero_Rocher code to use it. +#endif // FERRERO_ROCHER_LAYOUT + +#ifndef PWM_LVL + Hey, you need to define an I/O pin layout. +#endif + +#endif // TK_ATTINY_H -- cgit v1.2.3 From 3e059f81420fa9f8a471f3c728430d1b70a4c51d Mon Sep 17 00:00:00 2001 From: Selene ToyKeeper Date: Fri, 11 Sep 2015 16:47:51 -0600 Subject: Oops, delay_s() should delay for 1000 ms, not BOGOMIPS ms. --- tk-attiny.h | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'tk-attiny.h') diff --git a/tk-attiny.h b/tk-attiny.h index 003e915..9415a97 100644 --- a/tk-attiny.h +++ b/tk-attiny.h @@ -32,6 +32,7 @@ #define V_REF REFS0 #define BOGOMIPS 950 #elif (ATTINY == 25) + // TODO: Use 6.4 MHz instead of 8 MHz? #define F_CPU 8000000UL #define EEPSIZE 128 #define V_REF REFS1 @@ -45,7 +46,7 @@ #ifdef FET_7135_LAYOUT /* * ---- - * -|1 8|- VCC + * Reset -|1 8|- VCC * OTC -|2 7|- Voltage ADC * Star 3 -|3 6|- PWM (FET) * GND -|4 5|- PWM (1x7135) @@ -74,7 +75,7 @@ #ifdef FERRERO_ROCHER_LAYOUT /* * ---- - * -|1 8|- VCC + * Reset -|1 8|- VCC * E-switch -|2 7|- Voltage ADC * Red LED -|3 6|- PWM * GND -|4 5|- Green LED -- cgit v1.2.3