Merge branch 'master' into smart_doc

Wakoma · May 9, 2024 · 0ab321f · 0ab321f
2 parents 61d8f03 + 89d44d6
commit 0ab321f
Show file tree

Hide file tree

Showing 178 changed files with 58,631 additions and 16 deletions.
diff --git a/README.md b/README.md
@@ -14,28 +14,29 @@ SPDX-License-Identifier: CERN-OHL-S-2.0
     https://api.reuse.software/badge/github.com/Wakoma/nimble)](
     https://api.reuse.software/info/github.com/Wakoma/nimble)
 
+![m](<res/images/nimble model-m (v2)/36.jpg>)
+
+# Project Info
+
 An open source, rapidly deployable, wireless mesh network.
 
-Anyone connected to the nimble can video and voice chat,
-stream videos, share files, build and run eLearning courses and website,
-create collaborative spreadsheets and documents, read e-books, play games,
-and so much more…
-completely offline.
+Anyone connected to the nimble can video and voice chat, stream videos, share files, build and run eLearning courses and website, create collaborative spreadsheets and documents, read e-books, play games, and so much more… completely offline.
 
 If a single internet connection is available,
-it can be plugged into the nimble to provide free or paid internet access
-to anyone on the network.
-The offline services and content are always available to users,
-regardless of internet availability.
+it can be plugged into the nimble to provide free or paid internet access to anyone on the network.
+The offline services and content are always available to users, regardless of internet availability.
 
 Anyone in the world can build their own nimble
 with locally sourced hardware and 3D-printed components.
 
-* [nimble Website](https://wakoma.co/nimble/)
-* [Matrix Space](https://matrix.to/#/!JWutrWVlqsuiauWbPf:wakoma.net?via=wakoma.net)
-* [Twitter](https://twitter.com/WakomaInc)
-* Mastodon, Peertube, Pixelfed (coming soon)
-* [Zotero Library](https://www.zotero.org/groups/2403673/communitynetworks/library)
+## Repo Structure
+
+* [doc](doc) = Documentation. BOM.
+* [gen](gen) = Generated CAD files. 
+* [res](res) = Resources. Media/images. Publications
+* [src](src) = Source Files. 
+
+<br />
 
 ![Nimble model m 36](assets/img/Model_M/36.jpg)
 
@@ -45,13 +46,21 @@ This repository is in transition as we work towards making all of the mechanical
 
 ## Recent Event
 
-More event information [here](https://otfn.org/hackathon/)
+# 2024 Update!
+We are excited to announce that we have received a grant from NLnet Foundation! With this generous funding our team is working with several incredible partners from the open hardware community to develop a 'nimble builder', and tools to automatically generate user-friendly documentation.
 
 ![Hackathon](assets/img/OTFNhackathon.jpeg)
 
+Please find more information on the project [here](https://nlnet.nl/project/HardwareManuals/).
+
+<br />
+
+<img src="https://nlnet.nl/logo/banner.png" width=50% height=50%>
+
+<br />
+
 ## Important Links
 
-* [Nimble website](https://wakoma.co/nimble/)
 * [Nimble printables page](https://www.printables.com/model/80708-wakoma-nimble-new-2021-model)
 * [State of this repository after the OTFN hackathon](https://github.com/Wakoma/nimble/releases/tag/Post-hackathon)
 

diff --git a/gen/2023 designs/3.5_hdd_shelf.stl b/gen/2023 designs/3.5_hdd_shelf.stl
diff --git a/gen/2023 designs/ap_mount_for_1430.stl b/gen/2023 designs/ap_mount_for_1430.stl
diff --git a/gen/2023 designs/ap_mount_for_1430_bottom.stl b/gen/2023 designs/ap_mount_for_1430_bottom.stl
diff --git a/gen/2023 designs/ap_mount_for_1430_top.stl b/gen/2023 designs/ap_mount_for_1430_top.stl
diff --git a/gen/2023 designs/bottom_3mm.stl b/gen/2023 designs/bottom_3mm.stl
diff --git a/gen/2023 designs/dual_ssd_shelf.stl b/gen/2023 designs/dual_ssd_shelf.stl
diff --git a/gen/2023 designs/flex_mini_shelf.stl b/gen/2023 designs/flex_mini_shelf.stl
diff --git a/gen/2023 designs/generic_shelf.stl b/gen/2023 designs/generic_shelf.stl
diff --git a/gen/2023 designs/keystone_patch_panel_2_units.stl b/gen/2023 designs/keystone_patch_panel_2_units.stl
diff --git a/gen/2023 designs/keystone_patch_panel_2_units_short.stl b/gen/2023 designs/keystone_patch_panel_2_units_short.stl
diff --git a/gen/2023 designs/ltap_mini_shallow.stl b/gen/2023 designs/ltap_mini_shallow.stl
diff --git a/gen/2023 designs/mikrotik_shelf.stl b/gen/2023 designs/mikrotik_shelf.stl
diff --git a/gen/2023 designs/nuc_shelf.stl b/gen/2023 designs/nuc_shelf.stl
diff --git a/gen/2023 designs/nuc_shelf2.stl b/gen/2023 designs/nuc_shelf2.stl
diff --git a/gen/2023 designs/nuc_shelf_tall.stl b/gen/2023 designs/nuc_shelf_tall.stl
diff --git a/gen/2023 designs/obj/3.5_HDD_Shelf/obj.mtl b/gen/2023 designs/obj/3.5_HDD_Shelf/obj.mtl
@@ -0,0 +1,8 @@
+# Color definition for Tinkercad Obj File 2015
+
+newmtl color_15277357
+Ka 0 0 0 
+Kd 0.9137254901960784 0.11372549019607843 0.17647058823529413
+d 1
+illum 0.0
+