From f72e0eea649b1bedcedc23959ea711821d60ad0c Mon Sep 17 00:00:00 2001
From: dakkar <dakkar@thenautilus.net>
Date: Thu, 22 Sep 2022 17:56:16 +0100
Subject: preparing for Model100 & new Kaleidoscope

---
 Makefile                    | 17 +++------------
 Model01-Firmware.ino        | 51 ---------------------------------------------
 Model01-dakkar-firmware.ino | 51 +++++++++++++++++++++++++++++++++++++++++++++
 sketch.json                 |  6 ++++++
 src/Model01-Firmware.h      |  2 --
 5 files changed, 60 insertions(+), 67 deletions(-)
 delete mode 100644 Model01-Firmware.ino
 create mode 100644 Model01-dakkar-firmware.ino
 create mode 100644 sketch.json
 delete mode 100644 src/Model01-Firmware.h

diff --git a/Makefile b/Makefile
index 91c76f6..8807c96 100644
--- a/Makefile
+++ b/Makefile
@@ -1,20 +1,9 @@
-UNAME_S := $(shell uname -s)
-
 THISDIR := $(shell dirname $(lastword $(MAKEFILE_LIST)))
 
-export SKETCHBOOK_DIR = $(shell readlink -f $(THISDIR)/..)
-
-export ARDUINO_PATH = $(SKETCHBOOK_DIR)/arduino-1.8.7
-export PACKAGE_DIR = $(SKETCHBOOK_DIR)/built
-export LIB_PROPERTIES_PATH = $(THISDIR)
-
-KALEIDOSCOPE_BUILDER_DIR = $(SKETCHBOOK_DIR)/hardware/keyboardio/avr/libraries/Kaleidoscope/bin/
-
-BOARD_HARDWARE_PATH = $(SKETCHBOOK_DIR)/hardware
-KALEIDOSCOPE_PLUGIN_MAKEFILE_DIR = keyboardio/avr/build-tools/makefiles/
+export KALEIDOSCOPE_DIR = $(shell readlink -f $(THISDIR)/../Kaleidoscope)
 
-DAKKAR_VERSION := $(shell grep -E '^version=' $(THISDIR)/library.properties | cut -d= -f2)-$(shell git describe --dirty --always --tags --first-parent)
+DAKKAR_VERSION := $(shell git describe --dirty --always --tags --first-parent)
 
 export LOCAL_CFLAGS = -DBUILD_INFORMATION="$(DAKKAR_VERSION)"
 
-include $(BOARD_HARDWARE_PATH)/$(KALEIDOSCOPE_PLUGIN_MAKEFILE_DIR)/rules.mk
+include $(KALEIDOSCOPE_DIR)/etc/makefiles/sketch.mk
diff --git a/Model01-Firmware.ino b/Model01-Firmware.ino
deleted file mode 100644
index c075ee0..0000000
--- a/Model01-Firmware.ino
+++ /dev/null
@@ -1,51 +0,0 @@
-// -*- mode: c++ -*-
-#include "Kaleidoscope.h"
-
-#include "macros.h"
-
-#include "power-management.h"
-
-#include "combos.h"
-
-#include "keymap-wrapper.h"
-
-#include "color-themes.h"
-//#include "color-picker.h"
-
-/* plugins */
-#include "kaleidoscope/plugin/EEPROM-Settings.h"
-#include "kaleidoscope/plugin/FocusSerial.h"
-#include "kaleidoscope/plugin/MouseKeys.h"
-#include "kaleidoscope/plugin/LEDEffect-BootGreeting.h"
-#include "kaleidoscope/plugin/HardwareTestMode.h"
-
-KALEIDOSCOPE_INIT_PLUGINS(
-  EEPROMSettings,
-
-  Focus,
-  FocusSettingsCommand,
-  FocusEEPROMCommand,
-
-  BootGreetingEffect,
-
-  HardwareTestMode,
-
-  LEDControl,
-  DakkarColorDark, DakkarColorBright,
-  //theColorPicker,
-
-  Macros,
-  MouseKeys,
-  HostPowerManagement,
-  MagicCombo,
-  USBQuirks
-);
-
-void setup() {
-  Kaleidoscope.setup();
-  DakkarColorDark.activate();
-}
-
-void loop() {
-  Kaleidoscope.loop();
-}
diff --git a/Model01-dakkar-firmware.ino b/Model01-dakkar-firmware.ino
new file mode 100644
index 0000000..c075ee0
--- /dev/null
+++ b/Model01-dakkar-firmware.ino
@@ -0,0 +1,51 @@
+// -*- mode: c++ -*-
+#include "Kaleidoscope.h"
+
+#include "macros.h"
+
+#include "power-management.h"
+
+#include "combos.h"
+
+#include "keymap-wrapper.h"
+
+#include "color-themes.h"
+//#include "color-picker.h"
+
+/* plugins */
+#include "kaleidoscope/plugin/EEPROM-Settings.h"
+#include "kaleidoscope/plugin/FocusSerial.h"
+#include "kaleidoscope/plugin/MouseKeys.h"
+#include "kaleidoscope/plugin/LEDEffect-BootGreeting.h"
+#include "kaleidoscope/plugin/HardwareTestMode.h"
+
+KALEIDOSCOPE_INIT_PLUGINS(
+  EEPROMSettings,
+
+  Focus,
+  FocusSettingsCommand,
+  FocusEEPROMCommand,
+
+  BootGreetingEffect,
+
+  HardwareTestMode,
+
+  LEDControl,
+  DakkarColorDark, DakkarColorBright,
+  //theColorPicker,
+
+  Macros,
+  MouseKeys,
+  HostPowerManagement,
+  MagicCombo,
+  USBQuirks
+);
+
+void setup() {
+  Kaleidoscope.setup();
+  DakkarColorDark.activate();
+}
+
+void loop() {
+  Kaleidoscope.loop();
+}
diff --git a/sketch.json b/sketch.json
new file mode 100644
index 0000000..e00344e
--- /dev/null
+++ b/sketch.json
@@ -0,0 +1,6 @@
+{
+  "cpu": {
+    "fqbn": "keyboardio:gd32:keyboardio_model_100",
+    "port": ""
+  }
+}
diff --git a/src/Model01-Firmware.h b/src/Model01-Firmware.h
deleted file mode 100644
index 8a4dc34..0000000
--- a/src/Model01-Firmware.h
+++ /dev/null
@@ -1,2 +0,0 @@
-// Lets make cpplint happy!
-#pragma once
-- 
cgit v1.2.3