Merge pull request #4 from KenwoodFox/prod/v1.0_RC1

KenwoodFox · Apr 19, 2022 · 0ca4a43 · 0ca4a43
2 parents fce5276 + 09d1599
commit 0ca4a43
Show file tree

Hide file tree

Showing 9 changed files with 26 additions and 14 deletions.
diff --git a/Docs/conf.py b/Docs/conf.py
@@ -1,20 +1,21 @@
-import git
+import subprocess
 
 # Project Information
-
 project = "APRN-Pi"
 copyright = "2021-2022, To Be Announced"
 author = "Kitsune Scientific"
 
 
 # The full version, including alpha/beta/rc tags
+repoProcess = subprocess.run(
+    args=["git", "describe", "--dirty=-dirty", "--tags", "--always"],
+    capture_output=True,
+)
 
-repo = git.Repo(search_parent_directories=True)
-release = str(repo.git.describe("--tags", "--always"))
+release = repoProcess.stdout.decode().strip()
 
 
 # General Config
-
 extensions = ["sphinx.ext.autosectionlabel", "sphinx.ext.imgconverter"]
 
 # Add any paths that contain templates here, relative to this directory.

diff --git a/Docs/electronics/electronics.rst b/Docs/electronics/electronics.rst
@@ -6,3 +6,10 @@ Schematics
 
 .. image:: ../../_hardwareOutput/APRN-pi-schematic.png
     :width: 800
+
+
+Renders
+=======
+
+.. image:: ../../_hardwareOutput/APRN-pi-3D_top.png
+    :width: 600
diff --git a/Docs/introduction/introduction.rst b/Docs/introduction/introduction.rst
@@ -8,8 +8,9 @@ The APRN-Pi is a raspberry pi hat I designed to create an easy to use 2M interfa
 for a few other projects I'd been working on.
 
 The original idea came from the hams at ``#hamradio`` on `Libera Chat <https://libera.chat/>`_, and
-other helpful information came from w6ipa's work with his `PIRIM <https://www.tindie.com/products/w6ipa/radio-interface-module-pirim-for-raspberry-pi/>`_ and I could not have made this
-without help from all of them and my elmer.
+other helpful information came from w6ipa's work with his `PIRIM <https://www.tindie.com/products/w6ipa/radio-interface-module-pirim-for-raspberry-pi/>`_ 
+as well as the `SHARI <https://hamprojects.info/shari/>` board, and I could not have made this without
+help from all of them and my elmer.
 
 These docs should be a quick reference but since I may use the APRN-Pi in multiple different projects
 its safe to say that some expansion will be needed!
diff --git a/Docs/requirements.txt b/Docs/requirements.txt
@@ -2,6 +2,3 @@
 sphinx
 sphinx_rtd_theme
 readthedocs-sphinx-search
-
-# Other build
-GitPython
diff --git a/Hardware/APRN-pi_board/APRN-pi.kicad_pcb b/Hardware/APRN-pi_board/APRN-pi.kicad_pcb
@@ -1881,8 +1881,8 @@
       (net 9 "GND") (pinfunction "Pin_1") (pintype "power_in") (tstamp 5e289f1b-d715-4265-a172-76964469bd27))
     (pad "2" thru_hole circle (at 5.08 0 90) (size 3 3) (drill 1.52) (layers *.Cu *.Mask)
       (net 10 "Net-(C4-Pad1)") (pinfunction "Pin_2") (pintype "passive") (tstamp b6fe02f9-2fe3-4083-aa6b-6b5c42c23b68))
-    (model "${KICAD6_3DMODEL_DIR}/TerminalBlock.3dshapes/TerminalBlock_bornier-2_P5.08mm.wrl"
-      (offset (xyz 2.539999962 0 0))
+    (model "${KICAD6_3DMODEL_DIR}/TerminalBlock_Phoenix.3dshapes/TerminalBlock_Phoenix_MKDS-1,5-2_1x02_P5.00mm_Horizontal.wrl"
+      (offset (xyz 0 0 0))
       (scale (xyz 1 1 1))
       (rotate (xyz 0 0 0))
     )

diff --git a/Hardware/APRN-pi_board/Libraries/kenwoodfox-kicad-libraries b/Hardware/APRN-pi_board/Libraries/kenwoodfox-kicad-libraries
diff --git a/Hardware/config.kibot.yaml b/Hardware/config.kibot.yaml
@@ -33,8 +33,11 @@ outputs:
     comment: "3D Renders for docs!"
     type: render_3d
     options:
-      board: "#002d04"
       ray_tracing: true
+      rotate_x: -1
+      rotate_y: 2
+      zoom: 5
+      wait_rt: 20
 
   - name: PCBWay_gerbers
     comment: Gerbers compatible with PCBWay

diff --git a/README.md b/README.md
@@ -5,3 +5,6 @@
 [APRN](http://www.aprs.org/aprn.html) was a format i stumbled upon ages ago and thought it looked super cool!
 
 I decided to try making a custom raspberry pi hat that would use the DRA818V (or DRA818U) for aprn.
+
+
+![image](Renders/3DRender.png)
diff --git a/Renders/3DRender.png b/Renders/3DRender.png
+ −		3d/DRA818V.FCStd
+2,278 −525		3d/DRA818V.step
+517 −964		3d/DRA818V.wrl
Original file line number	Diff line number	Diff line change
Expand Up		@@ -5,3 +5,6 @@
		[APRN](http://www.aprs.org/aprn.html) was a format i stumbled upon ages ago and thought it looked super cool!

		I decided to try making a custom raspberry pi hat that would use the DRA818V (or DRA818U) for aprn.


		![image](Renders/3DRender.png)