going to make it (prototype!)

dingyifei · Feb 20, 2020 · 0455010 · 0455010
1 parent 8d26445
commit 0455010
Show file tree

Hide file tree

Showing 10 changed files with 41 additions and 24 deletions.
diff --git a/codes/QMK/F3Discovery68/bootloader_defs.h b/codes/QMK/F3Discovery68/bootloader_defs.h
@@ -0,0 +1,18 @@
+/*
+Copyright (C) 2020 Yifei Ding <dingyifeiair@gmail.com> <yifeiding@protonmail.com>
+
+This program is free software: you can redistribute it and/or modify it
+under the terms of the GNU General Public License as published by the Free
+Software Foundation, either version 3 of the License, or (at your option)
+any later version.
+
+This program is distributed in the hope that it will be useful, but WITHOUT
+ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
+more details.
+
+You should have received a copy of the GNU General Public License along with
+this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+/*boot loader location from AN2606*/
+#define STM32_BOOTLOADER_ADDRESS 0x1FFFF796
diff --git a/codes/QMK/F3Discovery68/config.h b/codes/QMK/F3Discovery68/config.h
@@ -32,5 +32,4 @@ this program.  If not, see <http://www.gnu.org/licenses/>.
 #define USB_MAX_POWER_CONSUMPTION 244
 #define F_SCL 400000L
 #include "config_led.h"
-/*boot loader location from AN2606*/
-/*#define STM32_BOOTLOADER_ADDRESS 0x1FFFF796*/
+
diff --git a/hardware/PCB/PCB.kicad_pcb b/hardware/PCB/PCB.kicad_pcb
@@ -12,8 +12,8 @@
   (page A3)
   (title_block
     (title NHW68)
-    (date 2020-02-10)
-    (rev 0.7)
+    (date 2020-02-19)
+    (rev 0.8)
   )
 
   (layers
@@ -40,7 +40,7 @@
   )
 
   (setup
-    (last_trace_width 0.128)
+    (last_trace_width 0.3)
     (user_trace_width 0.128)
     (user_trace_width 0.2)
     (user_trace_width 0.25)
@@ -13149,13 +13149,13 @@
 
   (gr_line (start 243.3348 118.840351) (end 243.3348 133.840351) (layer Eco1.User) (width 0.15))
   (gr_line (start 92.966085 90.789728) (end 92.966085 193.0398) (layer B.SilkS) (width 0.16) (tstamp 5E368C1A))
-  (gr_text "NHW68\nRev:0.7\nMIT License\nCopyright (c) 2019 Yifei Ding\nhttps://github.com/dingyifei/NHW68/" (at 357.04 93.28) (layer F.SilkS) (tstamp 5E37C7FD)
+  (gr_text "NHW68\nRev:0.8\nMIT License\nCopyright (c) 2019 Yifei Ding\nhttps://github.com/dingyifei/NHW68/" (at 357.04 93.28) (layer F.SilkS) (tstamp 5E37C7FD)
     (effects (font (size 1.5 1.5) (thickness 0.2)) (justify right))
   )
   (gr_text JLCJLCJLCJLC (at 363.32 100.95 90) (layer F.SilkS) (tstamp 5E37C7F7)
     (effects (font (size 1.5 1.5) (thickness 0.2)))
   )
-  (gr_text "NHW68\nRev:0.7\nMIT License\nCopyright (c) 2019 Yifei Ding\nhttps://github.com/dingyifei/NHW68/" (at 357.08 93.27) (layer B.SilkS)
+  (gr_text "NHW68\nRev:0.8\nMIT License\nCopyright (c) 2019 Yifei Ding\nhttps://github.com/dingyifei/NHW68/" (at 357.08 93.27) (layer B.SilkS)
     (effects (font (size 1.5 1.5) (thickness 0.2)) (justify left mirror))
   )
   (gr_line (start 222.316035 90.789728) (end 230.316035 90.789728) (layer B.SilkS) (width 0.16) (tstamp 5E368C02))
@@ -17259,7 +17259,7 @@
   (segment (start 227.816243 184.336827) (end 227.09 183.610584) (width 0.2) (layer F.Cu) (net 156))
   (segment (start 227.09 183.610584) (end 227.09 182.7825) (width 0.2) (layer F.Cu) (net 156))
 
-  (zone (net 1) (net_name GND) (layer B.Cu) (tstamp 5E49C60F) (hatch edge 0.508)
+  (zone (net 1) (net_name GND) (layer B.Cu) (tstamp 5E4E3167) (hatch edge 0.508)
     (connect_pads yes (clearance 0.2))
     (min_thickness 0.13)
     (fill yes (arc_segments 32) (thermal_gap 0.508) (thermal_bridge_width 0.508))
@@ -21253,7 +21253,7 @@
       )
     )
   )
-  (zone (net 1) (net_name GND) (layer F.Cu) (tstamp 5E49C60C) (hatch edge 0.508)
+  (zone (net 1) (net_name GND) (layer F.Cu) (tstamp 5E4E3164) (hatch edge 0.508)
     (connect_pads yes (clearance 0.2))
     (min_thickness 0.13)
     (fill yes (arc_segments 32) (thermal_gap 0.508) (thermal_bridge_width 0.508))

diff --git a/hardware/PCB/PCB.sch b/hardware/PCB/PCB.sch
@@ -5,8 +5,8 @@ $Descr A4 11693 8268
 encoding utf-8
 Sheet 1 6
 Title "NHW68"
-Date "2020-02-10"
-Rev "0.7"
+Date "2020-02-19"
+Rev "0.8"
 Comp ""
 Comment1 ""
 Comment2 ""

diff --git a/hardware/PCB/RGB.sch b/hardware/PCB/RGB.sch
@@ -5,8 +5,8 @@ $Descr A4 11693 8268
 encoding utf-8
 Sheet 3 6
 Title "NHW68"
-Date "2020-02-10"
-Rev "0.7"
+Date "2020-02-19"
+Rev "0.8"
 Comp ""
 Comment1 ""
 Comment2 ""

diff --git a/hardware/PCB/RGBMatrix2.sch b/hardware/PCB/RGBMatrix2.sch
@@ -5,8 +5,8 @@ $Descr A4 11693 8268
 encoding utf-8
 Sheet 5 6
 Title "NHW68"
-Date "2020-02-10"
-Rev "0.7"
+Date "2020-02-19"
+Rev "0.8"
 Comp ""
 Comment1 ""
 Comment2 ""

diff --git a/hardware/PCB/RGBmatrix.sch b/hardware/PCB/RGBmatrix.sch
@@ -5,8 +5,8 @@ $Descr A4 11693 8268
 encoding utf-8
 Sheet 4 6
 Title "NHW68"
-Date "2020-02-10"
-Rev "0.7"
+Date "2020-02-19"
+Rev "0.8"
 Comp ""
 Comment1 ""
 Comment2 ""

diff --git a/hardware/PCB/SMT32.sch b/hardware/PCB/SMT32.sch
@@ -5,8 +5,8 @@ $Descr A4 11693 8268
 encoding utf-8
 Sheet 6 6
 Title "NHW68"
-Date "2020-02-10"
-Rev "0.7"
+Date "2020-02-19"
+Rev "0.8"
 Comp ""
 Comment1 ""
 Comment2 ""
@@ -241,8 +241,8 @@ F 0 "C16" H 1065 4546 50  0000 L CNN
 F 1 "10uf" H 1065 4455 50  0000 L CNN
 F 2 "Capacitor_SMD:C_0603_1608Metric" H 988 4350 50  0001 C CNN
 F 3 "~" H 950 4500 50  0001 C CNN
-F 4 "C77040" H 950 4500 50  0001 C CNN "LCSC"
-F 5 "GRM188R60J106KE47D" H 950 4500 50  0001 C CNN "Part Number"
+F 4 "C38898" H 950 4500 50  0001 C CNN "LCSC"
+F 5 "0603X106K100NT" H 950 4500 50  0001 C CNN "Part Number"
 	1    950  4500
 	1    0    0    -1  
 $EndComp

diff --git a/hardware/PCB/run.ps1 b/hardware/PCB/run.ps1
@@ -1,5 +1,5 @@
 jlc-kicad-tools .\ -o .\output\PCBA
-mv .\PCB .\output\Bom\PCB.csv
+mv -Force .\PCB .\output\Bom\PCB.csv
 rm -Force .\output\Gerber\PCB-all-pos.csv
 Compress-Archive -Force ./output/Gerber/* ./output/Gerber.zip
 Compress-Archive -Force ./output/Gerber.zip,./output/PCBA/,./output/BOM ./output/release.zip

diff --git a/hardware/PCB/switch.sch b/hardware/PCB/switch.sch
@@ -5,8 +5,8 @@ $Descr A4 11693 8268
 encoding utf-8
 Sheet 2 6
 Title "NHW68"
-Date "2020-02-10"
-Rev "0.7"
+Date "2020-02-19"
+Rev "0.8"
 Comp ""
 Comment1 ""
 Comment2 ""