Making sure all files are up to date

Aidan-OS · Jun 19, 2022 · d80eca1 · d80eca1
1 parent fad2e6a
commit d80eca1
Show file tree

Hide file tree

Showing 56 changed files with 6,067 additions and 1,244 deletions.
diff --git a/Blender Files/Renders/Jpgs/Butterfly Tea.jpg b/Blender Files/Renders/Jpgs/Butterfly Tea.jpg
diff --git a/Blender Files/Renders/Jpgs/Liquorice.jpg b/Blender Files/Renders/Jpgs/Liquorice.jpg
diff --git a/Blender Files/Renders/Jpgs/Matcha.jpg b/Blender Files/Renders/Jpgs/Matcha.jpg
diff --git a/Blender Files/Renders/Jpgs/Plain.jpg b/Blender Files/Renders/Jpgs/Plain.jpg
diff --git a/Blender Files/Renders/Jpgs/Red Bean.jpg b/Blender Files/Renders/Jpgs/Red Bean.jpg
diff --git a/Blender Files/Renders/Jpgs/Strawberry.jpg b/Blender Files/Renders/Jpgs/Strawberry.jpg
diff --git a/Blender Files/Renders/Jpgs/Taro.jpg b/Blender Files/Renders/Jpgs/Taro.jpg
diff --git a/Blender Files/Renders/Jpgs/Tea + Taro.jpg b/Blender Files/Renders/Jpgs/Tea + Taro.jpg
diff --git a/Blender Files/Renders/Jpgs/Waterdrop.jpg b/Blender Files/Renders/Jpgs/Waterdrop.jpg
diff --git a/Case/CNC Case.SLDPRT b/Case/CNC Case.SLDPRT
diff --git a/Case/Case Foam.DXF b/Case/Case Foam.DXF
diff --git a/Case/NewCase.SLDPRT b/Case/NewCase.SLDPRT
diff --git a/Case/NewCase.STL b/Case/NewCase.STL
diff --git a/Case/SmallTest.SLDPRT b/Case/SmallTest.SLDPRT
diff --git a/Case/SmallTest.STL b/Case/SmallTest.STL
diff --git a/PCB/Hotswap PCB-backups/Hotswap PCB-2021-12-10_014028.zip b/PCB/Hotswap PCB-backups/Hotswap PCB-2021-12-10_014028.zip
diff --git a/PCB/Hotswap PCB-backups/Hotswap PCB-2021-12-10_090535.zip b/PCB/Hotswap PCB-backups/Hotswap PCB-2021-12-10_090535.zip
diff --git a/PCB/Hotswap PCB-backups/Hotswap PCB-2021-12-10_104725.zip b/PCB/Hotswap PCB-backups/Hotswap PCB-2021-12-10_104725.zip
diff --git a/PCB/Hotswap PCB-backups/Hotswap PCB-2021-12-10_155854.zip b/PCB/Hotswap PCB-backups/Hotswap PCB-2021-12-10_155854.zip
diff --git a/PCB/Hotswap PCB-backups/Hotswap PCB-2021-12-13_182202.zip b/PCB/Hotswap PCB-backups/Hotswap PCB-2021-12-13_182202.zip
diff --git a/PCB/Hotswap PCB-backups/Hotswap PCB-2021-12-13_182846.zip b/PCB/Hotswap PCB-backups/Hotswap PCB-2021-12-13_182846.zip
diff --git a/PCB/Hotswap PCB-backups/Hotswap PCB-2021-12-13_193351.zip b/PCB/Hotswap PCB-backups/Hotswap PCB-2021-12-13_193351.zip
diff --git a/PCB/Hotswap PCB-backups/Hotswap PCB-2021-12-13_203404.zip b/PCB/Hotswap PCB-backups/Hotswap PCB-2021-12-13_203404.zip
diff --git a/PCB/Hotswap PCB-backups/Hotswap PCB-2021-12-14_132107.zip b/PCB/Hotswap PCB-backups/Hotswap PCB-2021-12-14_132107.zip
diff --git a/PCB/Hotswap PCB-backups/Hotswap PCB-2021-12-14_144815.zip b/PCB/Hotswap PCB-backups/Hotswap PCB-2021-12-14_144815.zip
diff --git a/PCB/Hotswap PCB-backups/Hotswap PCB-2021-12-14_145356.zip b/PCB/Hotswap PCB-backups/Hotswap PCB-2021-12-14_145356.zip
diff --git a/PCB/Hotswap PCB-backups/Hotswap PCB-2022-04-13_172647.zip b/PCB/Hotswap PCB-backups/Hotswap PCB-2022-04-13_172647.zip
diff --git a/PCB/Hotswap PCB-backups/Hotswap PCB-2022-04-13_173717.zip b/PCB/Hotswap PCB-backups/Hotswap PCB-2022-04-13_173717.zip
diff --git a/PCB/Hotswap PCB-backups/Hotswap PCB-2022-04-14_211400.zip b/PCB/Hotswap PCB-backups/Hotswap PCB-2022-04-14_211400.zip
diff --git a/PCB/Hotswap PCB-backups/Hotswap PCB-2022-04-15_180327.zip b/PCB/Hotswap PCB-backups/Hotswap PCB-2022-04-15_180327.zip
diff --git a/PCB/Hotswap PCB-backups/Hotswap PCB-2022-05-14_014656.zip b/PCB/Hotswap PCB-backups/Hotswap PCB-2022-05-14_014656.zip
diff --git a/PCB/Hotswap PCB-backups/Hotswap PCB-2022-05-14_020600.zip b/PCB/Hotswap PCB-backups/Hotswap PCB-2022-05-14_020600.zip
diff --git a/PCB/Hotswap PCB-backups/Hotswap PCB-2022-05-14_025847.zip b/PCB/Hotswap PCB-backups/Hotswap PCB-2022-05-14_025847.zip
diff --git a/PCB/Hotswap PCB-backups/Hotswap PCB-2022-05-17_025808.zip b/PCB/Hotswap PCB-backups/Hotswap PCB-2022-05-17_025808.zip
diff --git a/PCB/Hotswap PCB-backups/Hotswap PCB-2022-05-18_020521.zip b/PCB/Hotswap PCB-backups/Hotswap PCB-2022-05-18_020521.zip
diff --git a/PCB/Hotswap PCB-backups/Hotswap PCB-2022-05-18_100823.zip b/PCB/Hotswap PCB-backups/Hotswap PCB-2022-05-18_100823.zip
diff --git a/PCB/Hotswap PCB-backups/Hotswap PCB-2022-05-18_133240.zip b/PCB/Hotswap PCB-backups/Hotswap PCB-2022-05-18_133240.zip
diff --git a/PCB/Hotswap PCB.kicad_pcb b/PCB/Hotswap PCB.kicad_pcb
diff --git a/PCB/PCB-backups/PCB-2022-05-30_190502.zip b/PCB/PCB-backups/PCB-2022-05-30_190502.zip
diff --git a/PCB/PCB-backups/PCB-2022-06-01_181741.zip b/PCB/PCB-backups/PCB-2022-06-01_181741.zip
diff --git a/PCB/PCB-backups/PCB-2022-06-19_170454.zip b/PCB/PCB-backups/PCB-2022-06-19_170454.zip
diff --git a/PCB/PCB-backups/PCB-2022-06-19_191428.zip b/PCB/PCB-backups/PCB-2022-06-19_191428.zip
diff --git a/PCB/PCB.kicad_pcb b/PCB/PCB.kicad_pcb
@@ -70,7 +70,7 @@
       (mirror false)
       (drillshape 0)
       (scaleselection 1)
-      (outputdirectory "Gerber Outputs/Solder PCB/")
+      (outputdirectory "Gerbers/Solder PCB/")
     )
   )
 

diff --git a/PCB/PCB.kicad_prl b/PCB/PCB.kicad_prl
@@ -1,6 +1,6 @@
 {
   "board": {
-    "active_layer": 0,
+    "active_layer": 43,
     "active_layer_preset": "",
     "auto_track_width": true,
     "hidden_nets": [],

diff --git a/PCB/PCB.kicad_pro b/PCB/PCB.kicad_pro
@@ -365,8 +365,8 @@
       "idf": "",
       "netlist": "",
       "specctra_dsn": "",
-      "step": "3D Files/Solder PCB.step",
-      "vrml": "../Blender Files/PCB.wrl"
+      "step": "C:/Users/NehNe/Downloads/Moch40 Product Photos/Solder PCB.step",
+      "vrml": "C:/Users/NehNe/Downloads/Moch40 Product Photos/PCB.wrl"
     },
     "page_layout_descr_file": ""
   },

diff --git a/QMKFirmware/fine40/README.markdown b/QMKFirmware/fine40/README.markdown
diff --git a/QMKFirmware/fine40/config.h b/QMKFirmware/fine40/config.h
@@ -1,64 +1,12 @@
-#ifndef CONFIG_H
-#define CONFIG_H
+// Copyright 2022 Aidan Smith (@Aidan-OS)
+// SPDX-License-Identifier: GPL-2.0-or-later
 
-#include "config_common.h"
-
-/* USB Device descriptor parameter */
-#define VENDOR_ID       0xA059
-#define PRODUCT_ID      0x4564
-#define DEVICE_VER      0x0001
-#define MANUFACTURER    Aidan
-#define PRODUCT         fine!40
-#define DESCRIPTION     A modular PCB with Wired and Bluetooth options
+#pragma once
 
-/* key matrix size */
-#define MATRIX_ROWS 8
-#define MATRIX_COLS 6
+#include "config_common.h"
 
 #define ENCODER_RESOLUTION 2
 #define ENCODERS_PAD_A { D5 }
 #define ENCODERS_PAD_B { B7 }
 
-/* key matrix pins */
-#define MATRIX_ROW_PINS { F5, F6, B2, B5, F4, D4, B4, B6 }
-#define MATRIX_COL_PINS { B3, E6, B1, D7, F7, C6 }
-#define UNUSED_PINS
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
 #define OLED_DISPLAY_128X64 //Comment this out to change the screen size
-
-/* number of backlight levels */
-
-#ifdef BACKLIGHT_PIN
-#define BACKLIGHT_LEVELS 3
-#endif
-
-/* Set 0 if debouncing isn't needed */
-#define DEBOUNCING_DELAY 5
-
-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
-#define LOCKING_SUPPORT_ENABLE
-
-/* Locking resynchronize hack */
-#define LOCKING_RESYNC_ENABLE
-
-/* key combination for command */
-#define IS_COMMAND() ( \
-    keyboard_report->mods == (MOD_BIT(KC_LSHIFT) | MOD_BIT(KC_RSHIFT)) \
-)
-
-/* prevent stuck modifiers */
-#define PREVENT_STUCK_MODIFIERS
-
-#define RGB_DI_PIN C7
-#ifdef RGB_DI_PIN
-#define RGBLIGHT_ANIMATIONS
-#define RGBLED_NUM 8
-#define RGBLIGHT_HUE_STEP 8
-#define RGBLIGHT_SAT_STEP 8
-#define RGBLIGHT_VAL_STEP 8
-#endif
-
-#endif
diff --git a/QMKFirmware/fine40/fine40.c b/QMKFirmware/fine40/fine40.c
diff --git a/QMKFirmware/fine40/fine40.h b/QMKFirmware/fine40/fine40.h