diff options
| author | Selene ToyKeeper | 2022-04-14 19:59:55 -0600 |
|---|---|---|
| committer | Selene ToyKeeper | 2022-04-14 19:59:55 -0600 |
| commit | 2527602a3680f2e0d4217359e0a142920621f739 (patch) | |
| tree | b60de4907679be3108abe0c26450c9dd735203ef /hw | |
| parent | revert spurious change to version.h (diff) | |
| parent | Created LED_DISABLE_DELAY option and enabled it for SP10 Pro to hopefully eli... (diff) | |
| download | anduril-2527602a3680f2e0d4217359e0a142920621f739.tar.gz anduril-2527602a3680f2e0d4217359e0a142920621f739.tar.bz2 anduril-2527602a3680f2e0d4217359e0a142920621f739.zip | |
merged gchart's latest changes:
- sp10-pro shutoff fix
- mt35-mini support
- power channel enable/disable timing delays
(though I wouldn't recommend doing 80ms like the thefreeman code does,
since that's more than one WDT cycle (16ms))
Diffstat (limited to '')
| -rw-r--r-- | hwdef-Mateminco_MT35-Mini.h | 47 | ||||
| -rw-r--r-- | hwdef-Sofirn_SP10-Pro.h | 3 | ||||
| -rw-r--r-- | hwdef-thefreeman-lin16dac.h | 2 |
3 files changed, 50 insertions, 2 deletions
diff --git a/hwdef-Mateminco_MT35-Mini.h b/hwdef-Mateminco_MT35-Mini.h new file mode 100644 index 0000000..344f658 --- /dev/null +++ b/hwdef-Mateminco_MT35-Mini.h @@ -0,0 +1,47 @@ +#ifndef HWDEF_MT35_MINI_H +#define HWDEF_MT35_MINI_H + +/* Mateminco MT35-Mini / Astrolux FT03 + * ---- + * Reset -|1 8|- VCC + * eswitch -|2 7|- Aux LED + * 1x7135 -|3 6|- NC + * GND -|4 5|- FET + * ---- + */ + +#define PWM_CHANNELS 2 + +#ifndef SWITCH_PIN +#define SWITCH_PIN PB3 // pin 2 +#define SWITCH_PCINT PCINT3 // pin 2 pin change interrupt +#endif + +#ifndef PWM1_PIN +#define PWM1_PIN PB4 // pin 3, 1x7135 PWM +#define PWM1_LVL OCR1B // OCR1B is the output compare register for PB0 +#endif + +#ifndef PWM2_PIN +#define PWM2_PIN PB0 // pin 5, FET PWM +#define PWM2_LVL OCR0A // OCR0A is the output compare register for PB4 +#endif + +#define ADC_PRSCL 0x07 // clk/128 + +// average drop across diode on this hardware +#ifndef VOLTAGE_FUDGE_FACTOR +#define VOLTAGE_FUDGE_FACTOR 7 // add 0.35V +#endif + +// lighted button +#ifndef AUXLED_PIN +#define AUXLED_PIN PB2 // pin 7 +#endif + +#define FAST 0xA3 // fast PWM both channels +#define PHASE 0xA1 // phase-correct PWM both channels + +#define LAYOUT_DEFINED + +#endif diff --git a/hwdef-Sofirn_SP10-Pro.h b/hwdef-Sofirn_SP10-Pro.h index bb10f2f..7d0d7f5 100644 --- a/hwdef-Sofirn_SP10-Pro.h +++ b/hwdef-Sofirn_SP10-Pro.h @@ -53,9 +53,10 @@ PA1 : Boost Enable #define LED_ENABLE_PIN PIN1_bp #define LED_ENABLE_PORT PORTA_OUT +#define LED_DISABLE_DELAY 4 #define USE_VOLTAGE_DIVIDER // use a dedicated pin, not VCC, because VCC input is flattened -#define DUAL_VOLTAGE_FLOOR 20 // for AA/14500 boost drivers, don't indicate low voltage if below this level +#define DUAL_VOLTAGE_FLOOR 21 // for AA/14500 boost drivers, don't indicate low voltage if below this level #define DUAL_VOLTAGE_LOW_LOW 7 // the lower voltage range's danger zone 0.7 volts (NiMH) #define ADMUX_VOLTAGE_DIVIDER ADC_MUXPOS_AIN9_gc // which ADC channel to read diff --git a/hwdef-thefreeman-lin16dac.h b/hwdef-thefreeman-lin16dac.h index 0999c4c..adb7886 100644 --- a/hwdef-thefreeman-lin16dac.h +++ b/hwdef-thefreeman-lin16dac.h @@ -47,7 +47,7 @@ Read voltage from VCC pin, has PFET so no drop // For turning on and off the op-amp #define LED2_ENABLE_PIN PIN7_bp #define LED2_ENABLE_PORT PORTA_OUT - +#define LED2_ENABLE_DELAY 80 // how many ms to delay turning on the lights after enabling the channel // average drop across diode on this hardware #ifndef VOLTAGE_FUDGE_FACTOR |