product name change for ShadowDuck Hardware

This commit is contained in:
Justin Bland 2024-05-23 13:51:30 +10:00
parent 26becbcd56
commit ea48e79cfe
12 changed files with 52 additions and 40 deletions

View File

@ -10,6 +10,13 @@
"includePath": [
"C:/GitHub/ShadowDuck_Firmware/Shadow Duck Firmware/include",
"C:/GitHub/ShadowDuck_Firmware/Shadow Duck Firmware/src",
"C:/GitHub/ShadowDuck_Firmware/Shadow Duck Firmware/.pio/libdeps/pico/Adafruit SPIFlash/src",
"C:/GitHub/ShadowDuck_Firmware/Shadow Duck Firmware/.pio/libdeps/pico/Adafruit NeoPixel",
"C:/GitHub/ShadowDuck_Firmware/Shadow Duck Firmware/.pio/libdeps/pico/ArduinoJson/src",
"C:/GitHub/ShadowDuck_Firmware/Shadow Duck Firmware/.pio/libdeps/pico/SdFat - Adafruit Fork/src",
"C:/Users/JustinBland/.platformio/packages/framework-arduinopico/libraries/SPI/src",
"C:/GitHub/ShadowDuck_Firmware/Shadow Duck Firmware/.pio/libdeps/pico/Adafruit TinyUSB Library/src",
"C:/GitHub/ShadowDuck_Firmware/Shadow Duck Firmware/.pio/libdeps/pico/SimpleCLI/src",
"C:/Users/JustinBland/.platformio/packages/framework-arduinopico/cores/rp2040",
"C:/Users/JustinBland/.platformio/packages/framework-arduinopico/cores/rp2040/api/deprecated",
"C:/Users/JustinBland/.platformio/packages/framework-arduinopico/cores/rp2040/api/deprecated-avr-comp",
@ -75,9 +82,13 @@
"C:/Users/JustinBland/.platformio/packages/framework-arduinopico/pico-sdk/lib/lwip/src/include",
"C:/Users/JustinBland/.platformio/packages/framework-arduinopico/pico-sdk/lib/btstack/src",
"C:/Users/JustinBland/.platformio/packages/framework-arduinopico/pico-sdk/lib/btstack/platform/embedded",
"C:/Users/JustinBland/.platformio/packages/framework-arduinopico/libraries/Adafruit_TinyUSB_Arduino/src/arduino",
"C:/Users/JustinBland/.platformio/packages/framework-arduinopico/include",
"C:/Users/JustinBland/.platformio/packages/framework-arduinopico/variants/rpipico",
"C:/GitHub/ShadowDuck_Firmware/Shadow Duck Firmware/.pio/libdeps/pico/MIDI Library/src",
"C:/GitHub/ShadowDuck_Firmware/Shadow Duck Firmware/.pio/libdeps/pico/Unity/src",
"C:/Users/JustinBland/.platformio/packages/framework-arduinopico/libraries/ADCInput/src",
"C:/Users/JustinBland/.platformio/packages/framework-arduinopico/libraries/Adafruit_TinyUSB_Arduino/src",
"C:/Users/JustinBland/.platformio/packages/framework-arduinopico/libraries/ArduinoOTA/src",
"C:/Users/JustinBland/.platformio/packages/framework-arduinopico/libraries/AudioBufferManager/src",
"C:/Users/JustinBland/.platformio/packages/framework-arduinopico/libraries/BTstackLib/src",
@ -114,7 +125,6 @@
"C:/Users/JustinBland/.platformio/packages/framework-arduinopico/libraries/PicoOTA/src",
"C:/Users/JustinBland/.platformio/packages/framework-arduinopico/libraries/SD/src",
"C:/Users/JustinBland/.platformio/packages/framework-arduinopico/libraries/SDFS/src",
"C:/Users/JustinBland/.platformio/packages/framework-arduinopico/libraries/SPI/src",
"C:/Users/JustinBland/.platformio/packages/framework-arduinopico/libraries/SPISlave/src",
"C:/Users/JustinBland/.platformio/packages/framework-arduinopico/libraries/SerialBT/src",
"C:/Users/JustinBland/.platformio/packages/framework-arduinopico/libraries/Servo/src",
@ -138,6 +148,13 @@
"path": [
"C:/GitHub/ShadowDuck_Firmware/Shadow Duck Firmware/include",
"C:/GitHub/ShadowDuck_Firmware/Shadow Duck Firmware/src",
"C:/GitHub/ShadowDuck_Firmware/Shadow Duck Firmware/.pio/libdeps/pico/Adafruit SPIFlash/src",
"C:/GitHub/ShadowDuck_Firmware/Shadow Duck Firmware/.pio/libdeps/pico/Adafruit NeoPixel",
"C:/GitHub/ShadowDuck_Firmware/Shadow Duck Firmware/.pio/libdeps/pico/ArduinoJson/src",
"C:/GitHub/ShadowDuck_Firmware/Shadow Duck Firmware/.pio/libdeps/pico/SdFat - Adafruit Fork/src",
"C:/Users/JustinBland/.platformio/packages/framework-arduinopico/libraries/SPI/src",
"C:/GitHub/ShadowDuck_Firmware/Shadow Duck Firmware/.pio/libdeps/pico/Adafruit TinyUSB Library/src",
"C:/GitHub/ShadowDuck_Firmware/Shadow Duck Firmware/.pio/libdeps/pico/SimpleCLI/src",
"C:/Users/JustinBland/.platformio/packages/framework-arduinopico/cores/rp2040",
"C:/Users/JustinBland/.platformio/packages/framework-arduinopico/cores/rp2040/api/deprecated",
"C:/Users/JustinBland/.platformio/packages/framework-arduinopico/cores/rp2040/api/deprecated-avr-comp",
@ -203,9 +220,13 @@
"C:/Users/JustinBland/.platformio/packages/framework-arduinopico/pico-sdk/lib/lwip/src/include",
"C:/Users/JustinBland/.platformio/packages/framework-arduinopico/pico-sdk/lib/btstack/src",
"C:/Users/JustinBland/.platformio/packages/framework-arduinopico/pico-sdk/lib/btstack/platform/embedded",
"C:/Users/JustinBland/.platformio/packages/framework-arduinopico/libraries/Adafruit_TinyUSB_Arduino/src/arduino",
"C:/Users/JustinBland/.platformio/packages/framework-arduinopico/include",
"C:/Users/JustinBland/.platformio/packages/framework-arduinopico/variants/rpipico",
"C:/GitHub/ShadowDuck_Firmware/Shadow Duck Firmware/.pio/libdeps/pico/MIDI Library/src",
"C:/GitHub/ShadowDuck_Firmware/Shadow Duck Firmware/.pio/libdeps/pico/Unity/src",
"C:/Users/JustinBland/.platformio/packages/framework-arduinopico/libraries/ADCInput/src",
"C:/Users/JustinBland/.platformio/packages/framework-arduinopico/libraries/Adafruit_TinyUSB_Arduino/src",
"C:/Users/JustinBland/.platformio/packages/framework-arduinopico/libraries/ArduinoOTA/src",
"C:/Users/JustinBland/.platformio/packages/framework-arduinopico/libraries/AudioBufferManager/src",
"C:/Users/JustinBland/.platformio/packages/framework-arduinopico/libraries/BTstackLib/src",
@ -242,7 +263,6 @@
"C:/Users/JustinBland/.platformio/packages/framework-arduinopico/libraries/PicoOTA/src",
"C:/Users/JustinBland/.platformio/packages/framework-arduinopico/libraries/SD/src",
"C:/Users/JustinBland/.platformio/packages/framework-arduinopico/libraries/SDFS/src",
"C:/Users/JustinBland/.platformio/packages/framework-arduinopico/libraries/SPI/src",
"C:/Users/JustinBland/.platformio/packages/framework-arduinopico/libraries/SPISlave/src",
"C:/Users/JustinBland/.platformio/packages/framework-arduinopico/libraries/SerialBT/src",
"C:/Users/JustinBland/.platformio/packages/framework-arduinopico/libraries/Servo/src",
@ -266,21 +286,22 @@
"PLATFORMIO=60115",
"ARDUINO_RASPBERRY_PI_PICO",
"ARDUINO_ARCH_RP2040",
"USBD_MAX_POWER_MA=250",
"USBD_MAX_POWER_MA=500",
"USE_TINYUSB",
"ARDUINO=10810",
"ARDUINO_ARCH_RP2040",
"F_CPU=133000000L",
"BOARD_NAME=\"rpipico\"",
"BOARD_NAME=\"pico\"",
"ARM_MATH_CM0_FAMILY",
"ARM_MATH_CM0_PLUS",
"TARGET_RP2040",
"PICO_FLASH_SIZE_BYTES=2097152",
"CFG_TUSB_MCU=OPT_MCU_RP2040",
"USB_VID=0x2E8A",
"USB_PID=0x000A",
"USB_VID=0x2e8a",
"USB_PID=0x000a",
"USB_MANUFACTURER=\"Raspberry Pi\"",
"USB_PRODUCT=\"Pico\"",
"SERIALUSB_PID=0x000A",
"SERIALUSB_PID=0x000a",
"PICO_CYW43_ARCH_THREADSAFE_BACKGROUND=1",
"CYW43_LWIP=1",
"LWIP_IPV4=1",

View File

@ -12,8 +12,8 @@
"type": "platformio-debug",
"request": "launch",
"name": "PIO Debug",
"executable": "C:/GitHub/ShadowDuck_Firmware/Shadow Duck Firmware/.pio/build/rpipico/firmware.elf",
"projectEnvName": "rpipico",
"executable": "C:/GitHub/ShadowDuck_Firmware/Shadow Duck Firmware/.pio/build/pico/firmware.elf",
"projectEnvName": "pico",
"toolchainBinDir": "C:/Users/JustinBland/.platformio/packages/toolchain-rp2040-earlephilhower/bin",
"internalConsoleOptions": "openOnSessionStart",
"svdPath": "C:/Users/JustinBland/.platformio/platforms/raspberrypi/misc/svd/rp2040.svd",
@ -26,8 +26,8 @@
"type": "platformio-debug",
"request": "launch",
"name": "PIO Debug (skip Pre-Debug)",
"executable": "C:/GitHub/ShadowDuck_Firmware/Shadow Duck Firmware/.pio/build/rpipico/firmware.elf",
"projectEnvName": "rpipico",
"executable": "C:/GitHub/ShadowDuck_Firmware/Shadow Duck Firmware/.pio/build/pico/firmware.elf",
"projectEnvName": "pico",
"toolchainBinDir": "C:/Users/JustinBland/.platformio/packages/toolchain-rp2040-earlephilhower/bin",
"internalConsoleOptions": "openOnSessionStart",
"svdPath": "C:/Users/JustinBland/.platformio/platforms/raspberrypi/misc/svd/rp2040.svd"
@ -36,8 +36,8 @@
"type": "platformio-debug",
"request": "launch",
"name": "PIO Debug (without uploading)",
"executable": "C:/GitHub/ShadowDuck_Firmware/Shadow Duck Firmware/.pio/build/rpipico/firmware.elf",
"projectEnvName": "rpipico",
"executable": "C:/GitHub/ShadowDuck_Firmware/Shadow Duck Firmware/.pio/build/pico/firmware.elf",
"projectEnvName": "pico",
"toolchainBinDir": "C:/Users/JustinBland/.platformio/packages/toolchain-rp2040-earlephilhower/bin",
"internalConsoleOptions": "openOnSessionStart",
"svdPath": "C:/Users/JustinBland/.platformio/platforms/raspberrypi/misc/svd/rp2040.svd",

View File

@ -86,11 +86,10 @@ namespace cli {
// version
cli.addCmd("version", [](cmd* c) {
debuglnF("[ = USB Nova =]");
debuglnF("[ = ShadowDuck =]");
debugF("Version ");
debugln(VERSION);
debuglnF("Source: https://github.com/spacehuhntech/usbnova");
debuglnF("Made with <3 by Spacehuhn (spacehuhn.com)");
debuglnF("Source: https://github.com/KobolSystems/ShadowDuck_Firmware");
debugln();
}).setDescription(" Print the firmware version.");

View File

@ -21,22 +21,22 @@
// ===== Pin Definitions ===== //
// USB Nova MKI (SAMD21)
// ShadowDuck MKI (SAMD21)
#if defined(ARDUINO_QTPY_M0)
#define LED_PIN 11
#define SELECTOR A0
// USB Nova MKII (RP2040)
// ShadowDuck MKII (RP2040)
#elif defined(ARDUINO_GENERIC_RP2040)
#define LED_PIN 12
#define SELECTOR 13
// DIY USB Nova using Adafruit Trinkey (RP2040)
// DIY ShadowDuck using Adafruit Trinkey (RP2040)
#elif defined(ARDUINO_ADAFRUIT_TRINKEYQT_RP2040)
#define LED_PIN 27
#define SELECTOR 12
// DIY USB Nova using Raspberry Pi Pico (RP2040)
// DIY ShadowDuck using Raspberry Pi Pico (RP2040)
#elif defined(ARDUINO_RASPBERRY_PI_PICO)
#define LED_PIN -1
#define SELECTOR 16

View File

@ -1,5 +1,3 @@
/* This software is licensed under the MIT License: https://github.com/spacehuhntech/usbnova */
#include "hid/hid.h"
#include <Adafruit_TinyUSB.h>
@ -12,8 +10,8 @@ namespace hid {
bool indicator_read = false; // If initial indicator was read
std::string serial = "1337";
std::string manufacturer = "SpacehuhnTech";
std::string product = "USB Nova";
std::string manufacturer = "KobolSystems";
std::string product = "ShadowDuck";
// HID report descriptor using TinyUSB's template
// Single Report (no ID) descriptor

View File

@ -1,9 +1,5 @@
/* This software is licensed under the MIT License: https://github.com/spacehuhntech/usbnova */
#pragma once
// If you get an error here, you probably have selected the wrong board.
// You can find the correct board under Tools > Board.
#include "locale/locale.h"
namespace keyboard {

View File

@ -80,7 +80,7 @@ void setup() {
// Create main_script.txt if it doesn't exist yet
if (!msc::exists(preferences::getMainScript().c_str())) {
char message[21];
sprintf(message, "# USB Nova (v%s)\n", VERSION);
sprintf(message, "# ShadowDuck (v%s)\n", VERSION);
msc::write(preferences::getMainScript().c_str(), message, 20);
}

View File

@ -3,5 +3,5 @@
#pragma once
namespace format {
bool start(const char* drive_name = "USB Nova");
bool start(const char* drive_name = "ShadowDuck");
}

View File

@ -6,7 +6,7 @@
namespace msc {
bool init();
bool format(const char* drive_name = "USB Nova");
bool format(const char* drive_name = "ShadowDuck");
void print();
void enableDrive();

View File

@ -59,7 +59,7 @@ namespace preferences {
}
void toJson(JsonDocument& root) {
root["$schema"] = "https://raw.githubusercontent.com/SpacehuhnTech/USBNova/main/schema.json";
root["$schema"] = "https://raw.githubusercontent.com/KobolSystems/ShadowDuck_Firmware/main/Shadow%20Duck%20Firmware/src/schema.json";
root["enable_msc"] = enable_msc;
root["enable_led"] = enable_led;
@ -193,8 +193,8 @@ namespace preferences {
pid = "11A4";
version = "0100";
serial = "1337";
manufacturer = "SpacehuhnTech";
product = "USB Nova";
manufacturer = "KobolSystems";
product = "ShadowDuck";
default_layout = "US";
default_delay = 5;
@ -217,7 +217,7 @@ namespace preferences {
idle_color[3] = 0;
format = false;
drive_name = "USB Nova";
drive_name = "ShadowDuck";
disable_capslock = true;
run_on_indicator = false;

View File

@ -1,5 +1,3 @@
/* This software is licensed under the MIT License: https://github.com/spacehuhntech/usbnova */
#pragma once
#include <string>

View File

@ -39,7 +39,7 @@
},
"preferences": {
"title": "Preferences",
"description": "Preferences for your USB Nova",
"description": "Preferences for your ShadowDuck",
"type": "object",
"additionalProperties": false,
"properties": {
@ -98,12 +98,12 @@
"manufacturer": {
"type": "string",
"title": "USB Manufacturer Descriptor",
"default": "SpacehuhnTech"
"default": "Kobol Systems"
},
"product": {
"type": "string",
"title": "USB Product Descriptor",
"default": "USB Nova"
"default": "ShadowDuck"
},
"default_layout": {
"type": "string",