From 4fe31aca6b82789b1b4c2e3d30c055d45de16cf8 Mon Sep 17 00:00:00 2001
From: Katharina Fey <kookie@spacekookie.de>
Date: Fri, 7 May 2021 16:40:20 +0200
Subject: [PATCH] euro-yesman-1u: work in progress board updates

---
 .../euro-yesman-1u/board/button_leds.sch      |  856 +++++++++++
 .../euro-yesman-1u/board/button_leds.sch-bak  |  664 +++++++++
 .../board/yesman-board-cache.lib              |   80 +-
 .../euro-yesman-1u/board/yesman-board.sch     | 1303 ++---------------
 .../euro-yesman-1u/board/yesman-board.sch-bak | 1303 ++---------------
 hardware/devices/euro-yesman-1u/src/io.rs     |  121 +-
 hardware/devices/euro-yesman-1u/src/main.rs   |  205 ++-
 7 files changed, 2050 insertions(+), 2482 deletions(-)
 create mode 100644 hardware/devices/euro-yesman-1u/board/button_leds.sch
 create mode 100644 hardware/devices/euro-yesman-1u/board/button_leds.sch-bak

diff --git a/hardware/devices/euro-yesman-1u/board/button_leds.sch b/hardware/devices/euro-yesman-1u/board/button_leds.sch
new file mode 100644
index 00000000000..2d6c70c1f89
--- /dev/null
+++ b/hardware/devices/euro-yesman-1u/board/button_leds.sch
@@ -0,0 +1,856 @@
+EESchema Schematic File Version 4
+EELAYER 30 0
+EELAYER END
+$Descr A4 11693 8268
+encoding utf-8
+Sheet 2 2
+Title "Button and LED I/O section"
+Date "2021-05-06"
+Rev "A1"
+Comp "breadmachine"
+Comment1 ""
+Comment2 ""
+Comment3 ""
+Comment4 ""
+$EndDescr
+Connection ~ 10250 2600
+Wire Wire Line
+	10250 2600 10250 1650
+Connection ~ 8800 2600
+Wire Wire Line
+	8800 2600 8800 1650
+Connection ~ 7350 2600
+Wire Wire Line
+	7350 2600 7350 1650
+Connection ~ 5700 2600
+Wire Wire Line
+	5700 1650 5700 2600
+Connection ~ 4200 2600
+Wire Wire Line
+	4200 2600 4200 1650
+Connection ~ 10250 4000
+Wire Wire Line
+	10250 2600 10150 2600
+Wire Wire Line
+	10250 4000 10250 2600
+Wire Wire Line
+	10250 4000 10150 4000
+Wire Wire Line
+	10250 5450 10250 4000
+Wire Wire Line
+	10150 5450 10250 5450
+Connection ~ 8800 4000
+Wire Wire Line
+	8800 2600 8700 2600
+Wire Wire Line
+	8800 4000 8800 2600
+Wire Wire Line
+	8800 4000 8700 4000
+Wire Wire Line
+	8800 5450 8800 4000
+Wire Wire Line
+	8700 5450 8800 5450
+Connection ~ 7350 4000
+Wire Wire Line
+	7350 5450 7250 5450
+Wire Wire Line
+	7350 4000 7350 5450
+Wire Wire Line
+	7350 4000 7250 4000
+Wire Wire Line
+	7350 2600 7350 4000
+Wire Wire Line
+	7250 2600 7350 2600
+Connection ~ 5700 4000
+Wire Wire Line
+	5700 2600 5600 2600
+Wire Wire Line
+	5700 4000 5700 2600
+Wire Wire Line
+	5700 4000 5600 4000
+Wire Wire Line
+	5700 5450 5700 4000
+Wire Wire Line
+	5600 5450 5700 5450
+Connection ~ 4200 4000
+Wire Wire Line
+	4200 5450 4100 5450
+Wire Wire Line
+	4200 4000 4200 5450
+Wire Wire Line
+	4200 4000 4100 4000
+Wire Wire Line
+	4200 2600 4200 4000
+Wire Wire Line
+	4100 2600 4200 2600
+Wire Wire Line
+	9000 5450 9550 5450
+Wire Wire Line
+	9000 5900 9000 5450
+Wire Wire Line
+	7550 5900 9000 5900
+Wire Wire Line
+	7550 5450 8100 5450
+Wire Wire Line
+	7550 5900 7550 5450
+Wire Wire Line
+	5900 5900 7550 5900
+Wire Wire Line
+	5900 5450 6650 5450
+Wire Wire Line
+	5900 5900 5900 5450
+Wire Wire Line
+	4400 5900 5900 5900
+Wire Wire Line
+	4400 5450 5000 5450
+Wire Wire Line
+	4400 5900 4400 5450
+Wire Wire Line
+	2900 5900 4400 5900
+Connection ~ 1800 5900
+Wire Wire Line
+	2900 5450 3500 5450
+Wire Wire Line
+	2900 5900 2900 5450
+Wire Wire Line
+	1800 5900 2900 5900
+Wire Wire Line
+	1800 5900 1450 5900
+Wire Wire Line
+	1800 5450 1800 5900
+Wire Wire Line
+	2000 5450 1800 5450
+Wire Wire Line
+	9000 4000 9550 4000
+Wire Wire Line
+	9000 4450 9000 4000
+Wire Wire Line
+	7550 4450 9000 4450
+Wire Wire Line
+	7550 4000 8100 4000
+Wire Wire Line
+	7550 4450 7550 4000
+Wire Wire Line
+	5900 4450 7550 4450
+Wire Wire Line
+	5900 4450 5900 4000
+Wire Wire Line
+	4400 4450 5900 4450
+Wire Wire Line
+	4400 4000 5000 4000
+Wire Wire Line
+	4400 4450 4400 4000
+Wire Wire Line
+	2900 4450 4400 4450
+Connection ~ 1800 4450
+Wire Wire Line
+	2900 4450 1800 4450
+Wire Wire Line
+	2900 4000 2900 4450
+Wire Wire Line
+	3500 4000 2900 4000
+Wire Wire Line
+	1800 4450 1450 4450
+Wire Wire Line
+	1800 4000 1800 4450
+Wire Wire Line
+	2000 4000 1800 4000
+Connection ~ 2700 2600
+Wire Wire Line
+	2700 4000 2600 4000
+Wire Wire Line
+	2700 2600 2700 1650
+Wire Wire Line
+	2600 2600 2700 2600
+Wire Wire Line
+	9000 2600 9550 2600
+Wire Wire Line
+	9000 3050 9000 2600
+Wire Wire Line
+	7550 3050 9000 3050
+Wire Wire Line
+	7550 2600 8100 2600
+Wire Wire Line
+	7550 3050 7550 2600
+Wire Wire Line
+	5900 3050 5900 2600
+Wire Wire Line
+	4400 3050 5900 3050
+Wire Wire Line
+	4400 3050 4400 2600
+Wire Wire Line
+	2900 3050 4400 3050
+Connection ~ 1800 3050
+Wire Wire Line
+	2900 2600 3500 2600
+Wire Wire Line
+	2900 3050 2900 2600
+Wire Wire Line
+	1800 3050 2900 3050
+Wire Wire Line
+	1800 2600 2000 2600
+Wire Wire Line
+	1800 3050 1800 2600
+Wire Wire Line
+	1450 3050 1800 3050
+Text HLabel 1450 5900 0    50   Input ~ 0
+LED_C
+Text HLabel 1450 4450 0    50   Input ~ 0
+LED_B
+Text HLabel 1450 3050 0    50   Input ~ 0
+LED_A
+Text HLabel 10250 1650 1    50   Input ~ 0
+LED_6
+Text HLabel 8800 1650 1    50   Input ~ 0
+LED_5
+Text HLabel 7350 1650 1    50   Input ~ 0
+LED_4
+Text HLabel 5700 1650 1    50   Input ~ 0
+LED_3
+Text HLabel 4200 1650 1    50   Input ~ 0
+LED_2
+Text HLabel 2700 1650 1    50   Input ~ 0
+LED_1
+$Comp
+L Switch:SW_MEC_5G_2LED SW?
+U 1 1 609B64D3
+P 9850 3900
+F 0 "SW?" H 9850 4385 50  0000 C CNN
+F 1 "SW_MEC_5G_2LED" H 9850 4294 50  0000 C CNN
+F 2 "" H 9850 4300 50  0001 C CNN
+F 3 "http://www.apem.com/int/index.php?controller=attachment&id_attachment=488" H 9850 4300 50  0001 C CNN
+	1    9850 3900
+	1    0    0    -1  
+$EndComp
+$Comp
+L Switch:SW_MEC_5G_2LED SW?
+U 1 1 609B64C9
+P 9850 2500
+F 0 "SW?" H 9850 2985 50  0000 C CNN
+F 1 "SW_MEC_5G_2LED" H 9850 2894 50  0000 C CNN
+F 2 "" H 9850 2900 50  0001 C CNN
+F 3 "http://www.apem.com/int/index.php?controller=attachment&id_attachment=488" H 9850 2900 50  0001 C CNN
+	1    9850 2500
+	1    0    0    -1  
+$EndComp
+$Comp
+L Switch:SW_MEC_5G_2LED SW?
+U 1 1 609B64BF
+P 9850 5350
+F 0 "SW?" H 9850 5835 50  0000 C CNN
+F 1 "SW_MEC_5G_2LED" H 9850 5744 50  0000 C CNN
+F 2 "" H 9850 5750 50  0001 C CNN
+F 3 "http://www.apem.com/int/index.php?controller=attachment&id_attachment=488" H 9850 5750 50  0001 C CNN
+	1    9850 5350
+	1    0    0    -1  
+$EndComp
+$Comp
+L Switch:SW_MEC_5G_2LED SW?
+U 1 1 609B64B5
+P 8400 3900
+F 0 "SW?" H 8400 4385 50  0000 C CNN
+F 1 "SW_MEC_5G_2LED" H 8400 4294 50  0000 C CNN
+F 2 "" H 8400 4300 50  0001 C CNN
+F 3 "http://www.apem.com/int/index.php?controller=attachment&id_attachment=488" H 8400 4300 50  0001 C CNN
+	1    8400 3900
+	1    0    0    -1  
+$EndComp
+$Comp
+L Switch:SW_MEC_5G_2LED SW?
+U 1 1 609B64AB
+P 8400 2500
+F 0 "SW?" H 8400 2985 50  0000 C CNN
+F 1 "SW_MEC_5G_2LED" H 8400 2894 50  0000 C CNN
+F 2 "" H 8400 2900 50  0001 C CNN
+F 3 "http://www.apem.com/int/index.php?controller=attachment&id_attachment=488" H 8400 2900 50  0001 C CNN
+	1    8400 2500
+	1    0    0    -1  
+$EndComp
+$Comp
+L Switch:SW_MEC_5G_2LED SW?
+U 1 1 609B617B
+P 8400 5350
+F 0 "SW?" H 8400 5835 50  0000 C CNN
+F 1 "SW_MEC_5G_2LED" H 8400 5744 50  0000 C CNN
+F 2 "" H 8400 5750 50  0001 C CNN
+F 3 "http://www.apem.com/int/index.php?controller=attachment&id_attachment=488" H 8400 5750 50  0001 C CNN
+	1    8400 5350
+	1    0    0    -1  
+$EndComp
+$Comp
+L Switch:SW_MEC_5G_2LED SW?
+U 1 1 60999F0F
+P 6950 3900
+F 0 "SW?" H 6950 4385 50  0000 C CNN
+F 1 "SW_MEC_5G_2LED" H 6950 4294 50  0000 C CNN
+F 2 "" H 6950 4300 50  0001 C CNN
+F 3 "http://www.apem.com/int/index.php?controller=attachment&id_attachment=488" H 6950 4300 50  0001 C CNN
+	1    6950 3900
+	1    0    0    -1  
+$EndComp
+$Comp
+L Switch:SW_MEC_5G_2LED SW?
+U 1 1 60999F09
+P 6950 2500
+F 0 "SW?" H 6950 2985 50  0000 C CNN
+F 1 "SW_MEC_5G_2LED" H 6950 2894 50  0000 C CNN
+F 2 "" H 6950 2900 50  0001 C CNN
+F 3 "http://www.apem.com/int/index.php?controller=attachment&id_attachment=488" H 6950 2900 50  0001 C CNN
+	1    6950 2500
+	1    0    0    -1  
+$EndComp
+$Comp
+L Switch:SW_MEC_5G_2LED SW?
+U 1 1 60999F03
+P 6950 5350
+F 0 "SW?" H 6950 5835 50  0000 C CNN
+F 1 "SW_MEC_5G_2LED" H 6950 5744 50  0000 C CNN
+F 2 "" H 6950 5750 50  0001 C CNN
+F 3 "http://www.apem.com/int/index.php?controller=attachment&id_attachment=488" H 6950 5750 50  0001 C CNN
+	1    6950 5350
+	1    0    0    -1  
+$EndComp
+$Comp
+L Switch:SW_MEC_5G_2LED SW?
+U 1 1 60999EFD
+P 5300 3900
+F 0 "SW?" H 5300 4385 50  0000 C CNN
+F 1 "SW_MEC_5G_2LED" H 5300 4294 50  0000 C CNN
+F 2 "" H 5300 4300 50  0001 C CNN
+F 3 "http://www.apem.com/int/index.php?controller=attachment&id_attachment=488" H 5300 4300 50  0001 C CNN
+	1    5300 3900
+	1    0    0    -1  
+$EndComp
+$Comp
+L Switch:SW_MEC_5G_2LED SW?
+U 1 1 60999EF7
+P 5300 2500
+F 0 "SW?" H 5300 2985 50  0000 C CNN
+F 1 "SW_MEC_5G_2LED" H 5300 2894 50  0000 C CNN
+F 2 "" H 5300 2900 50  0001 C CNN
+F 3 "http://www.apem.com/int/index.php?controller=attachment&id_attachment=488" H 5300 2900 50  0001 C CNN
+	1    5300 2500
+	1    0    0    -1  
+$EndComp
+$Comp
+L Switch:SW_MEC_5G_2LED SW?
+U 1 1 60999EF1
+P 5300 5350
+F 0 "SW?" H 5300 5835 50  0000 C CNN
+F 1 "SW_MEC_5G_2LED" H 5300 5744 50  0000 C CNN
+F 2 "" H 5300 5750 50  0001 C CNN
+F 3 "http://www.apem.com/int/index.php?controller=attachment&id_attachment=488" H 5300 5750 50  0001 C CNN
+	1    5300 5350
+	1    0    0    -1  
+$EndComp
+$Comp
+L Switch:SW_MEC_5G_2LED SW?
+U 1 1 609947E5
+P 3800 3900
+F 0 "SW?" H 3800 4385 50  0000 C CNN
+F 1 "SW_MEC_5G_2LED" H 3800 4294 50  0000 C CNN
+F 2 "" H 3800 4300 50  0001 C CNN
+F 3 "http://www.apem.com/int/index.php?controller=attachment&id_attachment=488" H 3800 4300 50  0001 C CNN
+	1    3800 3900
+	1    0    0    -1  
+$EndComp
+$Comp
+L Switch:SW_MEC_5G_2LED SW?
+U 1 1 609947DF
+P 3800 2500
+F 0 "SW?" H 3800 2985 50  0000 C CNN
+F 1 "SW_MEC_5G_2LED" H 3800 2894 50  0000 C CNN
+F 2 "" H 3800 2900 50  0001 C CNN
+F 3 "http://www.apem.com/int/index.php?controller=attachment&id_attachment=488" H 3800 2900 50  0001 C CNN
+	1    3800 2500
+	1    0    0    -1  
+$EndComp
+$Comp
+L Switch:SW_MEC_5G_2LED SW?
+U 1 1 609947D9
+P 3800 5350
+F 0 "SW?" H 3800 5835 50  0000 C CNN
+F 1 "SW_MEC_5G_2LED" H 3800 5744 50  0000 C CNN
+F 2 "" H 3800 5750 50  0001 C CNN
+F 3 "http://www.apem.com/int/index.php?controller=attachment&id_attachment=488" H 3800 5750 50  0001 C CNN
+	1    3800 5350
+	1    0    0    -1  
+$EndComp
+$Comp
+L Switch:SW_MEC_5G_2LED SW?
+U 1 1 6098AC56
+P 2300 3900
+F 0 "SW?" H 2300 4385 50  0000 C CNN
+F 1 "SW_MEC_5G_2LED" H 2300 4294 50  0000 C CNN
+F 2 "" H 2300 4300 50  0001 C CNN
+F 3 "http://www.apem.com/int/index.php?controller=attachment&id_attachment=488" H 2300 4300 50  0001 C CNN
+	1    2300 3900
+	1    0    0    -1  
+$EndComp
+$Comp
+L Switch:SW_MEC_5G_2LED SW?
+U 1 1 60989FEA
+P 2300 2500
+F 0 "SW?" H 2300 2100 50  0000 C CNN
+F 1 "SW_MEC_5G_2LED" H 2300 2894 50  0000 C CNN
+F 2 "" H 2300 2900 50  0001 C CNN
+F 3 "http://www.apem.com/int/index.php?controller=attachment&id_attachment=488" H 2300 2900 50  0001 C CNN
+	1    2300 2500
+	1    0    0    -1  
+$EndComp
+$Comp
+L Switch:SW_MEC_5G_2LED SW?
+U 1 1 60989410
+P 2300 5350
+F 0 "SW?" H 2300 5835 50  0000 C CNN
+F 1 "SW_MEC_5G_2LED" H 2300 5744 50  0000 C CNN
+F 2 "" H 2300 5750 50  0001 C CNN
+F 3 "http://www.apem.com/int/index.php?controller=attachment&id_attachment=488" H 2300 5750 50  0001 C CNN
+	1    2300 5350
+	1    0    0    -1  
+$EndComp
+Wire Wire Line
+	2700 2600 2700 4000
+Connection ~ 2700 4000
+Wire Wire Line
+	2700 4000 2700 5450
+Wire Wire Line
+	2700 5450 2600 5450
+Text HLabel 1450 1850 0    50   Input ~ 0
+BTN_A
+Wire Wire Line
+	1450 1850 1800 1850
+Wire Wire Line
+	1800 2300 2000 2300
+Wire Wire Line
+	1800 1850 2900 1850
+Wire Wire Line
+	2900 1850 2900 2300
+Wire Wire Line
+	3350 2300 3500 2300
+Connection ~ 1800 1850
+Wire Wire Line
+	3400 1850 4400 1850
+Wire Wire Line
+	4400 1850 4400 2300
+Wire Wire Line
+	4400 2300 4500 2300
+Wire Wire Line
+	4900 1850 5900 1850
+Wire Wire Line
+	5900 1850 5900 2300
+Wire Wire Line
+	6550 1850 7550 1850
+Wire Wire Line
+	7550 1850 7550 2300
+Wire Wire Line
+	7550 2300 7650 2300
+Wire Wire Line
+	7550 1850 9000 1850
+Wire Wire Line
+	9000 1850 9000 2300
+Wire Wire Line
+	9000 2300 9100 2300
+Text HLabel 1450 3250 0    50   Input ~ 0
+BTN_B
+Wire Wire Line
+	1800 3250 1800 3700
+Wire Wire Line
+	1800 3250 1450 3250
+Wire Wire Line
+	2000 3700 1800 3700
+Wire Wire Line
+	1800 3250 2900 3250
+Wire Wire Line
+	2900 3250 2900 3700
+Wire Wire Line
+	3350 3700 3500 3700
+Connection ~ 1800 3250
+Wire Wire Line
+	2900 3250 4400 3250
+Wire Wire Line
+	4400 3250 4400 3700
+Wire Wire Line
+	4400 3700 4500 3700
+Wire Wire Line
+	4400 3250 5900 3250
+Wire Wire Line
+	5900 3250 5900 3700
+Wire Wire Line
+	7550 3250 7550 3700
+Wire Wire Line
+	7550 3700 7650 3700
+Wire Wire Line
+	7550 3250 9000 3250
+Wire Wire Line
+	9000 3250 9000 3700
+Wire Wire Line
+	9000 3700 9100 3700
+Text HLabel 1450 4650 0    50   Input ~ 0
+BTN_C
+Wire Wire Line
+	2000 5150 1800 5150
+Wire Wire Line
+	1800 5150 1800 4650
+Wire Wire Line
+	1800 4650 1450 4650
+Wire Wire Line
+	1800 4650 2900 4650
+Wire Wire Line
+	2900 4650 2900 5150
+Wire Wire Line
+	3350 5150 3500 5150
+Connection ~ 1800 4650
+Wire Wire Line
+	2900 4650 4400 4650
+Wire Wire Line
+	4400 4650 4400 5150
+Wire Wire Line
+	4400 5150 4500 5150
+Wire Wire Line
+	4400 4650 5900 4650
+Wire Wire Line
+	5900 4650 5900 5150
+Wire Wire Line
+	5900 4650 7550 4650
+Wire Wire Line
+	7550 4650 7550 5150
+Wire Wire Line
+	7550 5150 7650 5150
+Wire Wire Line
+	7550 4650 9000 4650
+Wire Wire Line
+	9000 4650 9000 5150
+Wire Wire Line
+	9000 5150 9100 5150
+Text HLabel 2800 1650 1    50   Input ~ 0
+BTN_1
+Text HLabel 4300 1650 1    50   Input ~ 0
+BTN_2
+Text HLabel 5800 1650 1    50   Input ~ 0
+BTN_3
+Text HLabel 7450 1650 1    50   Input ~ 0
+BTN_4
+Wire Wire Line
+	2800 2300 2600 2300
+Wire Wire Line
+	2800 2300 2800 3700
+Wire Wire Line
+	2800 3700 2600 3700
+Connection ~ 2800 2300
+Wire Wire Line
+	2800 3700 2800 5150
+Wire Wire Line
+	2800 5150 2600 5150
+Connection ~ 2800 3700
+Wire Wire Line
+	4300 1650 4300 2300
+Wire Wire Line
+	4300 2300 4100 2300
+Wire Wire Line
+	4300 2300 4300 3700
+Wire Wire Line
+	4300 3700 4100 3700
+Connection ~ 4300 2300
+Wire Wire Line
+	4300 3700 4300 5150
+Wire Wire Line
+	4300 5150 4100 5150
+Connection ~ 4300 3700
+Wire Wire Line
+	5800 1650 5800 2300
+Wire Wire Line
+	5800 2300 5600 2300
+Wire Wire Line
+	5800 2300 5800 3700
+Wire Wire Line
+	5800 3700 5600 3700
+Connection ~ 5800 2300
+Wire Wire Line
+	5800 3700 5800 5150
+Wire Wire Line
+	5800 5150 5600 5150
+Connection ~ 5800 3700
+Wire Wire Line
+	7450 1650 7450 2300
+Wire Wire Line
+	7450 2300 7250 2300
+Wire Wire Line
+	7450 2300 7450 3700
+Wire Wire Line
+	7450 3700 7250 3700
+Connection ~ 7450 2300
+Wire Wire Line
+	7450 3700 7450 5150
+Wire Wire Line
+	7450 5150 7250 5150
+Connection ~ 7450 3700
+Text HLabel 8900 1650 1    50   Input ~ 0
+BTN_5
+Text HLabel 10350 1650 1    50   Input ~ 0
+BTN_6
+Wire Wire Line
+	8900 1650 8900 2300
+Wire Wire Line
+	8900 2300 8700 2300
+Wire Wire Line
+	8900 2300 8900 3700
+Wire Wire Line
+	8900 3700 8700 3700
+Connection ~ 8900 2300
+Wire Wire Line
+	8900 3700 8900 5150
+Wire Wire Line
+	8900 5150 8700 5150
+Connection ~ 8900 3700
+Wire Wire Line
+	10350 1650 10350 2300
+Wire Wire Line
+	10350 2300 10150 2300
+Wire Wire Line
+	10350 2300 10350 3700
+Wire Wire Line
+	10350 3700 10150 3700
+Connection ~ 10350 2300
+Wire Wire Line
+	10350 3700 10350 5150
+Wire Wire Line
+	10350 5150 10150 5150
+Connection ~ 10350 3700
+Wire Wire Line
+	2800 1650 2800 2300
+Wire Wire Line
+	1800 1850 1800 2300
+$Comp
+L Device:D D?
+U 1 1 60DBF379
+P 9250 2300
+F 0 "D?" H 9250 2083 50  0000 C CNN
+F 1 "D" H 9250 2174 50  0000 C CNN
+F 2 "" H 9250 2300 50  0001 C CNN
+F 3 "~" H 9250 2300 50  0001 C CNN
+	1    9250 2300
+	-1   0    0    1   
+$EndComp
+$Comp
+L Device:D D?
+U 1 1 60DC02FA
+P 9250 3700
+F 0 "D?" H 9250 3483 50  0000 C CNN
+F 1 "D" H 9250 3574 50  0000 C CNN
+F 2 "" H 9250 3700 50  0001 C CNN
+F 3 "~" H 9250 3700 50  0001 C CNN
+	1    9250 3700
+	-1   0    0    1   
+$EndComp
+$Comp
+L Device:D D?
+U 1 1 60DC25F1
+P 9250 5150
+F 0 "D?" H 9250 4933 50  0000 C CNN
+F 1 "D" H 9250 5024 50  0000 C CNN
+F 2 "" H 9250 5150 50  0001 C CNN
+F 3 "~" H 9250 5150 50  0001 C CNN
+	1    9250 5150
+	-1   0    0    1   
+$EndComp
+Wire Wire Line
+	9400 5150 9550 5150
+Wire Wire Line
+	9550 3700 9400 3700
+Wire Wire Line
+	9550 2300 9400 2300
+$Comp
+L Device:D D?
+U 1 1 60E3106F
+P 7800 2300
+F 0 "D?" H 7800 2083 50  0000 C CNN
+F 1 "D" H 7800 2174 50  0000 C CNN
+F 2 "" H 7800 2300 50  0001 C CNN
+F 3 "~" H 7800 2300 50  0001 C CNN
+	1    7800 2300
+	-1   0    0    1   
+$EndComp
+$Comp
+L Device:D D?
+U 1 1 60E318F8
+P 7800 3700
+F 0 "D?" H 7800 3483 50  0000 C CNN
+F 1 "D" H 7800 3574 50  0000 C CNN
+F 2 "" H 7800 3700 50  0001 C CNN
+F 3 "~" H 7800 3700 50  0001 C CNN
+	1    7800 3700
+	-1   0    0    1   
+$EndComp
+$Comp
+L Device:D D?
+U 1 1 60E3237B
+P 7800 5150
+F 0 "D?" H 7800 4933 50  0000 C CNN
+F 1 "D" H 7800 5024 50  0000 C CNN
+F 2 "" H 7800 5150 50  0001 C CNN
+F 3 "~" H 7800 5150 50  0001 C CNN
+	1    7800 5150
+	-1   0    0    1   
+$EndComp
+Wire Wire Line
+	8100 5150 7950 5150
+Wire Wire Line
+	8100 3700 7950 3700
+Wire Wire Line
+	7950 2300 8100 2300
+Connection ~ 7550 3250
+Connection ~ 7550 3050
+Connection ~ 7550 1850
+Connection ~ 7550 4650
+Connection ~ 7550 4450
+Connection ~ 7550 5900
+$Comp
+L Device:D D?
+U 1 1 60F19BB6
+P 6250 2300
+F 0 "D?" H 6250 2083 50  0000 C CNN
+F 1 "D" H 6250 2174 50  0000 C CNN
+F 2 "" H 6250 2300 50  0001 C CNN
+F 3 "~" H 6250 2300 50  0001 C CNN
+	1    6250 2300
+	-1   0    0    1   
+$EndComp
+$Comp
+L Device:D D?
+U 1 1 60F1A340
+P 6250 3700
+F 0 "D?" H 6250 3483 50  0000 C CNN
+F 1 "D" H 6250 3574 50  0000 C CNN
+F 2 "" H 6250 3700 50  0001 C CNN
+F 3 "~" H 6250 3700 50  0001 C CNN
+	1    6250 3700
+	-1   0    0    1   
+$EndComp
+$Comp
+L Device:D D?
+U 1 1 60F1AD19
+P 6250 5150
+F 0 "D?" H 6250 4933 50  0000 C CNN
+F 1 "D" H 6250 5024 50  0000 C CNN
+F 2 "" H 6250 5150 50  0001 C CNN
+F 3 "~" H 6250 5150 50  0001 C CNN
+	1    6250 5150
+	-1   0    0    1   
+$EndComp
+Wire Wire Line
+	6400 5150 6650 5150
+Wire Wire Line
+	6400 3700 6650 3700
+Wire Wire Line
+	6400 2300 6650 2300
+Wire Wire Line
+	6100 2300 5900 2300
+Wire Wire Line
+	5900 2600 6650 2600
+Wire Wire Line
+	5900 3050 7550 3050
+Connection ~ 5900 3050
+Wire Wire Line
+	5900 3250 7550 3250
+Connection ~ 5900 3250
+Wire Wire Line
+	6100 3700 5900 3700
+Wire Wire Line
+	5900 4000 6650 4000
+Connection ~ 5900 4450
+Connection ~ 5900 4650
+Wire Wire Line
+	5900 5150 6100 5150
+Connection ~ 5900 5900
+$Comp
+L Device:D D?
+U 1 1 60FFB6B4
+P 4650 2300
+F 0 "D?" H 4650 2083 50  0000 C CNN
+F 1 "D" H 4650 2174 50  0000 C CNN
+F 2 "" H 4650 2300 50  0001 C CNN
+F 3 "~" H 4650 2300 50  0001 C CNN
+	1    4650 2300
+	-1   0    0    1   
+$EndComp
+$Comp
+L Device:D D?
+U 1 1 61002B27
+P 4650 3700
+F 0 "D?" H 4650 3483 50  0000 C CNN
+F 1 "D" H 4650 3574 50  0000 C CNN
+F 2 "" H 4650 3700 50  0001 C CNN
+F 3 "~" H 4650 3700 50  0001 C CNN
+	1    4650 3700
+	-1   0    0    1   
+$EndComp
+$Comp
+L Device:D D?
+U 1 1 610036A7
+P 4650 5150
+F 0 "D?" H 4650 4933 50  0000 C CNN
+F 1 "D" H 4650 5024 50  0000 C CNN
+F 2 "" H 4650 5150 50  0001 C CNN
+F 3 "~" H 4650 5150 50  0001 C CNN
+	1    4650 5150
+	-1   0    0    1   
+$EndComp
+Wire Wire Line
+	5000 5150 4800 5150
+Wire Wire Line
+	5000 3700 4800 3700
+Wire Wire Line
+	5000 2300 4800 2300
+Wire Wire Line
+	4400 2600 5000 2600
+Connection ~ 4400 5900
+Connection ~ 4400 4650
+Connection ~ 4400 4450
+Connection ~ 4400 3250
+Connection ~ 4400 3050
+$Comp
+L Device:D D?
+U 1 1 610FFBA4
+P 3200 2300
+F 0 "D?" H 3200 2083 50  0000 C CNN
+F 1 "D" H 3200 2174 50  0000 C CNN
+F 2 "" H 3200 2300 50  0001 C CNN
+F 3 "~" H 3200 2300 50  0001 C CNN
+	1    3200 2300
+	-1   0    0    1   
+$EndComp
+$Comp
+L Device:D D?
+U 1 1 6110C54E
+P 3200 3700
+F 0 "D?" H 3200 3483 50  0000 C CNN
+F 1 "D" H 3200 3574 50  0000 C CNN
+F 2 "" H 3200 3700 50  0001 C CNN
+F 3 "~" H 3200 3700 50  0001 C CNN
+	1    3200 3700
+	-1   0    0    1   
+$EndComp
+$Comp
+L Device:D D?
+U 1 1 6111A764
+P 3200 5150
+F 0 "D?" H 3200 4933 50  0000 C CNN
+F 1 "D" H 3200 5024 50  0000 C CNN
+F 2 "" H 3200 5150 50  0001 C CNN
+F 3 "~" H 3200 5150 50  0001 C CNN
+	1    3200 5150
+	-1   0    0    1   
+$EndComp
+Wire Wire Line
+	3050 2300 2900 2300
+Connection ~ 2900 3050
+Connection ~ 2900 3250
+Wire Wire Line
+	2900 3700 3050 3700
+Connection ~ 2900 4450
+Connection ~ 2900 4650
+Wire Wire Line
+	3050 5150 2900 5150
+Connection ~ 2900 5900
+$EndSCHEMATC
diff --git a/hardware/devices/euro-yesman-1u/board/button_leds.sch-bak b/hardware/devices/euro-yesman-1u/board/button_leds.sch-bak
new file mode 100644
index 00000000000..30d68bc75ae
--- /dev/null
+++ b/hardware/devices/euro-yesman-1u/board/button_leds.sch-bak
@@ -0,0 +1,664 @@
+EESchema Schematic File Version 4
+EELAYER 30 0
+EELAYER END
+$Descr A4 11693 8268
+encoding utf-8
+Sheet 2 2
+Title "Button and LED I/O section"
+Date "2021-05-06"
+Rev "A1"
+Comp "breadmachine"
+Comment1 ""
+Comment2 ""
+Comment3 ""
+Comment4 ""
+$EndDescr
+Connection ~ 8500 2500
+Wire Wire Line
+	8500 2500 8500 1550
+Connection ~ 7500 2500
+Wire Wire Line
+	7500 2500 7500 1550
+Connection ~ 6500 2500
+Wire Wire Line
+	6500 2500 6500 1550
+Connection ~ 5500 2500
+Wire Wire Line
+	5500 1550 5500 2500
+Connection ~ 4500 2500
+Wire Wire Line
+	4500 2500 4500 1550
+Connection ~ 8500 3900
+Wire Wire Line
+	8500 2500 8400 2500
+Wire Wire Line
+	8500 3900 8500 2500
+Wire Wire Line
+	8500 3900 8400 3900
+Wire Wire Line
+	8500 5350 8500 3900
+Wire Wire Line
+	8400 5350 8500 5350
+Connection ~ 7500 3900
+Wire Wire Line
+	7500 2500 7400 2500
+Wire Wire Line
+	7500 3900 7500 2500
+Wire Wire Line
+	7500 3900 7400 3900
+Wire Wire Line
+	7500 5350 7500 3900
+Wire Wire Line
+	7400 5350 7500 5350
+Connection ~ 6500 3900
+Wire Wire Line
+	6500 5350 6400 5350
+Wire Wire Line
+	6500 3900 6500 5350
+Wire Wire Line
+	6500 3900 6400 3900
+Wire Wire Line
+	6500 2500 6500 3900
+Wire Wire Line
+	6400 2500 6500 2500
+Connection ~ 5500 3900
+Wire Wire Line
+	5500 2500 5400 2500
+Wire Wire Line
+	5500 3900 5500 2500
+Wire Wire Line
+	5500 3900 5400 3900
+Wire Wire Line
+	5500 5350 5500 3900
+Wire Wire Line
+	5400 5350 5500 5350
+Connection ~ 4500 3900
+Wire Wire Line
+	4500 5350 4400 5350
+Wire Wire Line
+	4500 3900 4500 5350
+Wire Wire Line
+	4500 3900 4400 3900
+Wire Wire Line
+	4500 2500 4500 3900
+Wire Wire Line
+	4400 2500 4500 2500
+Connection ~ 6700 5800
+Wire Wire Line
+	7700 5350 7800 5350
+Wire Wire Line
+	7700 5800 7700 5350
+Wire Wire Line
+	6700 5800 7700 5800
+Connection ~ 5700 5800
+Wire Wire Line
+	6700 5350 6800 5350
+Wire Wire Line
+	6700 5800 6700 5350
+Wire Wire Line
+	5700 5800 6700 5800
+Connection ~ 4700 5800
+Wire Wire Line
+	5700 5350 5800 5350
+Wire Wire Line
+	5700 5800 5700 5350
+Wire Wire Line
+	4700 5800 5700 5800
+Connection ~ 3700 5800
+Wire Wire Line
+	4700 5350 4800 5350
+Wire Wire Line
+	4700 5800 4700 5350
+Wire Wire Line
+	3700 5800 4700 5800
+Connection ~ 2600 5800
+Wire Wire Line
+	3700 5350 3800 5350
+Wire Wire Line
+	3700 5800 3700 5350
+Wire Wire Line
+	2600 5800 3700 5800
+Wire Wire Line
+	2600 5800 2250 5800
+Wire Wire Line
+	2600 5350 2600 5800
+Wire Wire Line
+	2800 5350 2600 5350
+Connection ~ 6700 4350
+Wire Wire Line
+	7700 3900 7800 3900
+Wire Wire Line
+	7700 4350 7700 3900
+Wire Wire Line
+	6700 4350 7700 4350
+Connection ~ 5700 4350
+Wire Wire Line
+	6700 3900 6800 3900
+Wire Wire Line
+	6700 4350 6700 3900
+Wire Wire Line
+	5700 4350 6700 4350
+Connection ~ 4700 4350
+Wire Wire Line
+	5700 3900 5800 3900
+Wire Wire Line
+	5700 4350 5700 3900
+Wire Wire Line
+	4700 4350 5700 4350
+Connection ~ 3700 4350
+Wire Wire Line
+	4700 3900 4800 3900
+Wire Wire Line
+	4700 4350 4700 3900
+Wire Wire Line
+	3700 4350 4700 4350
+Connection ~ 2600 4350
+Wire Wire Line
+	3700 4350 2600 4350
+Wire Wire Line
+	3700 3900 3700 4350
+Wire Wire Line
+	3800 3900 3700 3900
+Wire Wire Line
+	2600 4350 2250 4350
+Wire Wire Line
+	2600 3900 2600 4350
+Wire Wire Line
+	2800 3900 2600 3900
+Connection ~ 3500 2500
+Wire Wire Line
+	3500 3900 3400 3900
+Wire Wire Line
+	3500 2500 3500 1550
+Wire Wire Line
+	3400 2500 3500 2500
+Connection ~ 6700 2950
+Wire Wire Line
+	7700 2500 7800 2500
+Wire Wire Line
+	7700 2950 7700 2500
+Wire Wire Line
+	6700 2950 7700 2950
+Connection ~ 5700 2950
+Wire Wire Line
+	6700 2500 6800 2500
+Wire Wire Line
+	6700 2950 6700 2500
+Wire Wire Line
+	5700 2950 6700 2950
+Connection ~ 4700 2950
+Wire Wire Line
+	5700 2500 5800 2500
+Wire Wire Line
+	5700 2950 5700 2500
+Wire Wire Line
+	4700 2950 5700 2950
+Connection ~ 3700 2950
+Wire Wire Line
+	4700 2500 4800 2500
+Wire Wire Line
+	4700 2950 4700 2500
+Wire Wire Line
+	3700 2950 4700 2950
+Connection ~ 2600 2950
+Wire Wire Line
+	3700 2500 3800 2500
+Wire Wire Line
+	3700 2950 3700 2500
+Wire Wire Line
+	2600 2950 3700 2950
+Wire Wire Line
+	2600 2500 2800 2500
+Wire Wire Line
+	2600 2950 2600 2500
+Wire Wire Line
+	2250 2950 2600 2950
+Text HLabel 2250 5800 0    50   Input ~ 0
+LED_C
+Text HLabel 2250 4350 0    50   Input ~ 0
+LED_B
+Text HLabel 2250 2950 0    50   Input ~ 0
+LED_A
+Text HLabel 8500 1550 1    50   Input ~ 0
+LED_6
+Text HLabel 7500 1550 1    50   Input ~ 0
+LED_5
+Text HLabel 6500 1550 1    50   Input ~ 0
+LED_4
+Text HLabel 5500 1550 1    50   Input ~ 0
+LED_3
+Text HLabel 4500 1550 1    50   Input ~ 0
+LED_2
+Text HLabel 3500 1550 1    50   Input ~ 0
+LED_1
+$Comp
+L Switch:SW_MEC_5G_2LED SW?
+U 1 1 609B64D3
+P 8100 3800
+F 0 "SW?" H 8100 4285 50  0000 C CNN
+F 1 "SW_MEC_5G_2LED" H 8100 4194 50  0000 C CNN
+F 2 "" H 8100 4200 50  0001 C CNN
+F 3 "http://www.apem.com/int/index.php?controller=attachment&id_attachment=488" H 8100 4200 50  0001 C CNN
+	1    8100 3800
+	1    0    0    -1  
+$EndComp
+$Comp
+L Switch:SW_MEC_5G_2LED SW?
+U 1 1 609B64C9
+P 8100 2400
+F 0 "SW?" H 8100 2885 50  0000 C CNN
+F 1 "SW_MEC_5G_2LED" H 8100 2794 50  0000 C CNN
+F 2 "" H 8100 2800 50  0001 C CNN
+F 3 "http://www.apem.com/int/index.php?controller=attachment&id_attachment=488" H 8100 2800 50  0001 C CNN
+	1    8100 2400
+	1    0    0    -1  
+$EndComp
+$Comp
+L Switch:SW_MEC_5G_2LED SW?
+U 1 1 609B64BF
+P 8100 5250
+F 0 "SW?" H 8100 5735 50  0000 C CNN
+F 1 "SW_MEC_5G_2LED" H 8100 5644 50  0000 C CNN
+F 2 "" H 8100 5650 50  0001 C CNN
+F 3 "http://www.apem.com/int/index.php?controller=attachment&id_attachment=488" H 8100 5650 50  0001 C CNN
+	1    8100 5250
+	1    0    0    -1  
+$EndComp
+$Comp
+L Switch:SW_MEC_5G_2LED SW?
+U 1 1 609B64B5
+P 7100 3800
+F 0 "SW?" H 7100 4285 50  0000 C CNN
+F 1 "SW_MEC_5G_2LED" H 7100 4194 50  0000 C CNN
+F 2 "" H 7100 4200 50  0001 C CNN
+F 3 "http://www.apem.com/int/index.php?controller=attachment&id_attachment=488" H 7100 4200 50  0001 C CNN
+	1    7100 3800
+	1    0    0    -1  
+$EndComp
+$Comp
+L Switch:SW_MEC_5G_2LED SW?
+U 1 1 609B64AB
+P 7100 2400
+F 0 "SW?" H 7100 2885 50  0000 C CNN
+F 1 "SW_MEC_5G_2LED" H 7100 2794 50  0000 C CNN
+F 2 "" H 7100 2800 50  0001 C CNN
+F 3 "http://www.apem.com/int/index.php?controller=attachment&id_attachment=488" H 7100 2800 50  0001 C CNN
+	1    7100 2400
+	1    0    0    -1  
+$EndComp
+$Comp
+L Switch:SW_MEC_5G_2LED SW?
+U 1 1 609B617B
+P 7100 5250
+F 0 "SW?" H 7100 5735 50  0000 C CNN
+F 1 "SW_MEC_5G_2LED" H 7100 5644 50  0000 C CNN
+F 2 "" H 7100 5650 50  0001 C CNN
+F 3 "http://www.apem.com/int/index.php?controller=attachment&id_attachment=488" H 7100 5650 50  0001 C CNN
+	1    7100 5250
+	1    0    0    -1  
+$EndComp
+$Comp
+L Switch:SW_MEC_5G_2LED SW?
+U 1 1 60999F0F
+P 6100 3800
+F 0 "SW?" H 6100 4285 50  0000 C CNN
+F 1 "SW_MEC_5G_2LED" H 6100 4194 50  0000 C CNN
+F 2 "" H 6100 4200 50  0001 C CNN
+F 3 "http://www.apem.com/int/index.php?controller=attachment&id_attachment=488" H 6100 4200 50  0001 C CNN
+	1    6100 3800
+	1    0    0    -1  
+$EndComp
+$Comp
+L Switch:SW_MEC_5G_2LED SW?
+U 1 1 60999F09
+P 6100 2400
+F 0 "SW?" H 6100 2885 50  0000 C CNN
+F 1 "SW_MEC_5G_2LED" H 6100 2794 50  0000 C CNN
+F 2 "" H 6100 2800 50  0001 C CNN
+F 3 "http://www.apem.com/int/index.php?controller=attachment&id_attachment=488" H 6100 2800 50  0001 C CNN
+	1    6100 2400
+	1    0    0    -1  
+$EndComp
+$Comp
+L Switch:SW_MEC_5G_2LED SW?
+U 1 1 60999F03
+P 6100 5250
+F 0 "SW?" H 6100 5735 50  0000 C CNN
+F 1 "SW_MEC_5G_2LED" H 6100 5644 50  0000 C CNN
+F 2 "" H 6100 5650 50  0001 C CNN
+F 3 "http://www.apem.com/int/index.php?controller=attachment&id_attachment=488" H 6100 5650 50  0001 C CNN
+	1    6100 5250
+	1    0    0    -1  
+$EndComp
+$Comp
+L Switch:SW_MEC_5G_2LED SW?
+U 1 1 60999EFD
+P 5100 3800
+F 0 "SW?" H 5100 4285 50  0000 C CNN
+F 1 "SW_MEC_5G_2LED" H 5100 4194 50  0000 C CNN
+F 2 "" H 5100 4200 50  0001 C CNN
+F 3 "http://www.apem.com/int/index.php?controller=attachment&id_attachment=488" H 5100 4200 50  0001 C CNN
+	1    5100 3800
+	1    0    0    -1  
+$EndComp
+$Comp
+L Switch:SW_MEC_5G_2LED SW?
+U 1 1 60999EF7
+P 5100 2400
+F 0 "SW?" H 5100 2885 50  0000 C CNN
+F 1 "SW_MEC_5G_2LED" H 5100 2794 50  0000 C CNN
+F 2 "" H 5100 2800 50  0001 C CNN
+F 3 "http://www.apem.com/int/index.php?controller=attachment&id_attachment=488" H 5100 2800 50  0001 C CNN
+	1    5100 2400
+	1    0    0    -1  
+$EndComp
+$Comp
+L Switch:SW_MEC_5G_2LED SW?
+U 1 1 60999EF1
+P 5100 5250
+F 0 "SW?" H 5100 5735 50  0000 C CNN
+F 1 "SW_MEC_5G_2LED" H 5100 5644 50  0000 C CNN
+F 2 "" H 5100 5650 50  0001 C CNN
+F 3 "http://www.apem.com/int/index.php?controller=attachment&id_attachment=488" H 5100 5650 50  0001 C CNN
+	1    5100 5250
+	1    0    0    -1  
+$EndComp
+$Comp
+L Switch:SW_MEC_5G_2LED SW?
+U 1 1 609947E5
+P 4100 3800
+F 0 "SW?" H 4100 4285 50  0000 C CNN
+F 1 "SW_MEC_5G_2LED" H 4100 4194 50  0000 C CNN
+F 2 "" H 4100 4200 50  0001 C CNN
+F 3 "http://www.apem.com/int/index.php?controller=attachment&id_attachment=488" H 4100 4200 50  0001 C CNN
+	1    4100 3800
+	1    0    0    -1  
+$EndComp
+$Comp
+L Switch:SW_MEC_5G_2LED SW?
+U 1 1 609947DF
+P 4100 2400
+F 0 "SW?" H 4100 2885 50  0000 C CNN
+F 1 "SW_MEC_5G_2LED" H 4100 2794 50  0000 C CNN
+F 2 "" H 4100 2800 50  0001 C CNN
+F 3 "http://www.apem.com/int/index.php?controller=attachment&id_attachment=488" H 4100 2800 50  0001 C CNN
+	1    4100 2400
+	1    0    0    -1  
+$EndComp
+$Comp
+L Switch:SW_MEC_5G_2LED SW?
+U 1 1 609947D9
+P 4100 5250
+F 0 "SW?" H 4100 5735 50  0000 C CNN
+F 1 "SW_MEC_5G_2LED" H 4100 5644 50  0000 C CNN
+F 2 "" H 4100 5650 50  0001 C CNN
+F 3 "http://www.apem.com/int/index.php?controller=attachment&id_attachment=488" H 4100 5650 50  0001 C CNN
+	1    4100 5250
+	1    0    0    -1  
+$EndComp
+$Comp
+L Switch:SW_MEC_5G_2LED SW?
+U 1 1 6098AC56
+P 3100 3800
+F 0 "SW?" H 3100 4285 50  0000 C CNN
+F 1 "SW_MEC_5G_2LED" H 3100 4194 50  0000 C CNN
+F 2 "" H 3100 4200 50  0001 C CNN
+F 3 "http://www.apem.com/int/index.php?controller=attachment&id_attachment=488" H 3100 4200 50  0001 C CNN
+	1    3100 3800
+	1    0    0    -1  
+$EndComp
+$Comp
+L Switch:SW_MEC_5G_2LED SW?
+U 1 1 60989FEA
+P 3100 2400
+F 0 "SW?" H 3100 2885 50  0000 C CNN
+F 1 "SW_MEC_5G_2LED" H 3100 2794 50  0000 C CNN
+F 2 "" H 3100 2800 50  0001 C CNN
+F 3 "http://www.apem.com/int/index.php?controller=attachment&id_attachment=488" H 3100 2800 50  0001 C CNN
+	1    3100 2400
+	1    0    0    -1  
+$EndComp
+$Comp
+L Switch:SW_MEC_5G_2LED SW?
+U 1 1 60989410
+P 3100 5250
+F 0 "SW?" H 3100 5735 50  0000 C CNN
+F 1 "SW_MEC_5G_2LED" H 3100 5644 50  0000 C CNN
+F 2 "" H 3100 5650 50  0001 C CNN
+F 3 "http://www.apem.com/int/index.php?controller=attachment&id_attachment=488" H 3100 5650 50  0001 C CNN
+	1    3100 5250
+	1    0    0    -1  
+$EndComp
+Wire Wire Line
+	3500 2500 3500 3900
+Connection ~ 3500 3900
+Wire Wire Line
+	3500 3900 3500 5350
+Wire Wire Line
+	3500 5350 3400 5350
+Text HLabel 2250 1750 0    50   Input ~ 0
+BTN_A
+Wire Wire Line
+	2250 1750 2600 1750
+Wire Wire Line
+	2600 1750 2600 2200
+Wire Wire Line
+	2600 2200 2800 2200
+Wire Wire Line
+	2600 1750 3700 1750
+Wire Wire Line
+	3700 1750 3700 2200
+Wire Wire Line
+	3700 2200 3800 2200
+Connection ~ 2600 1750
+Wire Wire Line
+	3700 1750 4700 1750
+Wire Wire Line
+	4700 1750 4700 2200
+Wire Wire Line
+	4700 2200 4800 2200
+Connection ~ 3700 1750
+Wire Wire Line
+	4700 1750 5700 1750
+Wire Wire Line
+	5700 1750 5700 2200
+Wire Wire Line
+	5700 2200 5800 2200
+Connection ~ 4700 1750
+Wire Wire Line
+	5700 1750 6700 1750
+Wire Wire Line
+	6700 1750 6700 2200
+Wire Wire Line
+	6700 2200 6800 2200
+Connection ~ 5700 1750
+Wire Wire Line
+	6700 1750 7700 1750
+Wire Wire Line
+	7700 1750 7700 2200
+Wire Wire Line
+	7700 2200 7800 2200
+Connection ~ 6700 1750
+Text HLabel 2250 3150 0    50   Input ~ 0
+BTN_B
+Wire Wire Line
+	2600 3150 2600 3600
+Wire Wire Line
+	2600 3150 2250 3150
+Wire Wire Line
+	2800 3600 2600 3600
+Wire Wire Line
+	2600 3150 3700 3150
+Wire Wire Line
+	3700 3150 3700 3600
+Wire Wire Line
+	3700 3600 3800 3600
+Connection ~ 2600 3150
+Wire Wire Line
+	3700 3150 4700 3150
+Wire Wire Line
+	4700 3150 4700 3600
+Wire Wire Line
+	4700 3600 4800 3600
+Connection ~ 3700 3150
+Wire Wire Line
+	4700 3150 5700 3150
+Wire Wire Line
+	5700 3150 5700 3600
+Wire Wire Line
+	5700 3600 5800 3600
+Connection ~ 4700 3150
+Wire Wire Line
+	5700 3150 6700 3150
+Wire Wire Line
+	6700 3150 6700 3600
+Wire Wire Line
+	6700 3600 6800 3600
+Connection ~ 5700 3150
+Wire Wire Line
+	6700 3150 7700 3150
+Wire Wire Line
+	7700 3150 7700 3600
+Wire Wire Line
+	7700 3600 7800 3600
+Connection ~ 6700 3150
+Text HLabel 2250 4550 0    50   Input ~ 0
+BTN_C
+Wire Wire Line
+	2800 5050 2600 5050
+Wire Wire Line
+	2600 5050 2600 4550
+Wire Wire Line
+	2600 4550 2250 4550
+Wire Wire Line
+	2600 4550 3700 4550
+Wire Wire Line
+	3700 4550 3700 5050
+Wire Wire Line
+	3700 5050 3800 5050
+Connection ~ 2600 4550
+Wire Wire Line
+	3700 4550 4700 4550
+Wire Wire Line
+	4700 4550 4700 5050
+Wire Wire Line
+	4700 5050 4800 5050
+Connection ~ 3700 4550
+Wire Wire Line
+	4700 4550 5700 4550
+Wire Wire Line
+	5700 4550 5700 5050
+Wire Wire Line
+	5700 5050 5800 5050
+Connection ~ 4700 4550
+Wire Wire Line
+	5700 4550 6700 4550
+Wire Wire Line
+	6700 4550 6700 5050
+Wire Wire Line
+	6700 5050 6800 5050
+Connection ~ 5700 4550
+Wire Wire Line
+	6700 4550 7700 4550
+Wire Wire Line
+	7700 4550 7700 5050
+Wire Wire Line
+	7700 5050 7800 5050
+Connection ~ 6700 4550
+Text HLabel 3600 1550 1    50   Input ~ 0
+BTN_1
+Text HLabel 4600 1550 1    50   Input ~ 0
+BTN_2
+Text HLabel 5600 1550 1    50   Input ~ 0
+BTN_3
+Text HLabel 6600 1550 1    50   Input ~ 0
+BTN_4
+Wire Wire Line
+	3600 1550 3600 2200
+Wire Wire Line
+	3600 2200 3400 2200
+Wire Wire Line
+	3600 2200 3600 3600
+Wire Wire Line
+	3600 3600 3400 3600
+Connection ~ 3600 2200
+Wire Wire Line
+	3600 3600 3600 5050
+Wire Wire Line
+	3600 5050 3400 5050
+Connection ~ 3600 3600
+Wire Wire Line
+	4600 1550 4600 2200
+Wire Wire Line
+	4600 2200 4400 2200
+Wire Wire Line
+	4600 2200 4600 3600
+Wire Wire Line
+	4600 3600 4400 3600
+Connection ~ 4600 2200
+Wire Wire Line
+	4600 3600 4600 5050
+Wire Wire Line
+	4600 5050 4400 5050
+Connection ~ 4600 3600
+Wire Wire Line
+	5600 1550 5600 2200
+Wire Wire Line
+	5600 2200 5400 2200
+Wire Wire Line
+	5600 2200 5600 3600
+Wire Wire Line
+	5600 3600 5400 3600
+Connection ~ 5600 2200
+Wire Wire Line
+	5600 3600 5600 5050
+Wire Wire Line
+	5600 5050 5400 5050
+Connection ~ 5600 3600
+Wire Wire Line
+	6600 1550 6600 2200
+Wire Wire Line
+	6600 2200 6400 2200
+Wire Wire Line
+	6600 2200 6600 3600
+Wire Wire Line
+	6600 3600 6400 3600
+Connection ~ 6600 2200
+Wire Wire Line
+	6600 3600 6600 5050
+Wire Wire Line
+	6600 5050 6400 5050
+Connection ~ 6600 3600
+Text HLabel 7600 1550 1    50   Input ~ 0
+BTN_5
+Text HLabel 8600 1550 1    50   Input ~ 0
+BTN_6
+Wire Wire Line
+	7600 1550 7600 2200
+Wire Wire Line
+	7600 2200 7400 2200
+Wire Wire Line
+	7600 2200 7600 3600
+Wire Wire Line
+	7600 3600 7400 3600
+Connection ~ 7600 2200
+Wire Wire Line
+	7600 3600 7600 5050
+Wire Wire Line
+	7600 5050 7400 5050
+Connection ~ 7600 3600
+Wire Wire Line
+	8600 1550 8600 2200
+Wire Wire Line
+	8600 2200 8400 2200
+Wire Wire Line
+	8600 2200 8600 3600
+Wire Wire Line
+	8600 3600 8400 3600
+Connection ~ 8600 2200
+Wire Wire Line
+	8600 3600 8600 5050
+Wire Wire Line
+	8600 5050 8400 5050
+Connection ~ 8600 3600
+$EndSCHEMATC
diff --git a/hardware/devices/euro-yesman-1u/board/yesman-board-cache.lib b/hardware/devices/euro-yesman-1u/board/yesman-board-cache.lib
index 505b99a3140..2e79ed28199 100644
--- a/hardware/devices/euro-yesman-1u/board/yesman-board-cache.lib
+++ b/hardware/devices/euro-yesman-1u/board/yesman-board-cache.lib
@@ -36,6 +36,28 @@ X ~ 2 0 -150 110 U 50 50 1 1 P
 ENDDRAW
 ENDDEF
 #
+# Device_D
+#
+DEF Device_D D 0 40 N N 1 F N
+F0 "D" 0 100 50 H V C CNN
+F1 "Device_D" 0 -100 50 H V C CNN
+F2 "" 0 0 50 H I C CNN
+F3 "" 0 0 50 H I C CNN
+$FPLIST
+ TO-???*
+ *_Diode_*
+ *SingleDiode*
+ D_*
+$ENDFPLIST
+DRAW
+P 2 0 1 10 -50 50 -50 -50 N
+P 2 0 1 0 50 0 -50 0 N
+P 4 0 1 10 50 50 50 -50 -50 0 50 50 N
+X K 1 -150 0 100 R 50 50 1 1 P
+X A 2 150 0 100 L 50 50 1 1 P
+ENDDRAW
+ENDDEF
+#
 # Device_R
 #
 DEF Device_R R 0 0 N Y 1 F N
@@ -117,29 +139,45 @@ X VDDA 9 200 1500 100 D 50 50 1 1 W
 ENDDRAW
 ENDDEF
 #
-# Switch_SW_Push_LED
+# Switch_SW_MEC_5G_2LED
 #
-DEF Switch_SW_Push_LED SW 0 40 Y N 1 F N
-F0 "SW" 25 225 50 H V L CNN
-F1 "Switch_SW_Push_LED" 0 -125 50 H V C CNN
-F2 "" 0 300 50 H I C CNN
-F3 "" 0 300 50 H I C CNN
+DEF Switch_SW_MEC_5G_2LED SW 0 40 Y N 1 F N
+F0 "SW" -200 300 50 H V L CNN
+F1 "Switch_SW_MEC_5G_2LED" 0 -350 50 H V C CNN
+F2 "" 0 400 50 H I C CNN
+F3 "" 0 400 50 H I C CNN
+$FPLIST
+ SW*MEC*5G*
+$ENDFPLIST
 DRAW
-C -80 100 20 0 1 0 N
-C 80 100 20 0 1 0 N
-P 2 0 0 0 -150 -75 -100 -25 N
-P 2 0 0 0 -100 -75 -50 -25 N
-P 2 0 0 0 -100 0 100 0 N
-P 2 0 0 0 -25 50 -25 -50 N
-P 3 0 0 0 -150 -50 -150 -75 -125 -75 N
-P 3 0 0 0 -100 -50 -100 -75 -75 -75 N
-P 4 0 0 0 -25 0 50 50 50 -50 -25 0 F
-P 2 0 1 0 0 150 0 220 N
-P 2 0 1 0 100 150 -100 150 N
-X 1 1 -200 100 100 R 50 50 0 1 P
-X 2 2 200 100 100 L 50 50 0 1 P
-X K 3 -200 0 100 R 50 50 0 1 P
-X A 4 200 0 100 L 50 50 0 1 P
+C -80 200 20 0 1 0 N
+C 80 200 20 0 1 0 N
+P 2 0 0 0 -200 -100 -100 -100 N
+P 2 0 0 0 -200 200 -100 200 N
+P 2 0 0 0 -150 -275 -100 -225 N
+P 2 0 0 0 -100 -275 -50 -225 N
+P 2 0 0 0 -100 -200 100 -200 N
+P 2 0 0 0 -100 0 -100 -200 N
+P 2 0 0 0 -25 -150 -25 -250 N
+P 2 0 0 0 25 50 25 -50 N
+P 2 0 0 0 100 0 -100 0 N
+P 2 0 0 0 100 0 100 -200 N
+P 2 0 0 0 100 75 50 25 N
+P 2 0 0 0 100 200 200 200 N
+P 2 0 0 0 150 75 100 25 N
+P 2 0 0 0 200 -100 100 -100 N
+P 3 0 0 0 -150 -250 -150 -275 -125 -275 N
+P 3 0 0 0 -100 -250 -100 -275 -75 -275 N
+P 3 0 0 0 100 50 100 75 75 75 N
+P 3 0 0 0 150 50 150 75 125 75 N
+P 4 0 0 0 -25 -200 50 -150 50 -250 -25 -200 F
+P 4 0 0 0 25 0 -50 50 -50 -50 25 0 F
+P 2 0 1 0 0 250 0 320 N
+P 2 0 1 0 100 250 -100 250 N
+X 1 1 -300 200 100 R 50 50 0 1 P
+X 2 2 -300 -100 100 R 50 50 0 1 P
+X K 3 300 -100 100 L 50 50 0 1 P
+X A 4 300 200 100 L 50 50 0 1 P
 ENDDRAW
 ENDDEF
 #
diff --git a/hardware/devices/euro-yesman-1u/board/yesman-board.sch b/hardware/devices/euro-yesman-1u/board/yesman-board.sch
index bb19c046c70..36d2623a8d2 100644
--- a/hardware/devices/euro-yesman-1u/board/yesman-board.sch
+++ b/hardware/devices/euro-yesman-1u/board/yesman-board.sch
@@ -3,7 +3,7 @@ EELAYER 30 0
 EELAYER END
 $Descr A4 11693 8268
 encoding utf-8
-Sheet 1 1
+Sheet 1 2
 Title ""
 Date ""
 Rev ""
@@ -13,1237 +13,216 @@ Comment2 ""
 Comment3 ""
 Comment4 ""
 $EndDescr
-Text Label 1900 1100 0    50   ~ 0
-ST_1
-Wire Wire Line
-	1900 1100 1750 1100
-$Comp
-L power:GND #PWR0101
-U 1 1 60586AA3
-P 850 1250
-F 0 "#PWR0101" H 850 1000 50  0001 C CNN
-F 1 "GND" H 855 1077 50  0000 C CNN
-F 2 "" H 850 1250 50  0001 C CNN
-F 3 "" H 850 1250 50  0001 C CNN
-	1    850  1250
-	1    0    0    -1  
-$EndComp
-Text Label 1900 1200 0    50   ~ 0
-ST_1_LED
-Wire Wire Line
-	1900 1200 1750 1200
-$Comp
-L Device:R R1
-U 1 1 6058C74D
-P 1100 1100
-F 0 "R1" V 1100 1100 50  0000 C CNN
-F 1 "R" V 1000 1100 50  0000 C CNN
-F 2 "Resistor_SMD:R_0603_1608Metric" V 1030 1100 50  0001 C CNN
-F 3 "~" H 1100 1100 50  0001 C CNN
-	1    1100 1100
-	0    1    1    0   
-$EndComp
-Wire Wire Line
-	1350 1100 1250 1100
-Wire Wire Line
-	950  1100 850  1100
-Wire Wire Line
-	850  1100 850  1200
-Wire Wire Line
-	1350 1200 850  1200
-Connection ~ 850  1200
-Wire Wire Line
-	850  1200 850  1250
-Text Label 1900 1700 0    50   ~ 0
-ST_2
-Wire Wire Line
-	1900 1700 1750 1700
-$Comp
-L power:GND #PWR0102
-U 1 1 605925C5
-P 850 1850
-F 0 "#PWR0102" H 850 1600 50  0001 C CNN
-F 1 "GND" H 855 1677 50  0000 C CNN
-F 2 "" H 850 1850 50  0001 C CNN
-F 3 "" H 850 1850 50  0001 C CNN
-	1    850  1850
-	1    0    0    -1  
-$EndComp
-Text Label 1900 1800 0    50   ~ 0
-ST_2_LED
-Wire Wire Line
-	1900 1800 1750 1800
-$Comp
-L Device:R R2
-U 1 1 605925D1
-P 1100 1700
-F 0 "R2" V 1100 1700 50  0000 C CNN
-F 1 "R" V 1000 1700 50  0000 C CNN
-F 2 "Resistor_SMD:R_0603_1608Metric" V 1030 1700 50  0001 C CNN
-F 3 "~" H 1100 1700 50  0001 C CNN
-	1    1100 1700
-	0    1    1    0   
-$EndComp
-Wire Wire Line
-	1350 1700 1250 1700
-Wire Wire Line
-	950  1700 850  1700
-Wire Wire Line
-	850  1700 850  1800
-Wire Wire Line
-	1350 1800 850  1800
-Connection ~ 850  1800
-Wire Wire Line
-	850  1800 850  1850
-Text Label 1900 2300 0    50   ~ 0
-ST_3
-Wire Wire Line
-	1900 2300 1750 2300
-$Comp
-L power:GND #PWR0103
-U 1 1 60593F6C
-P 850 2450
-F 0 "#PWR0103" H 850 2200 50  0001 C CNN
-F 1 "GND" H 855 2277 50  0000 C CNN
-F 2 "" H 850 2450 50  0001 C CNN
-F 3 "" H 850 2450 50  0001 C CNN
-	1    850  2450
-	1    0    0    -1  
-$EndComp
-Text Label 1900 2400 0    50   ~ 0
-ST_3_LED
-Wire Wire Line
-	1900 2400 1750 2400
-$Comp
-L Device:R R3
-U 1 1 60593F78
-P 1100 2300
-F 0 "R3" V 1100 2300 50  0000 C CNN
-F 1 "R" V 1000 2300 50  0000 C CNN
-F 2 "Resistor_SMD:R_0603_1608Metric" V 1030 2300 50  0001 C CNN
-F 3 "~" H 1100 2300 50  0001 C CNN
-	1    1100 2300
-	0    1    1    0   
-$EndComp
-Wire Wire Line
-	1350 2300 1250 2300
-Wire Wire Line
-	950  2300 850  2300
-Wire Wire Line
-	850  2300 850  2400
-Wire Wire Line
-	1350 2400 850  2400
-Connection ~ 850  2400
-Wire Wire Line
-	850  2400 850  2450
-Text Label 1900 2900 0    50   ~ 0
-ST_4
-Wire Wire Line
-	1900 2900 1750 2900
-$Comp
-L power:GND #PWR0104
-U 1 1 60593F94
-P 850 3050
-F 0 "#PWR0104" H 850 2800 50  0001 C CNN
-F 1 "GND" H 855 2877 50  0000 C CNN
-F 2 "" H 850 3050 50  0001 C CNN
-F 3 "" H 850 3050 50  0001 C CNN
-	1    850  3050
-	1    0    0    -1  
-$EndComp
-Text Label 1900 3000 0    50   ~ 0
-ST_4_LED
-Wire Wire Line
-	1900 3000 1750 3000
-$Comp
-L Device:R R4
-U 1 1 60593FA0
-P 1100 2900
-F 0 "R4" V 1100 2900 50  0000 C CNN
-F 1 "R" V 1000 2900 50  0000 C CNN
-F 2 "Resistor_SMD:R_0603_1608Metric" V 1030 2900 50  0001 C CNN
-F 3 "~" H 1100 2900 50  0001 C CNN
-	1    1100 2900
-	0    1    1    0   
-$EndComp
-Wire Wire Line
-	1350 2900 1250 2900
-Wire Wire Line
-	950  2900 850  2900
-Wire Wire Line
-	850  2900 850  3000
-Wire Wire Line
-	1350 3000 850  3000
-Connection ~ 850  3000
-Wire Wire Line
-	850  3000 850  3050
-Text Label 1900 3500 0    50   ~ 0
-ST_5
-Wire Wire Line
-	1900 3500 1750 3500
-$Comp
-L power:GND #PWR0105
-U 1 1 60596BCA
-P 850 3650
-F 0 "#PWR0105" H 850 3400 50  0001 C CNN
-F 1 "GND" H 855 3477 50  0000 C CNN
-F 2 "" H 850 3650 50  0001 C CNN
-F 3 "" H 850 3650 50  0001 C CNN
-	1    850  3650
-	1    0    0    -1  
-$EndComp
-Text Label 1900 3600 0    50   ~ 0
-ST_5_LED
-Wire Wire Line
-	1900 3600 1750 3600
-$Comp
-L Device:R R5
-U 1 1 60596BD6
-P 1100 3500
-F 0 "R5" V 1100 3500 50  0000 C CNN
-F 1 "R" V 1000 3500 50  0000 C CNN
-F 2 "Resistor_SMD:R_0603_1608Metric" V 1030 3500 50  0001 C CNN
-F 3 "~" H 1100 3500 50  0001 C CNN
-	1    1100 3500
-	0    1    1    0   
-$EndComp
-Wire Wire Line
-	1350 3500 1250 3500
-Wire Wire Line
-	950  3500 850  3500
-Wire Wire Line
-	850  3500 850  3600
-Wire Wire Line
-	1350 3600 850  3600
-Connection ~ 850  3600
-Wire Wire Line
-	850  3600 850  3650
-Text Label 1900 4100 0    50   ~ 0
-ST_6
-Wire Wire Line
-	1900 4100 1750 4100
-$Comp
-L power:GND #PWR0106
-U 1 1 60596BF2
-P 850 4250
-F 0 "#PWR0106" H 850 4000 50  0001 C CNN
-F 1 "GND" H 855 4077 50  0000 C CNN
-F 2 "" H 850 4250 50  0001 C CNN
-F 3 "" H 850 4250 50  0001 C CNN
-	1    850  4250
-	1    0    0    -1  
-$EndComp
-Text Label 1900 4200 0    50   ~ 0
-ST_6_LED
-Wire Wire Line
-	1900 4200 1750 4200
-$Comp
-L Device:R R6
-U 1 1 60596BFE
-P 1100 4100
-F 0 "R6" V 1100 4100 50  0000 C CNN
-F 1 "R" V 1000 4100 50  0000 C CNN
-F 2 "Resistor_SMD:R_0603_1608Metric" V 1030 4100 50  0001 C CNN
-F 3 "~" H 1100 4100 50  0001 C CNN
-	1    1100 4100
-	0    1    1    0   
-$EndComp
-Wire Wire Line
-	1350 4100 1250 4100
-Wire Wire Line
-	950  4100 850  4100
-Wire Wire Line
-	850  4100 850  4200
-Wire Wire Line
-	1350 4200 850  4200
-Connection ~ 850  4200
-Wire Wire Line
-	850  4200 850  4250
-Text Label 1900 4700 0    50   ~ 0
-ST_7
-Wire Wire Line
-	1900 4700 1750 4700
-$Comp
-L power:GND #PWR0107
-U 1 1 60596C1A
-P 850 4850
-F 0 "#PWR0107" H 850 4600 50  0001 C CNN
-F 1 "GND" H 855 4677 50  0000 C CNN
-F 2 "" H 850 4850 50  0001 C CNN
-F 3 "" H 850 4850 50  0001 C CNN
-	1    850  4850
-	1    0    0    -1  
-$EndComp
-Text Label 1900 4800 0    50   ~ 0
-ST_7_LED
-Wire Wire Line
-	1900 4800 1750 4800
-$Comp
-L Device:R R7
-U 1 1 60596C26
-P 1100 4700
-F 0 "R7" V 1100 4700 50  0000 C CNN
-F 1 "R" V 1000 4700 50  0000 C CNN
-F 2 "Resistor_SMD:R_0603_1608Metric" V 1030 4700 50  0001 C CNN
-F 3 "~" H 1100 4700 50  0001 C CNN
-	1    1100 4700
-	0    1    1    0   
-$EndComp
-Wire Wire Line
-	1350 4700 1250 4700
-Wire Wire Line
-	950  4700 850  4700
-Wire Wire Line
-	850  4700 850  4800
-Wire Wire Line
-	1350 4800 850  4800
-Connection ~ 850  4800
-Wire Wire Line
-	850  4800 850  4850
-Text Label 1900 5300 0    50   ~ 0
-ST_8
-Wire Wire Line
-	1900 5300 1750 5300
-$Comp
-L power:GND #PWR0108
-U 1 1 60596C42
-P 850 5450
-F 0 "#PWR0108" H 850 5200 50  0001 C CNN
-F 1 "GND" H 855 5277 50  0000 C CNN
-F 2 "" H 850 5450 50  0001 C CNN
-F 3 "" H 850 5450 50  0001 C CNN
-	1    850  5450
-	1    0    0    -1  
-$EndComp
-Text Label 1900 5400 0    50   ~ 0
-ST_8_LED
-Wire Wire Line
-	1900 5400 1750 5400
-$Comp
-L Device:R R8
-U 1 1 60596C4E
-P 1100 5300
-F 0 "R8" V 1100 5300 50  0000 C CNN
-F 1 "R" V 1000 5300 50  0000 C CNN
-F 2 "Resistor_SMD:R_0603_1608Metric" V 1030 5300 50  0001 C CNN
-F 3 "~" H 1100 5300 50  0001 C CNN
-	1    1100 5300
-	0    1    1    0   
-$EndComp
-Wire Wire Line
-	1350 5300 1250 5300
-Wire Wire Line
-	950  5300 850  5300
-Wire Wire Line
-	850  5300 850  5400
-Wire Wire Line
-	1350 5400 850  5400
-Connection ~ 850  5400
-Wire Wire Line
-	850  5400 850  5450
-Text Label 3600 1100 0    50   ~ 0
-ST_9
-Wire Wire Line
-	3600 1100 3450 1100
-$Comp
-L power:GND #PWR0109
-U 1 1 605B741E
-P 2550 1250
-F 0 "#PWR0109" H 2550 1000 50  0001 C CNN
-F 1 "GND" H 2555 1077 50  0000 C CNN
-F 2 "" H 2550 1250 50  0001 C CNN
-F 3 "" H 2550 1250 50  0001 C CNN
-	1    2550 1250
-	1    0    0    -1  
-$EndComp
-Text Label 3600 1200 0    50   ~ 0
-ST_9_LED
-Wire Wire Line
-	3600 1200 3450 1200
-$Comp
-L Device:R R9
-U 1 1 605B742A
-P 2800 1100
-F 0 "R9" V 2800 1100 50  0000 C CNN
-F 1 "R" V 2700 1100 50  0000 C CNN
-F 2 "Resistor_SMD:R_0603_1608Metric" V 2730 1100 50  0001 C CNN
-F 3 "~" H 2800 1100 50  0001 C CNN
-	1    2800 1100
-	0    1    1    0   
-$EndComp
-Wire Wire Line
-	3050 1100 2950 1100
-Wire Wire Line
-	2650 1100 2550 1100
-Wire Wire Line
-	2550 1100 2550 1200
-Wire Wire Line
-	3050 1200 2550 1200
-Connection ~ 2550 1200
-Wire Wire Line
-	2550 1200 2550 1250
-Text Label 3600 1700 0    50   ~ 0
-ST_10
-Wire Wire Line
-	3600 1700 3450 1700
-$Comp
-L power:GND #PWR0110
-U 1 1 605B7446
-P 2550 1850
-F 0 "#PWR0110" H 2550 1600 50  0001 C CNN
-F 1 "GND" H 2555 1677 50  0000 C CNN
-F 2 "" H 2550 1850 50  0001 C CNN
-F 3 "" H 2550 1850 50  0001 C CNN
-	1    2550 1850
-	1    0    0    -1  
-$EndComp
-Text Label 3600 1800 0    50   ~ 0
-ST_10_LED
-Wire Wire Line
-	3600 1800 3450 1800
-$Comp
-L Device:R R10
-U 1 1 605B7452
-P 2800 1700
-F 0 "R10" V 2800 1700 50  0000 C CNN
-F 1 "R" V 2700 1700 50  0000 C CNN
-F 2 "Resistor_SMD:R_0603_1608Metric" V 2730 1700 50  0001 C CNN
-F 3 "~" H 2800 1700 50  0001 C CNN
-	1    2800 1700
-	0    1    1    0   
-$EndComp
-Wire Wire Line
-	3050 1700 2950 1700
-Wire Wire Line
-	2650 1700 2550 1700
-Wire Wire Line
-	2550 1700 2550 1800
-Wire Wire Line
-	3050 1800 2550 1800
-Connection ~ 2550 1800
-Wire Wire Line
-	2550 1800 2550 1850
-Text Label 3600 2300 0    50   ~ 0
-ST_11
-Wire Wire Line
-	3600 2300 3450 2300
-$Comp
-L power:GND #PWR0111
-U 1 1 605B746E
-P 2550 2450
-F 0 "#PWR0111" H 2550 2200 50  0001 C CNN
-F 1 "GND" H 2555 2277 50  0000 C CNN
-F 2 "" H 2550 2450 50  0001 C CNN
-F 3 "" H 2550 2450 50  0001 C CNN
-	1    2550 2450
-	1    0    0    -1  
-$EndComp
-Text Label 3600 2400 0    50   ~ 0
-ST_11_LED
-Wire Wire Line
-	3600 2400 3450 2400
-$Comp
-L Device:R R11
-U 1 1 605B747A
-P 2800 2300
-F 0 "R11" V 2800 2300 50  0000 C CNN
-F 1 "R" V 2700 2300 50  0000 C CNN
-F 2 "Resistor_SMD:R_0603_1608Metric" V 2730 2300 50  0001 C CNN
-F 3 "~" H 2800 2300 50  0001 C CNN
-	1    2800 2300
-	0    1    1    0   
-$EndComp
-Wire Wire Line
-	3050 2300 2950 2300
-Wire Wire Line
-	2650 2300 2550 2300
-Wire Wire Line
-	2550 2300 2550 2400
-Wire Wire Line
-	3050 2400 2550 2400
-Connection ~ 2550 2400
-Wire Wire Line
-	2550 2400 2550 2450
-Text Label 3600 2900 0    50   ~ 0
-ST_12
-Wire Wire Line
-	3600 2900 3450 2900
-$Comp
-L power:GND #PWR0112
-U 1 1 605B7496
-P 2550 3050
-F 0 "#PWR0112" H 2550 2800 50  0001 C CNN
-F 1 "GND" H 2555 2877 50  0000 C CNN
-F 2 "" H 2550 3050 50  0001 C CNN
-F 3 "" H 2550 3050 50  0001 C CNN
-	1    2550 3050
-	1    0    0    -1  
-$EndComp
-Text Label 3600 3000 0    50   ~ 0
-ST_12_LED
-Wire Wire Line
-	3600 3000 3450 3000
-$Comp
-L Device:R R12
-U 1 1 605B74A2
-P 2800 2900
-F 0 "R12" V 2800 2900 50  0000 C CNN
-F 1 "R" V 2700 2900 50  0000 C CNN
-F 2 "Resistor_SMD:R_0603_1608Metric" V 2730 2900 50  0001 C CNN
-F 3 "~" H 2800 2900 50  0001 C CNN
-	1    2800 2900
-	0    1    1    0   
-$EndComp
-Wire Wire Line
-	3050 2900 2950 2900
-Wire Wire Line
-	2650 2900 2550 2900
-Wire Wire Line
-	2550 2900 2550 3000
-Wire Wire Line
-	3050 3000 2550 3000
-Connection ~ 2550 3000
-Wire Wire Line
-	2550 3000 2550 3050
-Text Label 3600 3500 0    50   ~ 0
-ST_13
-Wire Wire Line
-	3600 3500 3450 3500
-$Comp
-L power:GND #PWR0113
-U 1 1 605B74BE
-P 2550 3650
-F 0 "#PWR0113" H 2550 3400 50  0001 C CNN
-F 1 "GND" H 2555 3477 50  0000 C CNN
-F 2 "" H 2550 3650 50  0001 C CNN
-F 3 "" H 2550 3650 50  0001 C CNN
-	1    2550 3650
-	1    0    0    -1  
-$EndComp
-Text Label 3600 3600 0    50   ~ 0
-ST_13_LED
-Wire Wire Line
-	3600 3600 3450 3600
-$Comp
-L Device:R R13
-U 1 1 605B74CA
-P 2800 3500
-F 0 "R13" V 2800 3500 50  0000 C CNN
-F 1 "R" V 2700 3500 50  0000 C CNN
-F 2 "Resistor_SMD:R_0603_1608Metric" V 2730 3500 50  0001 C CNN
-F 3 "~" H 2800 3500 50  0001 C CNN
-	1    2800 3500
-	0    1    1    0   
-$EndComp
-Wire Wire Line
-	3050 3500 2950 3500
-Wire Wire Line
-	2650 3500 2550 3500
-Wire Wire Line
-	2550 3500 2550 3600
-Wire Wire Line
-	3050 3600 2550 3600
-Connection ~ 2550 3600
-Wire Wire Line
-	2550 3600 2550 3650
-Text Label 3600 4100 0    50   ~ 0
-ST_14
-Wire Wire Line
-	3600 4100 3450 4100
-$Comp
-L power:GND #PWR0114
-U 1 1 605B74E6
-P 2550 4250
-F 0 "#PWR0114" H 2550 4000 50  0001 C CNN
-F 1 "GND" H 2555 4077 50  0000 C CNN
-F 2 "" H 2550 4250 50  0001 C CNN
-F 3 "" H 2550 4250 50  0001 C CNN
-	1    2550 4250
-	1    0    0    -1  
-$EndComp
-Text Label 3600 4200 0    50   ~ 0
-ST_14_LED
-Wire Wire Line
-	3600 4200 3450 4200
-$Comp
-L Device:R R14
-U 1 1 605B74F2
-P 2800 4100
-F 0 "R14" V 2800 4100 50  0000 C CNN
-F 1 "R" V 2700 4100 50  0000 C CNN
-F 2 "Resistor_SMD:R_0603_1608Metric" V 2730 4100 50  0001 C CNN
-F 3 "~" H 2800 4100 50  0001 C CNN
-	1    2800 4100
-	0    1    1    0   
-$EndComp
-Wire Wire Line
-	3050 4100 2950 4100
-Wire Wire Line
-	2650 4100 2550 4100
-Wire Wire Line
-	2550 4100 2550 4200
-Wire Wire Line
-	3050 4200 2550 4200
-Connection ~ 2550 4200
-Wire Wire Line
-	2550 4200 2550 4250
-Text Label 3600 4700 0    50   ~ 0
-ST_15
-Wire Wire Line
-	3600 4700 3450 4700
-$Comp
-L power:GND #PWR0115
-U 1 1 605B750E
-P 2550 4850
-F 0 "#PWR0115" H 2550 4600 50  0001 C CNN
-F 1 "GND" H 2555 4677 50  0000 C CNN
-F 2 "" H 2550 4850 50  0001 C CNN
-F 3 "" H 2550 4850 50  0001 C CNN
-	1    2550 4850
-	1    0    0    -1  
-$EndComp
-Text Label 3600 4800 0    50   ~ 0
-ST_15_LED
-Wire Wire Line
-	3600 4800 3450 4800
-$Comp
-L Device:R R15
-U 1 1 605B751A
-P 2800 4700
-F 0 "R15" V 2800 4700 50  0000 C CNN
-F 1 "R" V 2700 4700 50  0000 C CNN
-F 2 "Resistor_SMD:R_0603_1608Metric" V 2730 4700 50  0001 C CNN
-F 3 "~" H 2800 4700 50  0001 C CNN
-	1    2800 4700
-	0    1    1    0   
-$EndComp
-Wire Wire Line
-	3050 4700 2950 4700
-Wire Wire Line
-	2650 4700 2550 4700
-Wire Wire Line
-	2550 4700 2550 4800
-Wire Wire Line
-	3050 4800 2550 4800
-Connection ~ 2550 4800
-Wire Wire Line
-	2550 4800 2550 4850
-Text Label 3600 5300 0    50   ~ 0
-ST_16
-Wire Wire Line
-	3600 5300 3450 5300
-$Comp
-L power:GND #PWR0116
-U 1 1 605B7536
-P 2550 5450
-F 0 "#PWR0116" H 2550 5200 50  0001 C CNN
-F 1 "GND" H 2555 5277 50  0000 C CNN
-F 2 "" H 2550 5450 50  0001 C CNN
-F 3 "" H 2550 5450 50  0001 C CNN
-	1    2550 5450
-	1    0    0    -1  
-$EndComp
-Text Label 3600 5400 0    50   ~ 0
-ST_16_LED
-Wire Wire Line
-	3600 5400 3450 5400
-$Comp
-L Device:R R16
-U 1 1 605B7542
-P 2800 5300
-F 0 "R16" V 2800 5300 50  0000 C CNN
-F 1 "R" V 2700 5300 50  0000 C CNN
-F 2 "Resistor_SMD:R_0603_1608Metric" V 2730 5300 50  0001 C CNN
-F 3 "~" H 2800 5300 50  0001 C CNN
-	1    2800 5300
-	0    1    1    0   
-$EndComp
-Wire Wire Line
-	3050 5300 2950 5300
-Wire Wire Line
-	2650 5300 2550 5300
-Wire Wire Line
-	2550 5300 2550 5400
-Wire Wire Line
-	3050 5400 2550 5400
-Connection ~ 2550 5400
-Wire Wire Line
-	2550 5400 2550 5450
 $Comp
 L MCU_ST_STM32F1:STM32F103C8Tx U1
 U 1 1 605E001D
-P 9000 3300
-F 0 "U1" H 8950 3250 50  0000 C CNN
-F 1 "STM32F103C8Tx" H 8950 2700 50  0000 C CNN
-F 2 "Package_QFP:LQFP-48_7x7mm_P0.5mm" H 8400 1900 50  0001 R CNN
-F 3 "http://www.st.com/st-web-ui/static/active/en/resource/technical/document/datasheet/CD00161566.pdf" H 9000 3300 50  0001 C CNN
-	1    9000 3300
+P 9150 3600
+F 0 "U1" H 9100 3550 50  0000 C CNN
+F 1 "STM32F103C8Tx" H 9100 3000 50  0000 C CNN
+F 2 "Package_QFP:LQFP-48_7x7mm_P0.5mm" H 8550 2200 50  0001 R CNN
+F 3 "http://www.st.com/st-web-ui/static/active/en/resource/technical/document/datasheet/CD00161566.pdf" H 9150 3600 50  0001 C CNN
+	1    9150 3600
 	1    0    0    -1  
 $EndComp
 Wire Wire Line
-	8900 1800 8900 1400
+	9050 2100 9050 1700
 Wire Wire Line
-	8900 1400 9000 1400
+	9050 1700 9150 1700
 Wire Wire Line
-	9000 1400 9000 1800
+	9150 1700 9150 2100
 Wire Wire Line
-	9000 1400 9100 1400
+	9150 1700 9250 1700
 Wire Wire Line
-	9100 1400 9100 1800
-Connection ~ 9000 1400
+	9250 1700 9250 2100
+Connection ~ 9150 1700
 $Comp
 L power:VCC #PWR0117
 U 1 1 605EF4C5
-P 9000 800
-F 0 "#PWR0117" H 9000 650 50  0001 C CNN
-F 1 "VCC" H 9015 973 50  0000 C CNN
-F 2 "" H 9000 800 50  0001 C CNN
-F 3 "" H 9000 800 50  0001 C CNN
-	1    9000 800 
+P 9150 1100
+F 0 "#PWR0117" H 9150 950 50  0001 C CNN
+F 1 "VCC" H 9165 1273 50  0000 C CNN
+F 2 "" H 9150 1100 50  0001 C CNN
+F 3 "" H 9150 1100 50  0001 C CNN
+	1    9150 1100
 	1    0    0    -1  
 $EndComp
 $Comp
 L Device:C C1
 U 1 1 60601D72
-P 9200 1150
-F 0 "C1" H 9315 1196 50  0000 L CNN
-F 1 "C" H 9315 1105 50  0000 L CNN
-F 2 "Capacitor_SMD:C_0603_1608Metric" H 9238 1000 50  0001 C CNN
-F 3 "~" H 9200 1150 50  0001 C CNN
-	1    9200 1150
+P 9350 1450
+F 0 "C1" H 9465 1496 50  0000 L CNN
+F 1 "C" H 9465 1405 50  0000 L CNN
+F 2 "Capacitor_SMD:C_0603_1608Metric" H 9388 1300 50  0001 C CNN
+F 3 "~" H 9350 1450 50  0001 C CNN
+	1    9350 1450
 	1    0    0    -1  
 $EndComp
 Wire Wire Line
-	9100 1400 9200 1400
+	9250 1700 9350 1700
 Wire Wire Line
-	9200 1400 9200 1300
-Connection ~ 9100 1400
+	9350 1700 9350 1600
+Connection ~ 9250 1700
 Wire Wire Line
-	9200 1000 9200 900 
+	9350 1300 9350 1200
 Wire Wire Line
-	9200 900  9000 900 
+	9350 1200 9150 1200
 Wire Wire Line
-	9000 900  9000 1400
+	9150 1200 9150 1700
 Wire Wire Line
-	9000 900  9000 800 
-Connection ~ 9000 900 
+	9150 1200 9150 1100
+Connection ~ 9150 1200
 Wire Wire Line
-	8800 4800 8800 5150
+	8950 5100 8950 5450
 Wire Wire Line
-	8800 5150 9000 5150
+	8950 5450 9150 5450
 Wire Wire Line
-	9000 5150 9000 4800
+	9150 5450 9150 5100
 Wire Wire Line
-	8900 4800 8900 5350
+	9050 5100 9050 5650
 $Comp
 L power:GND #PWR0118
 U 1 1 6063784E
-P 8900 5350
-F 0 "#PWR0118" H 8900 5100 50  0001 C CNN
-F 1 "GND" H 8905 5177 50  0000 C CNN
-F 2 "" H 8900 5350 50  0001 C CNN
-F 3 "" H 8900 5350 50  0001 C CNN
-	1    8900 5350
-	1    0    0    -1  
-$EndComp
-$Comp
-L Switch:SW_Push_LED SW1
-U 1 1 60638780
-P 1550 1200
-F 0 "SW1" H 1550 1585 50  0000 C CNN
-F 1 "SW_Push_LED" H 1550 1494 50  0000 C CNN
-F 2 "Breadlib:1B3W-9" H 1550 1500 50  0001 C CNN
-F 3 "~" H 1550 1500 50  0001 C CNN
-	1    1550 1200
-	1    0    0    -1  
-$EndComp
-$Comp
-L Switch:SW_Push_LED SW2
-U 1 1 6064326E
-P 1550 1800
-F 0 "SW2" H 1550 2185 50  0000 C CNN
-F 1 "SW_Push_LED" H 1550 2094 50  0000 C CNN
-F 2 "Breadlib:1B3W-9" H 1550 2100 50  0001 C CNN
-F 3 "~" H 1550 2100 50  0001 C CNN
-	1    1550 1800
-	1    0    0    -1  
-$EndComp
-$Comp
-L Switch:SW_Push_LED SW3
-U 1 1 60643E6D
-P 1550 2400
-F 0 "SW3" H 1550 2785 50  0000 C CNN
-F 1 "SW_Push_LED" H 1550 2694 50  0000 C CNN
-F 2 "Breadlib:1B3W-9" H 1550 2700 50  0001 C CNN
-F 3 "~" H 1550 2700 50  0001 C CNN
-	1    1550 2400
-	1    0    0    -1  
-$EndComp
-$Comp
-L Switch:SW_Push_LED SW4
-U 1 1 6064516F
-P 1550 3000
-F 0 "SW4" H 1550 3385 50  0000 C CNN
-F 1 "SW_Push_LED" H 1550 3294 50  0000 C CNN
-F 2 "Breadlib:1B3W-9" H 1550 3300 50  0001 C CNN
-F 3 "~" H 1550 3300 50  0001 C CNN
-	1    1550 3000
-	1    0    0    -1  
-$EndComp
-$Comp
-L Switch:SW_Push_LED SW5
-U 1 1 606458FA
-P 1550 3600
-F 0 "SW5" H 1550 3985 50  0000 C CNN
-F 1 "SW_Push_LED" H 1550 3894 50  0000 C CNN
-F 2 "Breadlib:1B3W-9" H 1550 3900 50  0001 C CNN
-F 3 "~" H 1550 3900 50  0001 C CNN
-	1    1550 3600
-	1    0    0    -1  
-$EndComp
-$Comp
-L Switch:SW_Push_LED SW6
-U 1 1 60646053
-P 1550 4200
-F 0 "SW6" H 1550 4585 50  0000 C CNN
-F 1 "SW_Push_LED" H 1550 4494 50  0000 C CNN
-F 2 "Breadlib:1B3W-9" H 1550 4500 50  0001 C CNN
-F 3 "~" H 1550 4500 50  0001 C CNN
-	1    1550 4200
-	1    0    0    -1  
-$EndComp
-$Comp
-L Switch:SW_Push_LED SW7
-U 1 1 60646ABD
-P 1550 4800
-F 0 "SW7" H 1550 5185 50  0000 C CNN
-F 1 "SW_Push_LED" H 1550 5094 50  0000 C CNN
-F 2 "Breadlib:1B3W-9" H 1550 5100 50  0001 C CNN
-F 3 "~" H 1550 5100 50  0001 C CNN
-	1    1550 4800
-	1    0    0    -1  
-$EndComp
-$Comp
-L Switch:SW_Push_LED SW8
-U 1 1 606472E3
-P 1550 5400
-F 0 "SW8" H 1550 5785 50  0000 C CNN
-F 1 "SW_Push_LED" H 1550 5694 50  0000 C CNN
-F 2 "Breadlib:1B3W-9" H 1550 5700 50  0001 C CNN
-F 3 "~" H 1550 5700 50  0001 C CNN
-	1    1550 5400
-	1    0    0    -1  
-$EndComp
-$Comp
-L Switch:SW_Push_LED SW16
-U 1 1 60655E34
-P 3250 5400
-F 0 "SW16" H 3250 5785 50  0000 C CNN
-F 1 "SW_Push_LED" H 3250 5694 50  0000 C CNN
-F 2 "Breadlib:1B3W-9" H 3250 5700 50  0001 C CNN
-F 3 "~" H 3250 5700 50  0001 C CNN
-	1    3250 5400
-	1    0    0    -1  
-$EndComp
-$Comp
-L Switch:SW_Push_LED SW15
-U 1 1 60656E57
-P 3250 4800
-F 0 "SW15" H 3250 5185 50  0000 C CNN
-F 1 "SW_Push_LED" H 3250 5094 50  0000 C CNN
-F 2 "Breadlib:1B3W-9" H 3250 5100 50  0001 C CNN
-F 3 "~" H 3250 5100 50  0001 C CNN
-	1    3250 4800
-	1    0    0    -1  
-$EndComp
-$Comp
-L Switch:SW_Push_LED SW14
-U 1 1 606575B5
-P 3250 4200
-F 0 "SW14" H 3250 4585 50  0000 C CNN
-F 1 "SW_Push_LED" H 3250 4494 50  0000 C CNN
-F 2 "Breadlib:1B3W-9" H 3250 4500 50  0001 C CNN
-F 3 "~" H 3250 4500 50  0001 C CNN
-	1    3250 4200
-	1    0    0    -1  
-$EndComp
-$Comp
-L Switch:SW_Push_LED SW13
-U 1 1 60657CF0
-P 3250 3600
-F 0 "SW13" H 3250 3985 50  0000 C CNN
-F 1 "SW_Push_LED" H 3250 3894 50  0000 C CNN
-F 2 "Breadlib:1B3W-9" H 3250 3900 50  0001 C CNN
-F 3 "~" H 3250 3900 50  0001 C CNN
-	1    3250 3600
-	1    0    0    -1  
-$EndComp
-$Comp
-L Switch:SW_Push_LED SW12
-U 1 1 60658A7F
-P 3250 3000
-F 0 "SW12" H 3250 3385 50  0000 C CNN
-F 1 "SW_Push_LED" H 3250 3294 50  0000 C CNN
-F 2 "Breadlib:1B3W-9" H 3250 3300 50  0001 C CNN
-F 3 "~" H 3250 3300 50  0001 C CNN
-	1    3250 3000
+P 9050 5650
+F 0 "#PWR0118" H 9050 5400 50  0001 C CNN
+F 1 "GND" H 9055 5477 50  0000 C CNN
+F 2 "" H 9050 5650 50  0001 C CNN
+F 3 "" H 9050 5650 50  0001 C CNN
+	1    9050 5650
 	1    0    0    -1  
 $EndComp
-$Comp
-L Switch:SW_Push_LED SW11
-U 1 1 6065921E
-P 3250 2400
-F 0 "SW11" H 3250 2785 50  0000 C CNN
-F 1 "SW_Push_LED" H 3250 2694 50  0000 C CNN
-F 2 "Breadlib:1B3W-9" H 3250 2700 50  0001 C CNN
-F 3 "~" H 3250 2700 50  0001 C CNN
-	1    3250 2400
-	1    0    0    -1  
-$EndComp
-$Comp
-L Switch:SW_Push_LED SW10
-U 1 1 60659CBA
-P 3250 1800
-F 0 "SW10" H 3250 2185 50  0000 C CNN
-F 1 "SW_Push_LED" H 3250 2094 50  0000 C CNN
-F 2 "Breadlib:1B3W-9" H 3250 2100 50  0001 C CNN
-F 3 "~" H 3250 2100 50  0001 C CNN
-	1    3250 1800
-	1    0    0    -1  
-$EndComp
-$Comp
-L Switch:SW_Push_LED SW9
-U 1 1 6065A4C7
-P 3250 1200
-F 0 "SW9" H 3250 1585 50  0000 C CNN
-F 1 "SW_Push_LED" H 3250 1494 50  0000 C CNN
-F 2 "Breadlib:1B3W-9" H 3250 1500 50  0001 C CNN
-F 3 "~" H 3250 1500 50  0001 C CNN
-	1    3250 1200
-	1    0    0    -1  
-$EndComp
-$Comp
-L Device:R R17
-U 1 1 606795C0
-P 7850 3100
-F 0 "R17" V 7850 3100 50  0000 C CNN
-F 1 "R" V 7800 3250 50  0000 C CNN
-F 2 "Resistor_SMD:R_0603_1608Metric" V 7780 3100 50  0001 C CNN
-F 3 "~" H 7850 3100 50  0001 C CNN
-	1    7850 3100
-	0    1    1    0   
-$EndComp
-$Comp
-L Device:R R18
-U 1 1 6067987C
-P 7850 3200
-F 0 "R18" V 7850 3200 50  0000 C CNN
-F 1 "R" V 7800 3350 50  0000 C CNN
-F 2 "Resistor_SMD:R_0603_1608Metric" V 7780 3200 50  0001 C CNN
-F 3 "~" H 7850 3200 50  0001 C CNN
-	1    7850 3200
-	0    1    1    0   
-$EndComp
-$Comp
-L Device:R R19
-U 1 1 60679E90
-P 7850 3300
-F 0 "R19" V 7850 3300 50  0000 C CNN
-F 1 "R" V 7800 3450 50  0000 C CNN
-F 2 "Resistor_SMD:R_0603_1608Metric" V 7780 3300 50  0001 C CNN
-F 3 "~" H 7850 3300 50  0001 C CNN
-	1    7850 3300
-	0    1    1    0   
-$EndComp
-$Comp
-L Device:R R20
-U 1 1 6067A04B
-P 7850 3400
-F 0 "R20" V 7850 3400 50  0000 C CNN
-F 1 "R" V 7800 3550 50  0000 C CNN
-F 2 "Resistor_SMD:R_0603_1608Metric" V 7780 3400 50  0001 C CNN
-F 3 "~" H 7850 3400 50  0001 C CNN
-	1    7850 3400
-	0    1    1    0   
-$EndComp
-$Comp
-L Device:R R21
-U 1 1 6067AC0D
-P 7850 3500
-F 0 "R21" V 7850 3500 50  0000 C CNN
-F 1 "R" V 7800 3650 50  0000 C CNN
-F 2 "Resistor_SMD:R_0603_1608Metric" V 7780 3500 50  0001 C CNN
-F 3 "~" H 7850 3500 50  0001 C CNN
-	1    7850 3500
-	0    1    1    0   
-$EndComp
-$Comp
-L Device:R R22
-U 1 1 6067ADF2
-P 7850 3600
-F 0 "R22" V 7850 3600 50  0000 C CNN
-F 1 "R" V 7800 3750 50  0000 C CNN
-F 2 "Resistor_SMD:R_0603_1608Metric" V 7780 3600 50  0001 C CNN
-F 3 "~" H 7850 3600 50  0001 C CNN
-	1    7850 3600
-	0    1    1    0   
-$EndComp
-$Comp
-L Device:R R23
-U 1 1 6067AFD2
-P 7850 3700
-F 0 "R23" V 7850 3700 50  0000 C CNN
-F 1 "R" V 7800 3850 50  0000 C CNN
-F 2 "Resistor_SMD:R_0603_1608Metric" V 7780 3700 50  0001 C CNN
-F 3 "~" H 7850 3700 50  0001 C CNN
-	1    7850 3700
-	0    1    1    0   
-$EndComp
-$Comp
-L Device:R R24
-U 1 1 6067B264
-P 7850 3800
-F 0 "R24" V 7850 3800 50  0000 C CNN
-F 1 "R" V 7800 3950 50  0000 C CNN
-F 2 "Resistor_SMD:R_0603_1608Metric" V 7780 3800 50  0001 C CNN
-F 3 "~" H 7850 3800 50  0001 C CNN
-	1    7850 3800
-	0    1    1    0   
-$EndComp
-Wire Wire Line
-	9850 3200 9600 3200
-Wire Wire Line
-	9850 3300 9600 3300
-Wire Wire Line
-	9850 3400 9600 3400
-Wire Wire Line
-	9850 3500 9600 3500
-Wire Wire Line
-	9850 3600 9600 3600
-Wire Wire Line
-	9850 3700 9600 3700
-Wire Wire Line
-	9850 3800 9600 3800
-$Comp
-L Device:R R25
-U 1 1 6068071A
-P 10000 3200
-F 0 "R25" V 10000 3200 50  0000 C CNN
-F 1 "R" V 9950 3350 50  0000 C CNN
-F 2 "Resistor_SMD:R_0603_1608Metric" V 9930 3200 50  0001 C CNN
-F 3 "~" H 10000 3200 50  0001 C CNN
-	1    10000 3200
-	0    1    1    0   
-$EndComp
-$Comp
-L Device:R R26
-U 1 1 60680724
-P 10000 3300
-F 0 "R26" V 10000 3300 50  0000 C CNN
-F 1 "R" V 9950 3450 50  0000 C CNN
-F 2 "Resistor_SMD:R_0603_1608Metric" V 9930 3300 50  0001 C CNN
-F 3 "~" H 10000 3300 50  0001 C CNN
-	1    10000 3300
-	0    1    1    0   
-$EndComp
-$Comp
-L Device:R R27
-U 1 1 6068072E
-P 10000 3400
-F 0 "R27" V 10000 3400 50  0000 C CNN
-F 1 "R" V 9950 3550 50  0000 C CNN
-F 2 "Resistor_SMD:R_0603_1608Metric" V 9930 3400 50  0001 C CNN
-F 3 "~" H 10000 3400 50  0001 C CNN
-	1    10000 3400
-	0    1    1    0   
-$EndComp
-$Comp
-L Device:R R28
-U 1 1 60680738
-P 10000 3500
-F 0 "R28" V 10000 3500 50  0000 C CNN
-F 1 "R" V 9950 3650 50  0000 C CNN
-F 2 "Resistor_SMD:R_0603_1608Metric" V 9930 3500 50  0001 C CNN
-F 3 "~" H 10000 3500 50  0001 C CNN
-	1    10000 3500
-	0    1    1    0   
-$EndComp
-$Comp
-L Device:R R29
-U 1 1 60680742
-P 10000 3600
-F 0 "R29" V 10000 3600 50  0000 C CNN
-F 1 "R" V 9950 3750 50  0000 C CNN
-F 2 "Resistor_SMD:R_0603_1608Metric" V 9930 3600 50  0001 C CNN
-F 3 "~" H 10000 3600 50  0001 C CNN
-	1    10000 3600
-	0    1    1    0   
-$EndComp
-$Comp
-L Device:R R30
-U 1 1 6068074C
-P 10000 3700
-F 0 "R30" V 10000 3700 50  0000 C CNN
-F 1 "R" V 9950 3850 50  0000 C CNN
-F 2 "Resistor_SMD:R_0603_1608Metric" V 9930 3700 50  0001 C CNN
-F 3 "~" H 10000 3700 50  0001 C CNN
-	1    10000 3700
-	0    1    1    0   
-$EndComp
-$Comp
-L Device:R R31
-U 1 1 60680756
-P 10000 3800
-F 0 "R31" V 10000 3800 50  0000 C CNN
-F 1 "R" V 9950 3950 50  0000 C CNN
-F 2 "Resistor_SMD:R_0603_1608Metric" V 9930 3800 50  0001 C CNN
-F 3 "~" H 10000 3800 50  0001 C CNN
-	1    10000 3800
-	0    1    1    0   
-$EndComp
-$Comp
-L Device:R R32
-U 1 1 60680760
-P 10000 3900
-F 0 "R32" V 10000 3900 50  0000 C CNN
-F 1 "R" V 9950 4050 50  0000 C CNN
-F 2 "Resistor_SMD:R_0603_1608Metric" V 9930 3900 50  0001 C CNN
-F 3 "~" H 10000 3900 50  0001 C CNN
-	1    10000 3900
-	0    1    1    0   
-$EndComp
-Wire Wire Line
-	9600 3900 9850 3900
-Wire Wire Line
-	10150 3200 10250 3200
-Wire Wire Line
-	10250 3300 10150 3300
-Wire Wire Line
-	10150 3400 10250 3400
-Wire Wire Line
-	10250 3500 10150 3500
-Wire Wire Line
-	10150 3600 10250 3600
-Wire Wire Line
-	10250 3700 10150 3700
-Wire Wire Line
-	10150 3800 10250 3800
 Wire Wire Line
-	10250 3900 10150 3900
+	10000 3500 9750 3500
 Wire Wire Line
-	7700 3100 7600 3100
+	10000 3600 9750 3600
 Wire Wire Line
-	7700 3200 7600 3200
+	10000 3700 9750 3700
 Wire Wire Line
-	7600 3300 7700 3300
+	10000 3800 9750 3800
 Wire Wire Line
-	7700 3400 7600 3400
+	10000 3900 9750 3900
 Wire Wire Line
-	7600 3500 7700 3500
+	10000 4000 9750 4000
 Wire Wire Line
-	7700 3600 7600 3600
+	10000 4100 9750 4100
 Wire Wire Line
-	7600 3700 7700 3700
-Wire Wire Line
-	7700 3800 7600 3800
-Text Label 7600 3100 2    50   ~ 0
-ST_1
-Text Label 7600 3200 2    50   ~ 0
-ST_2
-Text Label 7600 3300 2    50   ~ 0
-ST_3
-Text Label 7600 3400 2    50   ~ 0
-ST_4
-Text Label 7600 3500 2    50   ~ 0
-ST_5
-Text Label 7600 3600 2    50   ~ 0
-ST_6
-Text Label 7600 3700 2    50   ~ 0
-ST_7
-Text Label 7600 3800 2    50   ~ 0
-ST_8
-Text Label 10250 3900 0    50   ~ 0
-ST_8_LED
-Text Label 10250 3800 0    50   ~ 0
-ST_7_LED
-Text Label 10250 3700 0    50   ~ 0
-ST_6_LED
-Text Label 10250 3600 0    50   ~ 0
-ST_5_LED
-Text Label 10250 3500 0    50   ~ 0
-ST_4_LED
-Text Label 10250 3400 0    50   ~ 0
-ST_3_LED
-Text Label 10250 3300 0    50   ~ 0
-ST_2_LED
-Text Label 10250 3200 0    50   ~ 0
-ST_1_LED
-Text Label 9900 3100 0    50   ~ 0
+	9750 4200 10000 4200
+Text Label 10050 3400 0    50   ~ 0
 Random
 Wire Wire Line
-	9900 3100 9600 3100
-NoConn ~ 8300 2800
-NoConn ~ 8300 2900
-NoConn ~ 8300 2700
-NoConn ~ 8300 2400
-NoConn ~ 8300 2500
+	10050 3400 9750 3400
+NoConn ~ 8450 3100
+NoConn ~ 8450 3200
+NoConn ~ 8450 3000
+NoConn ~ 8450 2700
+NoConn ~ 8450 2800
 $Comp
 L power:GND #PWR?
 U 1 1 6097F098
-P 7150 2200
-F 0 "#PWR?" H 7150 1950 50  0001 C CNN
-F 1 "GND" V 7155 2072 50  0000 R CNN
-F 2 "" H 7150 2200 50  0001 C CNN
-F 3 "" H 7150 2200 50  0001 C CNN
-	1    7150 2200
+P 7300 2500
+F 0 "#PWR?" H 7300 2250 50  0001 C CNN
+F 1 "GND" V 7305 2372 50  0000 R CNN
+F 2 "" H 7300 2500 50  0001 C CNN
+F 3 "" H 7300 2500 50  0001 C CNN
+	1    7300 2500
 	0    1    1    0   
 $EndComp
 $Comp
 L Device:R R?
 U 1 1 6097FA88
-P 7500 2200
-F 0 "R?" V 7293 2200 50  0000 C CNN
-F 1 "320R" V 7500 2200 50  0000 C CNN
-F 2 "" V 7430 2200 50  0001 C CNN
-F 3 "~" H 7500 2200 50  0001 C CNN
-	1    7500 2200
+P 7650 2500
+F 0 "R?" V 7443 2500 50  0000 C CNN
+F 1 "320R" V 7650 2500 50  0000 C CNN
+F 2 "" V 7580 2500 50  0001 C CNN
+F 3 "~" H 7650 2500 50  0001 C CNN
+	1    7650 2500
 	0    1    1    0   
 $EndComp
 Wire Wire Line
-	8300 2200 7850 2200
+	8450 2500 8000 2500
 Wire Wire Line
-	7350 2200 7150 2200
+	7500 2500 7300 2500
 $Comp
 L Connector:TestPoint TP?
 U 1 1 60998D6D
-P 7850 2000
-F 0 "TP?" H 7700 2200 50  0000 L CNN
-F 1 "TestPoint" H 7900 2200 50  0000 L CNN
-F 2 "" H 8050 2000 50  0001 C CNN
-F 3 "~" H 8050 2000 50  0001 C CNN
-	1    7850 2000
+P 8000 2300
+F 0 "TP?" H 7850 2500 50  0000 L CNN
+F 1 "TestPoint" H 8050 2500 50  0000 L CNN
+F 2 "" H 8200 2300 50  0001 C CNN
+F 3 "~" H 8200 2300 50  0001 C CNN
+	1    8000 2300
 	1    0    0    -1  
 $EndComp
 Wire Wire Line
-	7850 2000 7850 2200
-Connection ~ 7850 2200
+	8000 2300 8000 2500
+Connection ~ 8000 2500
+Wire Wire Line
+	8000 2500 7800 2500
+NoConn ~ 10050 3400
+$Sheet
+S 900  1150 1950 1150
+U 6095C163
+F0 "LED I/O" 50
+F1 "button_leds.sch" 50
+F2 "LED_1" I R 2850 1250 50 
+F3 "LED_2" I R 2850 1350 50 
+F4 "LED_3" I R 2850 1450 50 
+F5 "LED_4" I R 2850 1550 50 
+F6 "LED_5" I R 2850 1650 50 
+F7 "LED_6" I R 2850 1750 50 
+F8 "LED_A" I R 2850 1950 50 
+F9 "LED_B" I R 2850 2050 50 
+F10 "LED_C" I R 2850 2150 50 
+$EndSheet
+Wire Wire Line
+	2850 1250 3100 1250
+Wire Wire Line
+	2850 1350 3100 1350
+Wire Wire Line
+	2850 1450 3100 1450
+Wire Wire Line
+	2850 1550 3100 1550
+Wire Wire Line
+	2850 1650 3100 1650
+Wire Wire Line
+	2850 1750 3100 1750
+Wire Wire Line
+	2850 1950 3100 1950
+Wire Wire Line
+	2850 2050 3100 2050
 Wire Wire Line
-	7850 2200 7650 2200
+	2850 2150 3100 2150
+Wire Notes Line
+	650  650  650  2950
+Wire Notes Line
+	650  2950 4300 2950
+Wire Notes Line
+	4300 2950 4300 650 
+Wire Notes Line
+	4300 650  650  650 
+Text Notes 700  2900 0    79   ~ 0
+Button LED logic
 Wire Wire Line
-	8300 3100 8000 3100
+	8150 4100 8450 4100
 Wire Wire Line
-	8000 3200 8300 3200
+	8450 4000 8150 4000
 Wire Wire Line
-	8300 3300 8000 3300
+	8150 3900 8450 3900
 Wire Wire Line
-	8000 3400 8300 3400
+	8450 3800 8150 3800
 Wire Wire Line
-	8300 3500 8000 3500
+	8150 3700 8450 3700
 Wire Wire Line
-	8000 3600 8300 3600
+	8450 3600 8150 3600
 Wire Wire Line
-	8300 3700 8000 3700
+	8150 3500 8450 3500
 Wire Wire Line
-	8000 3800 8300 3800
-NoConn ~ 9900 3100
+	8450 3400 8150 3400
+Wire Notes Line
+	6650 600  6650 6300
+Wire Notes Line
+	6650 6300 11100 6300
+Wire Notes Line
+	11100 6300 11100 600 
+Wire Notes Line
+	11100 600  6650 600 
 $EndSCHEMATC
diff --git a/hardware/devices/euro-yesman-1u/board/yesman-board.sch-bak b/hardware/devices/euro-yesman-1u/board/yesman-board.sch-bak
index 17c6ae7d55b..36d2623a8d2 100644
--- a/hardware/devices/euro-yesman-1u/board/yesman-board.sch-bak
+++ b/hardware/devices/euro-yesman-1u/board/yesman-board.sch-bak
@@ -3,7 +3,7 @@ EELAYER 30 0
 EELAYER END
 $Descr A4 11693 8268
 encoding utf-8
-Sheet 1 1
+Sheet 1 2
 Title ""
 Date ""
 Rev ""
@@ -13,1237 +13,216 @@ Comment2 ""
 Comment3 ""
 Comment4 ""
 $EndDescr
-Text Label 1900 1100 0    50   ~ 0
-ST_1
-Wire Wire Line
-	1900 1100 1750 1100
-$Comp
-L power:GND #PWR0101
-U 1 1 60586AA3
-P 850 1250
-F 0 "#PWR0101" H 850 1000 50  0001 C CNN
-F 1 "GND" H 855 1077 50  0000 C CNN
-F 2 "" H 850 1250 50  0001 C CNN
-F 3 "" H 850 1250 50  0001 C CNN
-	1    850  1250
-	1    0    0    -1  
-$EndComp
-Text Label 1900 1200 0    50   ~ 0
-ST_1_LED
-Wire Wire Line
-	1900 1200 1750 1200
-$Comp
-L Device:R R1
-U 1 1 6058C74D
-P 1100 1100
-F 0 "R1" V 1100 1100 50  0000 C CNN
-F 1 "R" V 1000 1100 50  0000 C CNN
-F 2 "Resistor_SMD:R_0603_1608Metric" V 1030 1100 50  0001 C CNN
-F 3 "~" H 1100 1100 50  0001 C CNN
-	1    1100 1100
-	0    1    1    0   
-$EndComp
-Wire Wire Line
-	1350 1100 1250 1100
-Wire Wire Line
-	950  1100 850  1100
-Wire Wire Line
-	850  1100 850  1200
-Wire Wire Line
-	1350 1200 850  1200
-Connection ~ 850  1200
-Wire Wire Line
-	850  1200 850  1250
-Text Label 1900 1700 0    50   ~ 0
-ST_2
-Wire Wire Line
-	1900 1700 1750 1700
-$Comp
-L power:GND #PWR0102
-U 1 1 605925C5
-P 850 1850
-F 0 "#PWR0102" H 850 1600 50  0001 C CNN
-F 1 "GND" H 855 1677 50  0000 C CNN
-F 2 "" H 850 1850 50  0001 C CNN
-F 3 "" H 850 1850 50  0001 C CNN
-	1    850  1850
-	1    0    0    -1  
-$EndComp
-Text Label 1900 1800 0    50   ~ 0
-ST_2_LED
-Wire Wire Line
-	1900 1800 1750 1800
-$Comp
-L Device:R R2
-U 1 1 605925D1
-P 1100 1700
-F 0 "R2" V 1100 1700 50  0000 C CNN
-F 1 "R" V 1000 1700 50  0000 C CNN
-F 2 "Resistor_SMD:R_0603_1608Metric" V 1030 1700 50  0001 C CNN
-F 3 "~" H 1100 1700 50  0001 C CNN
-	1    1100 1700
-	0    1    1    0   
-$EndComp
-Wire Wire Line
-	1350 1700 1250 1700
-Wire Wire Line
-	950  1700 850  1700
-Wire Wire Line
-	850  1700 850  1800
-Wire Wire Line
-	1350 1800 850  1800
-Connection ~ 850  1800
-Wire Wire Line
-	850  1800 850  1850
-Text Label 1900 2300 0    50   ~ 0
-ST_3
-Wire Wire Line
-	1900 2300 1750 2300
-$Comp
-L power:GND #PWR0103
-U 1 1 60593F6C
-P 850 2450
-F 0 "#PWR0103" H 850 2200 50  0001 C CNN
-F 1 "GND" H 855 2277 50  0000 C CNN
-F 2 "" H 850 2450 50  0001 C CNN
-F 3 "" H 850 2450 50  0001 C CNN
-	1    850  2450
-	1    0    0    -1  
-$EndComp
-Text Label 1900 2400 0    50   ~ 0
-ST_3_LED
-Wire Wire Line
-	1900 2400 1750 2400
-$Comp
-L Device:R R3
-U 1 1 60593F78
-P 1100 2300
-F 0 "R3" V 1100 2300 50  0000 C CNN
-F 1 "R" V 1000 2300 50  0000 C CNN
-F 2 "Resistor_SMD:R_0603_1608Metric" V 1030 2300 50  0001 C CNN
-F 3 "~" H 1100 2300 50  0001 C CNN
-	1    1100 2300
-	0    1    1    0   
-$EndComp
-Wire Wire Line
-	1350 2300 1250 2300
-Wire Wire Line
-	950  2300 850  2300
-Wire Wire Line
-	850  2300 850  2400
-Wire Wire Line
-	1350 2400 850  2400
-Connection ~ 850  2400
-Wire Wire Line
-	850  2400 850  2450
-Text Label 1900 2900 0    50   ~ 0
-ST_4
-Wire Wire Line
-	1900 2900 1750 2900
-$Comp
-L power:GND #PWR0104
-U 1 1 60593F94
-P 850 3050
-F 0 "#PWR0104" H 850 2800 50  0001 C CNN
-F 1 "GND" H 855 2877 50  0000 C CNN
-F 2 "" H 850 3050 50  0001 C CNN
-F 3 "" H 850 3050 50  0001 C CNN
-	1    850  3050
-	1    0    0    -1  
-$EndComp
-Text Label 1900 3000 0    50   ~ 0
-ST_4_LED
-Wire Wire Line
-	1900 3000 1750 3000
-$Comp
-L Device:R R4
-U 1 1 60593FA0
-P 1100 2900
-F 0 "R4" V 1100 2900 50  0000 C CNN
-F 1 "R" V 1000 2900 50  0000 C CNN
-F 2 "Resistor_SMD:R_0603_1608Metric" V 1030 2900 50  0001 C CNN
-F 3 "~" H 1100 2900 50  0001 C CNN
-	1    1100 2900
-	0    1    1    0   
-$EndComp
-Wire Wire Line
-	1350 2900 1250 2900
-Wire Wire Line
-	950  2900 850  2900
-Wire Wire Line
-	850  2900 850  3000
-Wire Wire Line
-	1350 3000 850  3000
-Connection ~ 850  3000
-Wire Wire Line
-	850  3000 850  3050
-Text Label 1900 3500 0    50   ~ 0
-ST_5
-Wire Wire Line
-	1900 3500 1750 3500
-$Comp
-L power:GND #PWR0105
-U 1 1 60596BCA
-P 850 3650
-F 0 "#PWR0105" H 850 3400 50  0001 C CNN
-F 1 "GND" H 855 3477 50  0000 C CNN
-F 2 "" H 850 3650 50  0001 C CNN
-F 3 "" H 850 3650 50  0001 C CNN
-	1    850  3650
-	1    0    0    -1  
-$EndComp
-Text Label 1900 3600 0    50   ~ 0
-ST_5_LED
-Wire Wire Line
-	1900 3600 1750 3600
-$Comp
-L Device:R R5
-U 1 1 60596BD6
-P 1100 3500
-F 0 "R5" V 1100 3500 50  0000 C CNN
-F 1 "R" V 1000 3500 50  0000 C CNN
-F 2 "Resistor_SMD:R_0603_1608Metric" V 1030 3500 50  0001 C CNN
-F 3 "~" H 1100 3500 50  0001 C CNN
-	1    1100 3500
-	0    1    1    0   
-$EndComp
-Wire Wire Line
-	1350 3500 1250 3500
-Wire Wire Line
-	950  3500 850  3500
-Wire Wire Line
-	850  3500 850  3600
-Wire Wire Line
-	1350 3600 850  3600
-Connection ~ 850  3600
-Wire Wire Line
-	850  3600 850  3650
-Text Label 1900 4100 0    50   ~ 0
-ST_6
-Wire Wire Line
-	1900 4100 1750 4100
-$Comp
-L power:GND #PWR0106
-U 1 1 60596BF2
-P 850 4250
-F 0 "#PWR0106" H 850 4000 50  0001 C CNN
-F 1 "GND" H 855 4077 50  0000 C CNN
-F 2 "" H 850 4250 50  0001 C CNN
-F 3 "" H 850 4250 50  0001 C CNN
-	1    850  4250
-	1    0    0    -1  
-$EndComp
-Text Label 1900 4200 0    50   ~ 0
-ST_6_LED
-Wire Wire Line
-	1900 4200 1750 4200
-$Comp
-L Device:R R6
-U 1 1 60596BFE
-P 1100 4100
-F 0 "R6" V 1100 4100 50  0000 C CNN
-F 1 "R" V 1000 4100 50  0000 C CNN
-F 2 "Resistor_SMD:R_0603_1608Metric" V 1030 4100 50  0001 C CNN
-F 3 "~" H 1100 4100 50  0001 C CNN
-	1    1100 4100
-	0    1    1    0   
-$EndComp
-Wire Wire Line
-	1350 4100 1250 4100
-Wire Wire Line
-	950  4100 850  4100
-Wire Wire Line
-	850  4100 850  4200
-Wire Wire Line
-	1350 4200 850  4200
-Connection ~ 850  4200
-Wire Wire Line
-	850  4200 850  4250
-Text Label 1900 4700 0    50   ~ 0
-ST_7
-Wire Wire Line
-	1900 4700 1750 4700
-$Comp
-L power:GND #PWR0107
-U 1 1 60596C1A
-P 850 4850
-F 0 "#PWR0107" H 850 4600 50  0001 C CNN
-F 1 "GND" H 855 4677 50  0000 C CNN
-F 2 "" H 850 4850 50  0001 C CNN
-F 3 "" H 850 4850 50  0001 C CNN
-	1    850  4850
-	1    0    0    -1  
-$EndComp
-Text Label 1900 4800 0    50   ~ 0
-ST_7_LED
-Wire Wire Line
-	1900 4800 1750 4800
-$Comp
-L Device:R R7
-U 1 1 60596C26
-P 1100 4700
-F 0 "R7" V 1100 4700 50  0000 C CNN
-F 1 "R" V 1000 4700 50  0000 C CNN
-F 2 "Resistor_SMD:R_0603_1608Metric" V 1030 4700 50  0001 C CNN
-F 3 "~" H 1100 4700 50  0001 C CNN
-	1    1100 4700
-	0    1    1    0   
-$EndComp
-Wire Wire Line
-	1350 4700 1250 4700
-Wire Wire Line
-	950  4700 850  4700
-Wire Wire Line
-	850  4700 850  4800
-Wire Wire Line
-	1350 4800 850  4800
-Connection ~ 850  4800
-Wire Wire Line
-	850  4800 850  4850
-Text Label 1900 5300 0    50   ~ 0
-ST_8
-Wire Wire Line
-	1900 5300 1750 5300
-$Comp
-L power:GND #PWR0108
-U 1 1 60596C42
-P 850 5450
-F 0 "#PWR0108" H 850 5200 50  0001 C CNN
-F 1 "GND" H 855 5277 50  0000 C CNN
-F 2 "" H 850 5450 50  0001 C CNN
-F 3 "" H 850 5450 50  0001 C CNN
-	1    850  5450
-	1    0    0    -1  
-$EndComp
-Text Label 1900 5400 0    50   ~ 0
-ST_8_LED
-Wire Wire Line
-	1900 5400 1750 5400
-$Comp
-L Device:R R8
-U 1 1 60596C4E
-P 1100 5300
-F 0 "R8" V 1100 5300 50  0000 C CNN
-F 1 "R" V 1000 5300 50  0000 C CNN
-F 2 "Resistor_SMD:R_0603_1608Metric" V 1030 5300 50  0001 C CNN
-F 3 "~" H 1100 5300 50  0001 C CNN
-	1    1100 5300
-	0    1    1    0   
-$EndComp
-Wire Wire Line
-	1350 5300 1250 5300
-Wire Wire Line
-	950  5300 850  5300
-Wire Wire Line
-	850  5300 850  5400
-Wire Wire Line
-	1350 5400 850  5400
-Connection ~ 850  5400
-Wire Wire Line
-	850  5400 850  5450
-Text Label 3600 1100 0    50   ~ 0
-ST_9
-Wire Wire Line
-	3600 1100 3450 1100
-$Comp
-L power:GND #PWR0109
-U 1 1 605B741E
-P 2550 1250
-F 0 "#PWR0109" H 2550 1000 50  0001 C CNN
-F 1 "GND" H 2555 1077 50  0000 C CNN
-F 2 "" H 2550 1250 50  0001 C CNN
-F 3 "" H 2550 1250 50  0001 C CNN
-	1    2550 1250
-	1    0    0    -1  
-$EndComp
-Text Label 3600 1200 0    50   ~ 0
-ST_9_LED
-Wire Wire Line
-	3600 1200 3450 1200
-$Comp
-L Device:R R9
-U 1 1 605B742A
-P 2800 1100
-F 0 "R9" V 2800 1100 50  0000 C CNN
-F 1 "R" V 2700 1100 50  0000 C CNN
-F 2 "Resistor_SMD:R_0603_1608Metric" V 2730 1100 50  0001 C CNN
-F 3 "~" H 2800 1100 50  0001 C CNN
-	1    2800 1100
-	0    1    1    0   
-$EndComp
-Wire Wire Line
-	3050 1100 2950 1100
-Wire Wire Line
-	2650 1100 2550 1100
-Wire Wire Line
-	2550 1100 2550 1200
-Wire Wire Line
-	3050 1200 2550 1200
-Connection ~ 2550 1200
-Wire Wire Line
-	2550 1200 2550 1250
-Text Label 3600 1700 0    50   ~ 0
-ST_10
-Wire Wire Line
-	3600 1700 3450 1700
-$Comp
-L power:GND #PWR0110
-U 1 1 605B7446
-P 2550 1850
-F 0 "#PWR0110" H 2550 1600 50  0001 C CNN
-F 1 "GND" H 2555 1677 50  0000 C CNN
-F 2 "" H 2550 1850 50  0001 C CNN
-F 3 "" H 2550 1850 50  0001 C CNN
-	1    2550 1850
-	1    0    0    -1  
-$EndComp
-Text Label 3600 1800 0    50   ~ 0
-ST_10_LED
-Wire Wire Line
-	3600 1800 3450 1800
-$Comp
-L Device:R R10
-U 1 1 605B7452
-P 2800 1700
-F 0 "R10" V 2800 1700 50  0000 C CNN
-F 1 "R" V 2700 1700 50  0000 C CNN
-F 2 "Resistor_SMD:R_0603_1608Metric" V 2730 1700 50  0001 C CNN
-F 3 "~" H 2800 1700 50  0001 C CNN
-	1    2800 1700
-	0    1    1    0   
-$EndComp
-Wire Wire Line
-	3050 1700 2950 1700
-Wire Wire Line
-	2650 1700 2550 1700
-Wire Wire Line
-	2550 1700 2550 1800
-Wire Wire Line
-	3050 1800 2550 1800
-Connection ~ 2550 1800
-Wire Wire Line
-	2550 1800 2550 1850
-Text Label 3600 2300 0    50   ~ 0
-ST_11
-Wire Wire Line
-	3600 2300 3450 2300
-$Comp
-L power:GND #PWR0111
-U 1 1 605B746E
-P 2550 2450
-F 0 "#PWR0111" H 2550 2200 50  0001 C CNN
-F 1 "GND" H 2555 2277 50  0000 C CNN
-F 2 "" H 2550 2450 50  0001 C CNN
-F 3 "" H 2550 2450 50  0001 C CNN
-	1    2550 2450
-	1    0    0    -1  
-$EndComp
-Text Label 3600 2400 0    50   ~ 0
-ST_11_LED
-Wire Wire Line
-	3600 2400 3450 2400
-$Comp
-L Device:R R11
-U 1 1 605B747A
-P 2800 2300
-F 0 "R11" V 2800 2300 50  0000 C CNN
-F 1 "R" V 2700 2300 50  0000 C CNN
-F 2 "Resistor_SMD:R_0603_1608Metric" V 2730 2300 50  0001 C CNN
-F 3 "~" H 2800 2300 50  0001 C CNN
-	1    2800 2300
-	0    1    1    0   
-$EndComp
-Wire Wire Line
-	3050 2300 2950 2300
-Wire Wire Line
-	2650 2300 2550 2300
-Wire Wire Line
-	2550 2300 2550 2400
-Wire Wire Line
-	3050 2400 2550 2400
-Connection ~ 2550 2400
-Wire Wire Line
-	2550 2400 2550 2450
-Text Label 3600 2900 0    50   ~ 0
-ST_12
-Wire Wire Line
-	3600 2900 3450 2900
-$Comp
-L power:GND #PWR0112
-U 1 1 605B7496
-P 2550 3050
-F 0 "#PWR0112" H 2550 2800 50  0001 C CNN
-F 1 "GND" H 2555 2877 50  0000 C CNN
-F 2 "" H 2550 3050 50  0001 C CNN
-F 3 "" H 2550 3050 50  0001 C CNN
-	1    2550 3050
-	1    0    0    -1  
-$EndComp
-Text Label 3600 3000 0    50   ~ 0
-ST_12_LED
-Wire Wire Line
-	3600 3000 3450 3000
-$Comp
-L Device:R R12
-U 1 1 605B74A2
-P 2800 2900
-F 0 "R12" V 2800 2900 50  0000 C CNN
-F 1 "R" V 2700 2900 50  0000 C CNN
-F 2 "Resistor_SMD:R_0603_1608Metric" V 2730 2900 50  0001 C CNN
-F 3 "~" H 2800 2900 50  0001 C CNN
-	1    2800 2900
-	0    1    1    0   
-$EndComp
-Wire Wire Line
-	3050 2900 2950 2900
-Wire Wire Line
-	2650 2900 2550 2900
-Wire Wire Line
-	2550 2900 2550 3000
-Wire Wire Line
-	3050 3000 2550 3000
-Connection ~ 2550 3000
-Wire Wire Line
-	2550 3000 2550 3050
-Text Label 3600 3500 0    50   ~ 0
-ST_13
-Wire Wire Line
-	3600 3500 3450 3500
-$Comp
-L power:GND #PWR0113
-U 1 1 605B74BE
-P 2550 3650
-F 0 "#PWR0113" H 2550 3400 50  0001 C CNN
-F 1 "GND" H 2555 3477 50  0000 C CNN
-F 2 "" H 2550 3650 50  0001 C CNN
-F 3 "" H 2550 3650 50  0001 C CNN
-	1    2550 3650
-	1    0    0    -1  
-$EndComp
-Text Label 3600 3600 0    50   ~ 0
-ST_13_LED
-Wire Wire Line
-	3600 3600 3450 3600
-$Comp
-L Device:R R13
-U 1 1 605B74CA
-P 2800 3500
-F 0 "R13" V 2800 3500 50  0000 C CNN
-F 1 "R" V 2700 3500 50  0000 C CNN
-F 2 "Resistor_SMD:R_0603_1608Metric" V 2730 3500 50  0001 C CNN
-F 3 "~" H 2800 3500 50  0001 C CNN
-	1    2800 3500
-	0    1    1    0   
-$EndComp
-Wire Wire Line
-	3050 3500 2950 3500
-Wire Wire Line
-	2650 3500 2550 3500
-Wire Wire Line
-	2550 3500 2550 3600
-Wire Wire Line
-	3050 3600 2550 3600
-Connection ~ 2550 3600
-Wire Wire Line
-	2550 3600 2550 3650
-Text Label 3600 4100 0    50   ~ 0
-ST_14
-Wire Wire Line
-	3600 4100 3450 4100
-$Comp
-L power:GND #PWR0114
-U 1 1 605B74E6
-P 2550 4250
-F 0 "#PWR0114" H 2550 4000 50  0001 C CNN
-F 1 "GND" H 2555 4077 50  0000 C CNN
-F 2 "" H 2550 4250 50  0001 C CNN
-F 3 "" H 2550 4250 50  0001 C CNN
-	1    2550 4250
-	1    0    0    -1  
-$EndComp
-Text Label 3600 4200 0    50   ~ 0
-ST_14_LED
-Wire Wire Line
-	3600 4200 3450 4200
-$Comp
-L Device:R R14
-U 1 1 605B74F2
-P 2800 4100
-F 0 "R14" V 2800 4100 50  0000 C CNN
-F 1 "R" V 2700 4100 50  0000 C CNN
-F 2 "Resistor_SMD:R_0603_1608Metric" V 2730 4100 50  0001 C CNN
-F 3 "~" H 2800 4100 50  0001 C CNN
-	1    2800 4100
-	0    1    1    0   
-$EndComp
-Wire Wire Line
-	3050 4100 2950 4100
-Wire Wire Line
-	2650 4100 2550 4100
-Wire Wire Line
-	2550 4100 2550 4200
-Wire Wire Line
-	3050 4200 2550 4200
-Connection ~ 2550 4200
-Wire Wire Line
-	2550 4200 2550 4250
-Text Label 3600 4700 0    50   ~ 0
-ST_15
-Wire Wire Line
-	3600 4700 3450 4700
-$Comp
-L power:GND #PWR0115
-U 1 1 605B750E
-P 2550 4850
-F 0 "#PWR0115" H 2550 4600 50  0001 C CNN
-F 1 "GND" H 2555 4677 50  0000 C CNN
-F 2 "" H 2550 4850 50  0001 C CNN
-F 3 "" H 2550 4850 50  0001 C CNN
-	1    2550 4850
-	1    0    0    -1  
-$EndComp
-Text Label 3600 4800 0    50   ~ 0
-ST_15_LED
-Wire Wire Line
-	3600 4800 3450 4800
-$Comp
-L Device:R R15
-U 1 1 605B751A
-P 2800 4700
-F 0 "R15" V 2800 4700 50  0000 C CNN
-F 1 "R" V 2700 4700 50  0000 C CNN
-F 2 "Resistor_SMD:R_0603_1608Metric" V 2730 4700 50  0001 C CNN
-F 3 "~" H 2800 4700 50  0001 C CNN
-	1    2800 4700
-	0    1    1    0   
-$EndComp
-Wire Wire Line
-	3050 4700 2950 4700
-Wire Wire Line
-	2650 4700 2550 4700
-Wire Wire Line
-	2550 4700 2550 4800
-Wire Wire Line
-	3050 4800 2550 4800
-Connection ~ 2550 4800
-Wire Wire Line
-	2550 4800 2550 4850
-Text Label 3600 5300 0    50   ~ 0
-ST_16
-Wire Wire Line
-	3600 5300 3450 5300
-$Comp
-L power:GND #PWR0116
-U 1 1 605B7536
-P 2550 5450
-F 0 "#PWR0116" H 2550 5200 50  0001 C CNN
-F 1 "GND" H 2555 5277 50  0000 C CNN
-F 2 "" H 2550 5450 50  0001 C CNN
-F 3 "" H 2550 5450 50  0001 C CNN
-	1    2550 5450
-	1    0    0    -1  
-$EndComp
-Text Label 3600 5400 0    50   ~ 0
-ST_16_LED
-Wire Wire Line
-	3600 5400 3450 5400
-$Comp
-L Device:R R16
-U 1 1 605B7542
-P 2800 5300
-F 0 "R16" V 2800 5300 50  0000 C CNN
-F 1 "R" V 2700 5300 50  0000 C CNN
-F 2 "Resistor_SMD:R_0603_1608Metric" V 2730 5300 50  0001 C CNN
-F 3 "~" H 2800 5300 50  0001 C CNN
-	1    2800 5300
-	0    1    1    0   
-$EndComp
-Wire Wire Line
-	3050 5300 2950 5300
-Wire Wire Line
-	2650 5300 2550 5300
-Wire Wire Line
-	2550 5300 2550 5400
-Wire Wire Line
-	3050 5400 2550 5400
-Connection ~ 2550 5400
-Wire Wire Line
-	2550 5400 2550 5450
 $Comp
 L MCU_ST_STM32F1:STM32F103C8Tx U1
 U 1 1 605E001D
-P 9000 3300
-F 0 "U1" H 8950 3250 50  0000 C CNN
-F 1 "STM32F103C8Tx" H 8950 2700 50  0000 C CNN
-F 2 "Package_QFP:LQFP-48_7x7mm_P0.5mm" H 8400 1900 50  0001 R CNN
-F 3 "http://www.st.com/st-web-ui/static/active/en/resource/technical/document/datasheet/CD00161566.pdf" H 9000 3300 50  0001 C CNN
-	1    9000 3300
+P 9150 3600
+F 0 "U1" H 9100 3550 50  0000 C CNN
+F 1 "STM32F103C8Tx" H 9100 3000 50  0000 C CNN
+F 2 "Package_QFP:LQFP-48_7x7mm_P0.5mm" H 8550 2200 50  0001 R CNN
+F 3 "http://www.st.com/st-web-ui/static/active/en/resource/technical/document/datasheet/CD00161566.pdf" H 9150 3600 50  0001 C CNN
+	1    9150 3600
 	1    0    0    -1  
 $EndComp
 Wire Wire Line
-	8900 1800 8900 1400
+	9050 2100 9050 1700
 Wire Wire Line
-	8900 1400 9000 1400
+	9050 1700 9150 1700
 Wire Wire Line
-	9000 1400 9000 1800
+	9150 1700 9150 2100
 Wire Wire Line
-	9000 1400 9100 1400
+	9150 1700 9250 1700
 Wire Wire Line
-	9100 1400 9100 1800
-Connection ~ 9000 1400
+	9250 1700 9250 2100
+Connection ~ 9150 1700
 $Comp
 L power:VCC #PWR0117
 U 1 1 605EF4C5
-P 9000 800
-F 0 "#PWR0117" H 9000 650 50  0001 C CNN
-F 1 "VCC" H 9015 973 50  0000 C CNN
-F 2 "" H 9000 800 50  0001 C CNN
-F 3 "" H 9000 800 50  0001 C CNN
-	1    9000 800 
+P 9150 1100
+F 0 "#PWR0117" H 9150 950 50  0001 C CNN
+F 1 "VCC" H 9165 1273 50  0000 C CNN
+F 2 "" H 9150 1100 50  0001 C CNN
+F 3 "" H 9150 1100 50  0001 C CNN
+	1    9150 1100
 	1    0    0    -1  
 $EndComp
 $Comp
 L Device:C C1
 U 1 1 60601D72
-P 9200 1150
-F 0 "C1" H 9315 1196 50  0000 L CNN
-F 1 "C" H 9315 1105 50  0000 L CNN
-F 2 "Capacitor_SMD:C_0603_1608Metric" H 9238 1000 50  0001 C CNN
-F 3 "~" H 9200 1150 50  0001 C CNN
-	1    9200 1150
+P 9350 1450
+F 0 "C1" H 9465 1496 50  0000 L CNN
+F 1 "C" H 9465 1405 50  0000 L CNN
+F 2 "Capacitor_SMD:C_0603_1608Metric" H 9388 1300 50  0001 C CNN
+F 3 "~" H 9350 1450 50  0001 C CNN
+	1    9350 1450
 	1    0    0    -1  
 $EndComp
 Wire Wire Line
-	9100 1400 9200 1400
+	9250 1700 9350 1700
 Wire Wire Line
-	9200 1400 9200 1300
-Connection ~ 9100 1400
+	9350 1700 9350 1600
+Connection ~ 9250 1700
 Wire Wire Line
-	9200 1000 9200 900 
+	9350 1300 9350 1200
 Wire Wire Line
-	9200 900  9000 900 
+	9350 1200 9150 1200
 Wire Wire Line
-	9000 900  9000 1400
+	9150 1200 9150 1700
 Wire Wire Line
-	9000 900  9000 800 
-Connection ~ 9000 900 
+	9150 1200 9150 1100
+Connection ~ 9150 1200
 Wire Wire Line
-	8800 4800 8800 5150
+	8950 5100 8950 5450
 Wire Wire Line
-	8800 5150 9000 5150
+	8950 5450 9150 5450
 Wire Wire Line
-	9000 5150 9000 4800
+	9150 5450 9150 5100
 Wire Wire Line
-	8900 4800 8900 5350
+	9050 5100 9050 5650
 $Comp
 L power:GND #PWR0118
 U 1 1 6063784E
-P 8900 5350
-F 0 "#PWR0118" H 8900 5100 50  0001 C CNN
-F 1 "GND" H 8905 5177 50  0000 C CNN
-F 2 "" H 8900 5350 50  0001 C CNN
-F 3 "" H 8900 5350 50  0001 C CNN
-	1    8900 5350
-	1    0    0    -1  
-$EndComp
-$Comp
-L Switch:SW_Push_LED SW1
-U 1 1 60638780
-P 1550 1200
-F 0 "SW1" H 1550 1585 50  0000 C CNN
-F 1 "SW_Push_LED" H 1550 1494 50  0000 C CNN
-F 2 "Breadlib:1B3W-9" H 1550 1500 50  0001 C CNN
-F 3 "~" H 1550 1500 50  0001 C CNN
-	1    1550 1200
-	1    0    0    -1  
-$EndComp
-$Comp
-L Switch:SW_Push_LED SW2
-U 1 1 6064326E
-P 1550 1800
-F 0 "SW2" H 1550 2185 50  0000 C CNN
-F 1 "SW_Push_LED" H 1550 2094 50  0000 C CNN
-F 2 "Breadlib:1B3W-9" H 1550 2100 50  0001 C CNN
-F 3 "~" H 1550 2100 50  0001 C CNN
-	1    1550 1800
-	1    0    0    -1  
-$EndComp
-$Comp
-L Switch:SW_Push_LED SW3
-U 1 1 60643E6D
-P 1550 2400
-F 0 "SW3" H 1550 2785 50  0000 C CNN
-F 1 "SW_Push_LED" H 1550 2694 50  0000 C CNN
-F 2 "Breadlib:1B3W-9" H 1550 2700 50  0001 C CNN
-F 3 "~" H 1550 2700 50  0001 C CNN
-	1    1550 2400
-	1    0    0    -1  
-$EndComp
-$Comp
-L Switch:SW_Push_LED SW4
-U 1 1 6064516F
-P 1550 3000
-F 0 "SW4" H 1550 3385 50  0000 C CNN
-F 1 "SW_Push_LED" H 1550 3294 50  0000 C CNN
-F 2 "Breadlib:1B3W-9" H 1550 3300 50  0001 C CNN
-F 3 "~" H 1550 3300 50  0001 C CNN
-	1    1550 3000
-	1    0    0    -1  
-$EndComp
-$Comp
-L Switch:SW_Push_LED SW5
-U 1 1 606458FA
-P 1550 3600
-F 0 "SW5" H 1550 3985 50  0000 C CNN
-F 1 "SW_Push_LED" H 1550 3894 50  0000 C CNN
-F 2 "Breadlib:1B3W-9" H 1550 3900 50  0001 C CNN
-F 3 "~" H 1550 3900 50  0001 C CNN
-	1    1550 3600
-	1    0    0    -1  
-$EndComp
-$Comp
-L Switch:SW_Push_LED SW6
-U 1 1 60646053
-P 1550 4200
-F 0 "SW6" H 1550 4585 50  0000 C CNN
-F 1 "SW_Push_LED" H 1550 4494 50  0000 C CNN
-F 2 "Breadlib:1B3W-9" H 1550 4500 50  0001 C CNN
-F 3 "~" H 1550 4500 50  0001 C CNN
-	1    1550 4200
-	1    0    0    -1  
-$EndComp
-$Comp
-L Switch:SW_Push_LED SW7
-U 1 1 60646ABD
-P 1550 4800
-F 0 "SW7" H 1550 5185 50  0000 C CNN
-F 1 "SW_Push_LED" H 1550 5094 50  0000 C CNN
-F 2 "Breadlib:1B3W-9" H 1550 5100 50  0001 C CNN
-F 3 "~" H 1550 5100 50  0001 C CNN
-	1    1550 4800
-	1    0    0    -1  
-$EndComp
-$Comp
-L Switch:SW_Push_LED SW8
-U 1 1 606472E3
-P 1550 5400
-F 0 "SW8" H 1550 5785 50  0000 C CNN
-F 1 "SW_Push_LED" H 1550 5694 50  0000 C CNN
-F 2 "Breadlib:1B3W-9" H 1550 5700 50  0001 C CNN
-F 3 "~" H 1550 5700 50  0001 C CNN
-	1    1550 5400
-	1    0    0    -1  
-$EndComp
-$Comp
-L Switch:SW_Push_LED SW16
-U 1 1 60655E34
-P 3250 5400
-F 0 "SW16" H 3250 5785 50  0000 C CNN
-F 1 "SW_Push_LED" H 3250 5694 50  0000 C CNN
-F 2 "Breadlib:1B3W-9" H 3250 5700 50  0001 C CNN
-F 3 "~" H 3250 5700 50  0001 C CNN
-	1    3250 5400
-	1    0    0    -1  
-$EndComp
-$Comp
-L Switch:SW_Push_LED SW15
-U 1 1 60656E57
-P 3250 4800
-F 0 "SW15" H 3250 5185 50  0000 C CNN
-F 1 "SW_Push_LED" H 3250 5094 50  0000 C CNN
-F 2 "Breadlib:1B3W-9" H 3250 5100 50  0001 C CNN
-F 3 "~" H 3250 5100 50  0001 C CNN
-	1    3250 4800
-	1    0    0    -1  
-$EndComp
-$Comp
-L Switch:SW_Push_LED SW14
-U 1 1 606575B5
-P 3250 4200
-F 0 "SW14" H 3250 4585 50  0000 C CNN
-F 1 "SW_Push_LED" H 3250 4494 50  0000 C CNN
-F 2 "Breadlib:1B3W-9" H 3250 4500 50  0001 C CNN
-F 3 "~" H 3250 4500 50  0001 C CNN
-	1    3250 4200
-	1    0    0    -1  
-$EndComp
-$Comp
-L Switch:SW_Push_LED SW13
-U 1 1 60657CF0
-P 3250 3600
-F 0 "SW13" H 3250 3985 50  0000 C CNN
-F 1 "SW_Push_LED" H 3250 3894 50  0000 C CNN
-F 2 "Breadlib:1B3W-9" H 3250 3900 50  0001 C CNN
-F 3 "~" H 3250 3900 50  0001 C CNN
-	1    3250 3600
-	1    0    0    -1  
-$EndComp
-$Comp
-L Switch:SW_Push_LED SW12
-U 1 1 60658A7F
-P 3250 3000
-F 0 "SW12" H 3250 3385 50  0000 C CNN
-F 1 "SW_Push_LED" H 3250 3294 50  0000 C CNN
-F 2 "Breadlib:1B3W-9" H 3250 3300 50  0001 C CNN
-F 3 "~" H 3250 3300 50  0001 C CNN
-	1    3250 3000
+P 9050 5650
+F 0 "#PWR0118" H 9050 5400 50  0001 C CNN
+F 1 "GND" H 9055 5477 50  0000 C CNN
+F 2 "" H 9050 5650 50  0001 C CNN
+F 3 "" H 9050 5650 50  0001 C CNN
+	1    9050 5650
 	1    0    0    -1  
 $EndComp
-$Comp
-L Switch:SW_Push_LED SW11
-U 1 1 6065921E
-P 3250 2400
-F 0 "SW11" H 3250 2785 50  0000 C CNN
-F 1 "SW_Push_LED" H 3250 2694 50  0000 C CNN
-F 2 "Breadlib:1B3W-9" H 3250 2700 50  0001 C CNN
-F 3 "~" H 3250 2700 50  0001 C CNN
-	1    3250 2400
-	1    0    0    -1  
-$EndComp
-$Comp
-L Switch:SW_Push_LED SW10
-U 1 1 60659CBA
-P 3250 1800
-F 0 "SW10" H 3250 2185 50  0000 C CNN
-F 1 "SW_Push_LED" H 3250 2094 50  0000 C CNN
-F 2 "Breadlib:1B3W-9" H 3250 2100 50  0001 C CNN
-F 3 "~" H 3250 2100 50  0001 C CNN
-	1    3250 1800
-	1    0    0    -1  
-$EndComp
-$Comp
-L Switch:SW_Push_LED SW9
-U 1 1 6065A4C7
-P 3250 1200
-F 0 "SW9" H 3250 1585 50  0000 C CNN
-F 1 "SW_Push_LED" H 3250 1494 50  0000 C CNN
-F 2 "Breadlib:1B3W-9" H 3250 1500 50  0001 C CNN
-F 3 "~" H 3250 1500 50  0001 C CNN
-	1    3250 1200
-	1    0    0    -1  
-$EndComp
-$Comp
-L Device:R R17
-U 1 1 606795C0
-P 7850 3100
-F 0 "R17" V 7850 3100 50  0000 C CNN
-F 1 "R" V 7800 3250 50  0000 C CNN
-F 2 "Resistor_SMD:R_0603_1608Metric" V 7780 3100 50  0001 C CNN
-F 3 "~" H 7850 3100 50  0001 C CNN
-	1    7850 3100
-	0    1    1    0   
-$EndComp
-$Comp
-L Device:R R18
-U 1 1 6067987C
-P 7850 3200
-F 0 "R18" V 7850 3200 50  0000 C CNN
-F 1 "R" V 7800 3350 50  0000 C CNN
-F 2 "Resistor_SMD:R_0603_1608Metric" V 7780 3200 50  0001 C CNN
-F 3 "~" H 7850 3200 50  0001 C CNN
-	1    7850 3200
-	0    1    1    0   
-$EndComp
-$Comp
-L Device:R R19
-U 1 1 60679E90
-P 7850 3300
-F 0 "R19" V 7850 3300 50  0000 C CNN
-F 1 "R" V 7800 3450 50  0000 C CNN
-F 2 "Resistor_SMD:R_0603_1608Metric" V 7780 3300 50  0001 C CNN
-F 3 "~" H 7850 3300 50  0001 C CNN
-	1    7850 3300
-	0    1    1    0   
-$EndComp
-$Comp
-L Device:R R20
-U 1 1 6067A04B
-P 7850 3400
-F 0 "R20" V 7850 3400 50  0000 C CNN
-F 1 "R" V 7800 3550 50  0000 C CNN
-F 2 "Resistor_SMD:R_0603_1608Metric" V 7780 3400 50  0001 C CNN
-F 3 "~" H 7850 3400 50  0001 C CNN
-	1    7850 3400
-	0    1    1    0   
-$EndComp
-$Comp
-L Device:R R21
-U 1 1 6067AC0D
-P 7850 3500
-F 0 "R21" V 7850 3500 50  0000 C CNN
-F 1 "R" V 7800 3650 50  0000 C CNN
-F 2 "Resistor_SMD:R_0603_1608Metric" V 7780 3500 50  0001 C CNN
-F 3 "~" H 7850 3500 50  0001 C CNN
-	1    7850 3500
-	0    1    1    0   
-$EndComp
-$Comp
-L Device:R R22
-U 1 1 6067ADF2
-P 7850 3600
-F 0 "R22" V 7850 3600 50  0000 C CNN
-F 1 "R" V 7800 3750 50  0000 C CNN
-F 2 "Resistor_SMD:R_0603_1608Metric" V 7780 3600 50  0001 C CNN
-F 3 "~" H 7850 3600 50  0001 C CNN
-	1    7850 3600
-	0    1    1    0   
-$EndComp
-$Comp
-L Device:R R23
-U 1 1 6067AFD2
-P 7850 3700
-F 0 "R23" V 7850 3700 50  0000 C CNN
-F 1 "R" V 7800 3850 50  0000 C CNN
-F 2 "Resistor_SMD:R_0603_1608Metric" V 7780 3700 50  0001 C CNN
-F 3 "~" H 7850 3700 50  0001 C CNN
-	1    7850 3700
-	0    1    1    0   
-$EndComp
-$Comp
-L Device:R R24
-U 1 1 6067B264
-P 7850 3800
-F 0 "R24" V 7850 3800 50  0000 C CNN
-F 1 "R" V 7800 3950 50  0000 C CNN
-F 2 "Resistor_SMD:R_0603_1608Metric" V 7780 3800 50  0001 C CNN
-F 3 "~" H 7850 3800 50  0001 C CNN
-	1    7850 3800
-	0    1    1    0   
-$EndComp
-Wire Wire Line
-	9850 3200 9600 3200
-Wire Wire Line
-	9850 3300 9600 3300
-Wire Wire Line
-	9850 3400 9600 3400
-Wire Wire Line
-	9850 3500 9600 3500
-Wire Wire Line
-	9850 3600 9600 3600
-Wire Wire Line
-	9850 3700 9600 3700
-Wire Wire Line
-	9850 3800 9600 3800
-$Comp
-L Device:R R25
-U 1 1 6068071A
-P 10000 3200
-F 0 "R25" V 10000 3200 50  0000 C CNN
-F 1 "R" V 9950 3350 50  0000 C CNN
-F 2 "Resistor_SMD:R_0603_1608Metric" V 9930 3200 50  0001 C CNN
-F 3 "~" H 10000 3200 50  0001 C CNN
-	1    10000 3200
-	0    1    1    0   
-$EndComp
-$Comp
-L Device:R R26
-U 1 1 60680724
-P 10000 3300
-F 0 "R26" V 10000 3300 50  0000 C CNN
-F 1 "R" V 9950 3450 50  0000 C CNN
-F 2 "Resistor_SMD:R_0603_1608Metric" V 9930 3300 50  0001 C CNN
-F 3 "~" H 10000 3300 50  0001 C CNN
-	1    10000 3300
-	0    1    1    0   
-$EndComp
-$Comp
-L Device:R R27
-U 1 1 6068072E
-P 10000 3400
-F 0 "R27" V 10000 3400 50  0000 C CNN
-F 1 "R" V 9950 3550 50  0000 C CNN
-F 2 "Resistor_SMD:R_0603_1608Metric" V 9930 3400 50  0001 C CNN
-F 3 "~" H 10000 3400 50  0001 C CNN
-	1    10000 3400
-	0    1    1    0   
-$EndComp
-$Comp
-L Device:R R28
-U 1 1 60680738
-P 10000 3500
-F 0 "R28" V 10000 3500 50  0000 C CNN
-F 1 "R" V 9950 3650 50  0000 C CNN
-F 2 "Resistor_SMD:R_0603_1608Metric" V 9930 3500 50  0001 C CNN
-F 3 "~" H 10000 3500 50  0001 C CNN
-	1    10000 3500
-	0    1    1    0   
-$EndComp
-$Comp
-L Device:R R29
-U 1 1 60680742
-P 10000 3600
-F 0 "R29" V 10000 3600 50  0000 C CNN
-F 1 "R" V 9950 3750 50  0000 C CNN
-F 2 "Resistor_SMD:R_0603_1608Metric" V 9930 3600 50  0001 C CNN
-F 3 "~" H 10000 3600 50  0001 C CNN
-	1    10000 3600
-	0    1    1    0   
-$EndComp
-$Comp
-L Device:R R30
-U 1 1 6068074C
-P 10000 3700
-F 0 "R30" V 10000 3700 50  0000 C CNN
-F 1 "R" V 9950 3850 50  0000 C CNN
-F 2 "Resistor_SMD:R_0603_1608Metric" V 9930 3700 50  0001 C CNN
-F 3 "~" H 10000 3700 50  0001 C CNN
-	1    10000 3700
-	0    1    1    0   
-$EndComp
-$Comp
-L Device:R R31
-U 1 1 60680756
-P 10000 3800
-F 0 "R31" V 10000 3800 50  0000 C CNN
-F 1 "R" V 9950 3950 50  0000 C CNN
-F 2 "Resistor_SMD:R_0603_1608Metric" V 9930 3800 50  0001 C CNN
-F 3 "~" H 10000 3800 50  0001 C CNN
-	1    10000 3800
-	0    1    1    0   
-$EndComp
-$Comp
-L Device:R R32
-U 1 1 60680760
-P 10000 3900
-F 0 "R32" V 10000 3900 50  0000 C CNN
-F 1 "R" V 9950 4050 50  0000 C CNN
-F 2 "Resistor_SMD:R_0603_1608Metric" V 9930 3900 50  0001 C CNN
-F 3 "~" H 10000 3900 50  0001 C CNN
-	1    10000 3900
-	0    1    1    0   
-$EndComp
-Wire Wire Line
-	9600 3900 9850 3900
-Wire Wire Line
-	10150 3200 10250 3200
-Wire Wire Line
-	10250 3300 10150 3300
-Wire Wire Line
-	10150 3400 10250 3400
-Wire Wire Line
-	10250 3500 10150 3500
-Wire Wire Line
-	10150 3600 10250 3600
-Wire Wire Line
-	10250 3700 10150 3700
-Wire Wire Line
-	10150 3800 10250 3800
 Wire Wire Line
-	10250 3900 10150 3900
+	10000 3500 9750 3500
 Wire Wire Line
-	7700 3100 7600 3100
+	10000 3600 9750 3600
 Wire Wire Line
-	7700 3200 7600 3200
+	10000 3700 9750 3700
 Wire Wire Line
-	7600 3300 7700 3300
+	10000 3800 9750 3800
 Wire Wire Line
-	7700 3400 7600 3400
+	10000 3900 9750 3900
 Wire Wire Line
-	7600 3500 7700 3500
+	10000 4000 9750 4000
 Wire Wire Line
-	7700 3600 7600 3600
+	10000 4100 9750 4100
 Wire Wire Line
-	7600 3700 7700 3700
-Wire Wire Line
-	7700 3800 7600 3800
-Text Label 7600 3100 2    50   ~ 0
-ST_1_LED
-Text Label 7600 3200 2    50   ~ 0
-ST_2_LED
-Text Label 7600 3300 2    50   ~ 0
-ST_3_LED
-Text Label 7600 3400 2    50   ~ 0
-ST_4_LED
-Text Label 7600 3500 2    50   ~ 0
-ST_5_LED
-Text Label 7600 3600 2    50   ~ 0
-ST_6_LED
-Text Label 7600 3700 2    50   ~ 0
-ST_7_LED
-Text Label 7600 3800 2    50   ~ 0
-ST_8_LED
-Text Label 10250 3900 0    50   ~ 0
-ST_16_LED
-Text Label 10250 3800 0    50   ~ 0
-ST_15_LED
-Text Label 10250 3700 0    50   ~ 0
-ST_14_LED
-Text Label 10250 3600 0    50   ~ 0
-ST_13_LED
-Text Label 10250 3500 0    50   ~ 0
-ST_12_LED
-Text Label 10250 3400 0    50   ~ 0
-ST_11_LED
-Text Label 10250 3300 0    50   ~ 0
-ST_10_LED
-Text Label 10250 3200 0    50   ~ 0
-ST_9_LED
-Text Label 9900 3100 0    50   ~ 0
+	9750 4200 10000 4200
+Text Label 10050 3400 0    50   ~ 0
 Random
 Wire Wire Line
-	9900 3100 9600 3100
-NoConn ~ 8300 2800
-NoConn ~ 8300 2900
-NoConn ~ 8300 2700
-NoConn ~ 8300 2400
-NoConn ~ 8300 2500
+	10050 3400 9750 3400
+NoConn ~ 8450 3100
+NoConn ~ 8450 3200
+NoConn ~ 8450 3000
+NoConn ~ 8450 2700
+NoConn ~ 8450 2800
 $Comp
 L power:GND #PWR?
 U 1 1 6097F098
-P 7150 2200
-F 0 "#PWR?" H 7150 1950 50  0001 C CNN
-F 1 "GND" V 7155 2072 50  0000 R CNN
-F 2 "" H 7150 2200 50  0001 C CNN
-F 3 "" H 7150 2200 50  0001 C CNN
-	1    7150 2200
+P 7300 2500
+F 0 "#PWR?" H 7300 2250 50  0001 C CNN
+F 1 "GND" V 7305 2372 50  0000 R CNN
+F 2 "" H 7300 2500 50  0001 C CNN
+F 3 "" H 7300 2500 50  0001 C CNN
+	1    7300 2500
 	0    1    1    0   
 $EndComp
 $Comp
 L Device:R R?
 U 1 1 6097FA88
-P 7500 2200
-F 0 "R?" V 7293 2200 50  0000 C CNN
-F 1 "320R" V 7500 2200 50  0000 C CNN
-F 2 "" V 7430 2200 50  0001 C CNN
-F 3 "~" H 7500 2200 50  0001 C CNN
-	1    7500 2200
+P 7650 2500
+F 0 "R?" V 7443 2500 50  0000 C CNN
+F 1 "320R" V 7650 2500 50  0000 C CNN
+F 2 "" V 7580 2500 50  0001 C CNN
+F 3 "~" H 7650 2500 50  0001 C CNN
+	1    7650 2500
 	0    1    1    0   
 $EndComp
 Wire Wire Line
-	8300 2200 7850 2200
+	8450 2500 8000 2500
 Wire Wire Line
-	7350 2200 7150 2200
+	7500 2500 7300 2500
 $Comp
 L Connector:TestPoint TP?
 U 1 1 60998D6D
-P 7850 2000
-F 0 "TP?" H 7700 2200 50  0000 L CNN
-F 1 "TestPoint" H 7900 2200 50  0000 L CNN
-F 2 "" H 8050 2000 50  0001 C CNN
-F 3 "~" H 8050 2000 50  0001 C CNN
-	1    7850 2000
+P 8000 2300
+F 0 "TP?" H 7850 2500 50  0000 L CNN
+F 1 "TestPoint" H 8050 2500 50  0000 L CNN
+F 2 "" H 8200 2300 50  0001 C CNN
+F 3 "~" H 8200 2300 50  0001 C CNN
+	1    8000 2300
 	1    0    0    -1  
 $EndComp
 Wire Wire Line
-	7850 2000 7850 2200
-Connection ~ 7850 2200
+	8000 2300 8000 2500
+Connection ~ 8000 2500
+Wire Wire Line
+	8000 2500 7800 2500
+NoConn ~ 10050 3400
+$Sheet
+S 900  1150 1950 1150
+U 6095C163
+F0 "LED I/O" 50
+F1 "button_leds.sch" 50
+F2 "LED_1" I R 2850 1250 50 
+F3 "LED_2" I R 2850 1350 50 
+F4 "LED_3" I R 2850 1450 50 
+F5 "LED_4" I R 2850 1550 50 
+F6 "LED_5" I R 2850 1650 50 
+F7 "LED_6" I R 2850 1750 50 
+F8 "LED_A" I R 2850 1950 50 
+F9 "LED_B" I R 2850 2050 50 
+F10 "LED_C" I R 2850 2150 50 
+$EndSheet
+Wire Wire Line
+	2850 1250 3100 1250
+Wire Wire Line
+	2850 1350 3100 1350
+Wire Wire Line
+	2850 1450 3100 1450
+Wire Wire Line
+	2850 1550 3100 1550
+Wire Wire Line
+	2850 1650 3100 1650
+Wire Wire Line
+	2850 1750 3100 1750
+Wire Wire Line
+	2850 1950 3100 1950
+Wire Wire Line
+	2850 2050 3100 2050
 Wire Wire Line
-	7850 2200 7650 2200
+	2850 2150 3100 2150
+Wire Notes Line
+	650  650  650  2950
+Wire Notes Line
+	650  2950 4300 2950
+Wire Notes Line
+	4300 2950 4300 650 
+Wire Notes Line
+	4300 650  650  650 
+Text Notes 700  2900 0    79   ~ 0
+Button LED logic
 Wire Wire Line
-	8300 3100 8000 3100
+	8150 4100 8450 4100
 Wire Wire Line
-	8000 3200 8300 3200
+	8450 4000 8150 4000
 Wire Wire Line
-	8300 3300 8000 3300
+	8150 3900 8450 3900
 Wire Wire Line
-	8000 3400 8300 3400
+	8450 3800 8150 3800
 Wire Wire Line
-	8300 3500 8000 3500
+	8150 3700 8450 3700
 Wire Wire Line
-	8000 3600 8300 3600
+	8450 3600 8150 3600
 Wire Wire Line
-	8300 3700 8000 3700
+	8150 3500 8450 3500
 Wire Wire Line
-	8000 3800 8300 3800
-NoConn ~ 9900 3100
+	8450 3400 8150 3400
+Wire Notes Line
+	6650 600  6650 6300
+Wire Notes Line
+	6650 6300 11100 6300
+Wire Notes Line
+	11100 6300 11100 600 
+Wire Notes Line
+	11100 600  6650 600 
 $EndSCHEMATC
diff --git a/hardware/devices/euro-yesman-1u/src/io.rs b/hardware/devices/euro-yesman-1u/src/io.rs
index 6f8778ca3c1..430d9097148 100644
--- a/hardware/devices/euro-yesman-1u/src/io.rs
+++ b/hardware/devices/euro-yesman-1u/src/io.rs
@@ -1,23 +1,16 @@
 use crate::{LayerSelect, Sequencer};
-use embedded_hal::digital::v2::{InputPin, OutputPin};
-use stm32f1xx_hal::gpio::{
-    gpioa::{PA1, PA2, PA3, PA4},
-    gpiob::{PB0, PB1, PB5, PB6, PB7, PB8, PB9},
-    Input, Output, PullDown, PushPull,
+use embedded_hal::{
+    digital::v2::{InputPin, OutputPin},
+    prelude::*,
+};
+use stm32f1xx_hal::{
+    delay::Delay,
+    gpio::{
+        gpioa::{PA1, PA2, PA3, PA4},
+        gpiob::{PB0, PB1, PB5, PB6, PB7, PB8},
+        Input, Output, PullDown, PushPull,
+    },
 };
-
-struct NoneOutput;
-
-impl OutputPin for NoneOutput {
-    type Error = ();
-
-    fn set_low(&mut self) -> Result<(), ()> {
-        Ok(())
-    }
-    fn set_high(&mut self) -> Result<(), ()> {
-        Ok(())
-    }
-}
 
 /// An I/O abstraction for yesman
 ///
@@ -31,98 +24,62 @@ pub struct Io {
     pub led2: PA2<Output<PushPull>>,
     pub led3: PA3<Output<PushPull>>,
     pub led4: PA4<Output<PushPull>>,
-
     // Button input states
     pub btn1: PB0<Input<PullDown>>,
     pub btn1_last: bool,
-
     pub btn2: PB1<Input<PullDown>>,
     pub btn2_last: bool,
-
     pub btn3: PB5<Input<PullDown>>,
     pub btn3_last: bool,
-
     pub btn4: PB6<Input<PullDown>>,
     pub btn4_last: bool,
-
     // Eurorack signal I/O
     pub clk: PB7<Input<PullDown>>,
     pub clk_last: bool,
-    pub clk_led: PB9<Output<PushPull>>,
-
     pub gate: PB8<Output<PushPull>>,
 }
-
 impl Io {
+    pub fn startup(&mut self, _: &mut Delay) {
+        set_output(&mut self.led1, true);
+        set_output(&mut self.led2, true);
+        set_output(&mut self.led3, true);
+        set_output(&mut self.led4, true);
+
+        // TODO: silly start-up animation here
+    }
+
     /// Check the state of each pin and update the sequencer accordingly
     pub fn update_sequence(&mut self, seq: &mut Sequencer) {
         // Update sequencer states based on button inputs
-        // btn_rising_edge(&mut self.btn1_last, &mut self.btn1, || seq.toggle(0));
-        // btn_rising_edge(&mut self.btn2_last, &mut self.btn2, || seq.toggle(1));
-        // btn_rising_edge(&mut self.btn3_last, &mut self.btn3, || seq.toggle(2));
-        // btn_rising_edge(&mut self.btn4_last, &mut self.btn4, || seq.toggle(3));
-
-        // // Update LED states based on sequencer
-        // let l = seq.layer(LayerSelect::A);
-        // set_output(&mut self.led1, l[0]);
-        // set_output(&mut self.led2, l[1]);
-        // set_output(&mut self.led3, l[2]);
-        // set_output(&mut self.led4, l[3]);
+        btn_rising_edge(&mut self.btn1_last, &mut self.btn1, || seq.toggle(0));
+        btn_rising_edge(&mut self.btn2_last, &mut self.btn2, || seq.toggle(1));
+        btn_rising_edge(&mut self.btn3_last, &mut self.btn3, || seq.toggle(2));
+        btn_rising_edge(&mut self.btn4_last, &mut self.btn4, || seq.toggle(3));
+
+        // Update LED states based on sequencer
+        let l = seq.layer(LayerSelect::A);
+        set_output(&mut self.led1, l[0]);
+        set_output(&mut self.led2, l[1]);
+        set_output(&mut self.led3, l[2]);
+        set_output(&mut self.led4, l[3]);
     }
 
-    pub fn update_cv(&mut self, seq: &mut Sequencer) {
+    pub fn update_cv(&mut self, _: &mut Sequencer) {
         // Always output the current steps - if no clock is coming in this will change nothing in our output
-        // set_output(&mut self.gate, !seq.get().0);
+        // set_output(&mut self.gate, seq.get().0);
 
-        // // On a rising clock edge, step the sequencer
-        // rising_edge(
-        //     &mut self.clk_last,
-        //     &mut self.clk,
-        //     &mut self.clk_led,
-        //     |led| {
-        //         set_output(led, false);
-        //     },
-        // );
-
-        // If the clock pin is high
-        if let Ok(true) = self.clk.is_high() {
-            // And this is the first time we run this code
-            if !self.clk_last {
-                // Just set the LED to on for now
-                self.clk_led.set_high().ok();
-                self.clk_last = true;
-            }
-
-            // If the clock pin goes low
-        } else if let Ok(false) = self.clk.is_high() {
-            // We set the `last` bool to false and reset the LED
-            self.clk_last = false;
-            self.clk_led.set_low().ok();
-        }
+        // On a rising clock edge, step the sequencer
+        // btn_rising_edge(&mut self.clk_last, &mut self.clk, || seq.step());
     }
 }
 
 /// If the button is pressed _and_ it was previously not pressed,
 /// run the given closure and update the button state to avoid
 /// running it again
-#[inline]
 fn btn_rising_edge<I: InputPin, F: FnMut()>(last: &mut bool, i: &mut I, mut f: F) {
-    rising_edge(last, i, &mut NoneOutput, |_: &mut NoneOutput| f());
-}
-
-/// If the button is pressed _and_ it was previously not pressed,
-/// run the given closure and update the button state to avoid
-/// running it again
-#[inline]
-fn rising_edge<I: InputPin, F: FnMut(&mut O), O: OutputPin>(
-    last: &mut bool,
-    i: &mut I,
-    o: &mut O,
-    mut f: F,
-) {
     if let Ok(true) = i.is_high() {
         if !*last {
-            f(o);
+            f();
             *last = true;
         }
     } else if let Ok(false) = i.is_high() {
@@ -130,6 +87,12 @@ fn rising_edge<I: InputPin, F: FnMut(&mut O), O: OutputPin>(
     }
 }
 
+/// Set the output of a PIN.  For LEDs this means `true` is off,
+/// `false` is on.
+///
+/// This is because LEDs are wired from 3V3 to the output, which turns
+/// a low pin into a drain, and thus power can flow.  This is done to
+/// reduce load on the stm32 when a lot of LEDs are active at once.
 fn set_output<O: OutputPin>(o: &mut O, s: bool) {
     if s {
         o.set_high().ok();
diff --git a/hardware/devices/euro-yesman-1u/src/main.rs b/hardware/devices/euro-yesman-1u/src/main.rs
index 53dcfdf6a9a..66f7db2a65a 100644
--- a/hardware/devices/euro-yesman-1u/src/main.rs
+++ b/hardware/devices/euro-yesman-1u/src/main.rs
@@ -1,72 +1,161 @@
-#![no_main]
 #![no_std]
+#![no_main]
 
-// // mod io;
+use cortex_m_rt::entry;
+use embedded_hal::digital::v2::{InputPin, OutputPin};
+use stm32f1xx_hal::{delay::Delay, pac, prelude::*};
 
-// // mod seq;
-// // pub use seq::{LayerSelect, SeqLayer, Sequencer};
+// Halt the MCU when panic
+#[allow(unused_imports)]
+use panic_halt;
 
-use panic_halt as _;
+mod io;
 
-use core::mem::MaybeUninit;
-use cortex_m_rt::entry;
-use embedded_hal::digital::v2::OutputPin;
-use pac::interrupt;
-use stm32f1xx_hal::gpio::*;
-use stm32f1xx_hal::{pac, prelude::*};
-
-// These two are owned by the ISR. main() may only access them during the initialization phase,
-// where the interrupt is not yet enabled (i.e. no concurrent accesses can occur).
-// After enabling the interrupt, main() may not have any references to these objects any more.
-// For the sake of minimalism, we do not use RTIC here, which would be the better way.
-static mut LED: MaybeUninit<stm32f1xx_hal::gpio::gpiob::PB9<Output<PushPull>>> =
-    MaybeUninit::uninit();
-static mut INT_PIN: MaybeUninit<stm32f1xx_hal::gpio::gpioa::PA7<Input<PullDown>>> =
-    MaybeUninit::uninit();
-
-#[interrupt]
-fn EXTI9_5() {
-    let led = unsafe { &mut *LED.as_mut_ptr() };
-    let int_pin = unsafe { &mut *INT_PIN.as_mut_ptr() };
-
-    if int_pin.check_interrupt() {
-        led.toggle().ok();
-
-        // if we don't clear this bit, the ISR would trigger indefinitely
-        int_pin.clear_interrupt_pending_bit();
-    }
-}
+mod seq;
+pub use seq::{LayerSelect, SeqLayer, Sequencer};
 
 #[entry]
 fn main() -> ! {
-    // initialization phase
-    let p = pac::Peripherals::take().unwrap();
-    let _cp = cortex_m::peripheral::Peripherals::take().unwrap();
-    {
-        // the scope ensures that the int_pin reference is dropped before the first ISR can be executed.
-
-        let mut rcc = p.RCC.constrain();
-        let mut gpioa = p.GPIOA.split(&mut rcc.apb2);
-        let mut gpiob = p.GPIOB.split(&mut rcc.apb2);
-        let mut afio = p.AFIO.constrain(&mut rcc.apb2);
-
-        let led = unsafe { &mut *LED.as_mut_ptr() };
-        *led = gpiob.pb9.into_push_pull_output(&mut gpiob.crh);
-
-        let int_pin = unsafe { &mut *INT_PIN.as_mut_ptr() };
-        *int_pin = gpioa.pa7.into_pull_down_input(&mut gpioa.crl);
-        int_pin.make_interrupt_source(&mut afio);
-        int_pin.trigger_on_edge(&p.EXTI, Edge::RISING);
-        int_pin.enable_interrupt(&p.EXTI);
-    } // initialization ends here
-
-    unsafe {
-        pac::NVIC::unmask(pac::Interrupt::EXTI9_5);
+    // Grab handles for the underlying hardware objects
+    let dp = pac::Peripherals::take().unwrap();
+    let cp = cortex_m::Peripherals::take().unwrap();
+
+    // Initialise GPIOC via the HAL
+    let mut rcc = dp.RCC.constrain();
+    let mut gpioa = dp.GPIOA.split(&mut rcc.apb2);
+    let mut gpiob = dp.GPIOB.split(&mut rcc.apb2);
+
+    // Create an LED output
+    let mut led1 = gpioa.pa1.into_push_pull_output(&mut gpioa.crl);
+    let mut led2 = gpioa.pa2.into_push_pull_output(&mut gpioa.crl);
+    let mut led3 = gpioa.pa3.into_push_pull_output(&mut gpioa.crl);
+    let mut led4 = gpioa.pa4.into_push_pull_output(&mut gpioa.crl);
+
+    // Create a button input
+    let btn1 = gpiob.pb0.into_pull_down_input(&mut gpiob.crl);
+    let btn2 = gpiob.pb1.into_pull_down_input(&mut gpiob.crl);
+    let btn3 = gpiob.pb5.into_pull_down_input(&mut gpiob.crl);
+    let btn4 = gpiob.pb6.into_pull_down_input(&mut gpiob.crl);
+
+    // Eurorack clock input/ gate output
+    let clk = gpiob.pb7.into_pull_down_input(&mut gpiob.crl);
+    let gate = gpiob.pb8.into_push_pull_output(&mut gpiob.crh);
+
+    // Setup the I/O states
+    let mut io = io::Io {
+        led1,
+        led2,
+        led3,
+        led4,
+        btn1,
+        btn2,
+        btn3,
+        btn4,
+        btn1_last: false,
+        btn2_last: false,
+        btn3_last: false,
+        btn4_last: false,
+        clk,
+        clk_last: false,
+        gate,
+    };
+
+    
+    let mut seq = Sequencer::default();
+
+    // Initialize the delay object with the MCU frequency
+    let mut flash = dp.FLASH.constrain();
+    let clocks = rcc
+        .cfgr
+        .use_hse(8.mhz())
+        .sysclk(48.mhz())
+        .pclk1(24.mhz())
+        .freeze(&mut flash.acr);
+    let mut delay = Delay::new(cp.SYST, clocks);
+
+    io.startup(&mut delay);
+    
+    loop {
+        // Update sequencer state based on inputs
+        io.update_sequence(&mut seq);
+
+        // Write out gate CV
+        io.update_cv(&mut seq);
+
+        // Wait 5ms until we do it again
+        delay.delay_ms(5_u16);
     }
-
-    loop {}
 }
 
+// #![no_main]
+// #![no_std]
+
+// // // mod io;
+
+// // // mod seq;
+// // // pub use seq::{LayerSelect, SeqLayer, Sequencer};
+
+// use panic_halt as _;
+
+// use core::mem::MaybeUninit;
+// use cortex_m_rt::entry;
+// use embedded_hal::digital::v2::OutputPin;
+// use pac::interrupt;
+// use stm32f1xx_hal::gpio::*;
+// use stm32f1xx_hal::{pac, prelude::*};
+
+// // These two are owned by the ISR. main() may only access them during the initialization phase,
+// // where the interrupt is not yet enabled (i.e. no concurrent accesses can occur).
+// // After enabling the interrupt, main() may not have any references to these objects any more.
+// // For the sake of minimalism, we do not use RTIC here, which would be the better way.
+// static mut LED: MaybeUninit<stm32f1xx_hal::gpio::gpiob::PB9<Output<PushPull>>> =
+//     MaybeUninit::uninit();
+// static mut INT_PIN: MaybeUninit<stm32f1xx_hal::gpio::gpioa::PA7<Input<PullDown>>> =
+//     MaybeUninit::uninit();
+
+// #[interrupt]
+// fn EXTI9_5() {
+//     let led = unsafe { &mut *LED.as_mut_ptr() };
+//     let int_pin = unsafe { &mut *INT_PIN.as_mut_ptr() };
+
+//     if int_pin.check_interrupt() {
+//         led.toggle().ok();
+
+//         // if we don't clear this bit, the ISR would trigger indefinitely
+//         int_pin.clear_interrupt_pending_bit();
+//     }
+// }
+
+// #[entry]
+// fn main() -> ! {
+//     // initialization phase
+//     let p = pac::Peripherals::take().unwrap();
+//     let _cp = cortex_m::peripheral::Peripherals::take().unwrap();
+//     {
+//         // the scope ensures that the int_pin reference is dropped before the first ISR can be executed.
+
+//         let mut rcc = p.RCC.constrain();
+//         let mut gpioa = p.GPIOA.split(&mut rcc.apb2);
+//         let mut gpiob = p.GPIOB.split(&mut rcc.apb2);
+//         let mut afio = p.AFIO.constrain(&mut rcc.apb2);
+
+//         let led = unsafe { &mut *LED.as_mut_ptr() };
+//         *led = gpiob.pb9.into_push_pull_output(&mut gpiob.crh);
+
+//         let int_pin = unsafe { &mut *INT_PIN.as_mut_ptr() };
+//         *int_pin = gpioa.pa7.into_pull_down_input(&mut gpioa.crl);
+//         int_pin.make_interrupt_source(&mut afio);
+//         int_pin.trigger_on_edge(&p.EXTI, Edge::RISING);
+//         int_pin.enable_interrupt(&p.EXTI);
+//     } // initialization ends here
+
+//     unsafe {
+//         pac::NVIC::unmask(pac::Interrupt::EXTI9_5);
+//     }
+
+//     loop {}
+// }
+
 //// The following code uses RTIC but doesn't work
 // use panic_halt as _;