From: Martin Mares <mj@ucw.cz>
Date: Tue, 11 Jul 2023 18:49:44 +0000 (+0200)
Subject: Clock: Non-experimental USB ID
X-Git-Url: http://mj.ucw.cz/gitweb/?a=commitdiff_plain;h=bbc1348c82b514e9706c43b45ec931200a67793b;p=home-hw.git

Clock: Non-experimental USB ID
---

diff --git a/USB-IDS b/USB-IDS
index da9a6a0..ad30114 100644
--- a/USB-IDS
+++ b/USB-IDS
@@ -12,5 +12,7 @@ USB IDs used by our gadgets
 4242:000a	Neopixel rainbow bootloader
 4242:000b	RS-485 switch
 4242:000c	RS-485 switch bootloader
+4242:000d	Desktop clock
+4242:000e	Desktop clock bootloader (temporarily has 0008)
 cafe:cafe	KSP Space Alert thermometer
 cafe:caff	KSP Space Alert accelerometer
diff --git a/clock/firmware/Makefile b/clock/firmware/Makefile
index 8d72f34..a9c6c3c 100644
--- a/clock/firmware/Makefile
+++ b/clock/firmware/Makefile
@@ -5,7 +5,7 @@ LIB_OBJS=util-debug.o
 
 WITH_BOOT_LOADER=1
 WITH_DFU_FLASH=1
-DFU_ARGS=-d 4242:0007
+DFU_ARGS=-d 4242:000d
 # DFU_ARGS=-d 4242:0008
 
 include $(ROOT)/mk/bluepill.mk
diff --git a/clock/firmware/main.c b/clock/firmware/main.c
index 27de39d..108c604 100644
--- a/clock/firmware/main.c
+++ b/clock/firmware/main.c
@@ -371,7 +371,7 @@ static const struct usb_device_descriptor device = {
 	.bDeviceProtocol = 0,
 	.bMaxPacketSize0 = 64,
 	.idVendor = 0x4242,
-	.idProduct = 0x0007,
+	.idProduct = 0x000d,
 	.bcdDevice = 0x0000,
 	.iManufacturer = STR_MANUFACTURER,
 	.iProduct = STR_PRODUCT,
diff --git a/clock/host/burrow-clock.c b/clock/host/burrow-clock.c
index 311bd33..6e4e1ad 100644
--- a/clock/host/burrow-clock.c
+++ b/clock/host/burrow-clock.c
@@ -336,7 +336,7 @@ int main(int argc UNUSED, char **argv)
 
 	mqtt_init();
 	main_init();
-	usb_helper_init(0x4242, 0x0007);
+	usb_helper_init(0x4242, 0x000d);
 
 	main_loop();
 	return 0;