From 2dcd56ce3d00fc7414652e6f866bf8eefd42dba9 Mon Sep 17 00:00:00 2001 From: Selene ToyKeeper Date: Thu, 2 Nov 2023 18:51:38 -0600 Subject: got things to compile again, renamed #includes (also modified the build scripts to work with the new file structure) --- hw/hank/emisar-d4k-3ch/cfg.h | 4 ++-- hw/hank/emisar-d4k-3ch/hwdef.c | 4 ++-- hw/hank/emisar-d4k-3ch/hwdef.h | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) (limited to 'hw/hank/emisar-d4k-3ch') diff --git a/hw/hank/emisar-d4k-3ch/cfg.h b/hw/hank/emisar-d4k-3ch/cfg.h index c39ac01..10aeb60 100644 --- a/hw/hank/emisar-d4k-3ch/cfg.h +++ b/hw/hank/emisar-d4k-3ch/cfg.h @@ -4,8 +4,8 @@ #pragma once #define MODEL_NUMBER "0151" -#include "hwdef-emisar-d4k-3ch.h" -#include "hank-cfg.h" +#include "hank/emisar-d4k-3ch/hwdef.h" +#include "hank/cfg.h" // ATTINY: 1634 // this light has three aux LED channels: R, G, B diff --git a/hw/hank/emisar-d4k-3ch/hwdef.c b/hw/hank/emisar-d4k-3ch/hwdef.c index e35af08..ba5273d 100644 --- a/hw/hank/emisar-d4k-3ch/hwdef.c +++ b/hw/hank/emisar-d4k-3ch/hwdef.c @@ -3,8 +3,8 @@ // SPDX-License-Identifier: GPL-3.0-or-later #pragma once -#include "spaghetti-monster/anduril/channel-modes.h" //for circular_tint_3h() -#include "chan-rgbaux.c" +#include "anduril/channel-modes.h" //for circular_tint_3h() +#include "fsm/chan-rgbaux.c" void set_level_zero(); diff --git a/hw/hank/emisar-d4k-3ch/hwdef.h b/hw/hank/emisar-d4k-3ch/hwdef.h index 2e83fbe..81a64ed 100644 --- a/hw/hank/emisar-d4k-3ch/hwdef.h +++ b/hw/hank/emisar-d4k-3ch/hwdef.h @@ -38,10 +38,10 @@ #define ATTINY 1634 #include -#define HWDEF_C_FILE hwdef-emisar-d4k-3ch.c +#define HWDEF_C_FILE hank/emisar-d4k-3ch/hwdef.c // allow using aux LEDs as extra channel modes -#include "chan-rgbaux.h" +#include "fsm/chan-rgbaux.h" // channel modes: // - 1. main 2 LEDs only (8/16/16 wiring) or LED 4 only (16/16/8) -- cgit v1.2.3