From 73fb3b43a2e348e20e7a79945ddb34865eb3fc27 Mon Sep 17 00:00:00 2001 From: Selene ToyKeeper Date: Thu, 20 Jul 2023 21:50:35 -0600 Subject: fixed original D4S (using new refactor) --- hwdef-Emisar_D4S.h | 13 ------------- hwdef-emisar-d4s.h | 13 +++++++++++++ spaghetti-monster/anduril/cfg-emisar-d4s.h | 11 ++++------- 3 files changed, 17 insertions(+), 20 deletions(-) delete mode 100644 hwdef-Emisar_D4S.h create mode 100644 hwdef-emisar-d4s.h diff --git a/hwdef-Emisar_D4S.h b/hwdef-Emisar_D4S.h deleted file mode 100644 index 97d8529..0000000 --- a/hwdef-Emisar_D4S.h +++ /dev/null @@ -1,13 +0,0 @@ -// Emisar D4S driver layout -// Copyright (C) 2018-2023 Selene ToyKeeper -// SPDX-License-Identifier: GPL-3.0-or-later -#pragma once - -// same as a D4, basically -#include "hwdef-Emisar_D4.h" - -// ... except the D4S has aux LEDs under the optic -#ifndef AUXLED_PIN -#define AUXLED_PIN PB4 // pin 3 -#endif - diff --git a/hwdef-emisar-d4s.h b/hwdef-emisar-d4s.h new file mode 100644 index 0000000..95789e6 --- /dev/null +++ b/hwdef-emisar-d4s.h @@ -0,0 +1,13 @@ +// Emisar D4S driver layout +// Copyright (C) 2018-2023 Selene ToyKeeper +// SPDX-License-Identifier: GPL-3.0-or-later +#pragma once + +// same as a D4, basically +#include "hwdef-emisar-d4.h" + +// ... except the D4S has aux LEDs under the optic +#ifndef AUXLED_PIN +#define AUXLED_PIN PB4 // pin 3 +#endif + diff --git a/spaghetti-monster/anduril/cfg-emisar-d4s.h b/spaghetti-monster/anduril/cfg-emisar-d4s.h index a3dc65f..e966132 100644 --- a/spaghetti-monster/anduril/cfg-emisar-d4s.h +++ b/spaghetti-monster/anduril/cfg-emisar-d4s.h @@ -4,21 +4,18 @@ #pragma once #define MODEL_NUMBER "0131" -#include "hwdef-Emisar_D4S.h" +#include "hwdef-emisar-d4s.h" #include "hank-cfg.h" +// ATTINY: 85 -// the button lights up +// the button lights up (on some models) #define USE_INDICATOR_LED // the aux LEDs are behind the main LEDs #ifdef USE_INDICATOR_LED_WHILE_RAMPING #undef USE_INDICATOR_LED_WHILE_RAMPING #endif -#ifdef RAMP_LENGTH -#undef RAMP_LENGTH -#endif - -#define RAMP_LENGTH 150 +#define RAMP_SIZE 150 // 3x7135 + FET // level_calc.py ninth 2 150 7135 1 11.2 450 FET 1 10 4000 -- cgit v1.2.3