Smikkelbakje/Drone-FabAcademy-2025
1
0
Fork 0
mirror of https://gitlab.waag.org/make/fablab/interns/2025/sam.git synced 2025-08-03 20:04:56 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

more typos

Browse Source
This commit is contained in:
Sam Hos
2025-02-05 09:35:21 +01:00
parent a88ea26a3e
commit 82c2520c98
3 changed files with 17 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
docs/Assignments/bootcamp/ImageMagick.md
View File

@@ -1,7 +1,7 @@
# ImageMagick
## What is ImageMagick and why use it?
ImageMagick is a tool to resize, convert or compress images. You can do all sorts of things with it. But right now we will be using it to compress images. So other people don't have to download hunderds of megabytes when cloning your project or viewing your website. Using this is also way faster than opening photoshop for every image you make.
ImageMagick is a tool to resize, convert or compress images. You can do all sorts of things with it. But right now we will be using it to compress images. So other people don't have to download hundreds of megabytes when cloning your project or viewing your website. Using this is also way faster than opening photoshop for every image you make.
## How do I install it?
ImageMagick can be installed on arch based systems using:

2
docs/Assignments/bootcamp/git-setup.md
View File

@@ -7,7 +7,7 @@ To be able to push and pull from the git server you need to give your public key
```bash
ssh-keygen
```
After you run this command it will prompt you for a passphrase and a location to store it you can leave these blank and press enter on them. It will automaticly store them in `<user>/.ssh`.
After you run this command it will prompt you for a passphrase and a location to store it you can leave these blank and press enter on them. It will automatically store them in `<user>/.ssh`.
## Reading the ssh keys

31
docs/Assignments/week_2_computer_aided_design_(cad)/CAD.md
View File

@@ -12,7 +12,7 @@ The first lecture was about blender.
### Enable emulate numpad
To start off with
If you dont have a numpad you should enable `emulate numpad` in Edit > prefrences > input
If you don't have a numpad you should enable `emulate numpad` in Edit > preferences > input
If you want to you can set other preferences that you'd maybe like
### Shortcuts
@@ -20,7 +20,7 @@ Zoom: scroll mousewheel
Orbit: Press mousewheel and move mouse
Pan: Shift + press mouse wheel
It's reccomended to keep default shortcuts
It's recommended to keep default shortcuts
| Key | What does it do |
| :------------------ | --------------------------------------------------------------- |
@@ -50,7 +50,7 @@ It's reccomended to keep default shortcuts
| E | Extrude (Extrude can also be mixed with alot of other commands) |
| E + C | Free move Extrude |
| E + S | Makes the plane move inward or outward |
| | |
@@ -93,17 +93,17 @@ G + number move that amount of blocks
`Pressing mouse wheel `will guess which axis you want to move an object in.
### Modifiers
Modiers can be applied on the bottom right corner of your screen. There you need to press on on the wrench. There you can add modifiers.
Modifiers can be applied on the bottom right corner of your screen. There you need to press on on the wrench. There you can add modifiers.
#### Subdivision modifier
Make the object smoother. Warning: Dont increase it too much because it will crash your pc.
Make the object smoother. Warning: Don't increase it too much because it will crash your pc.
![alt text](../../assets/assets_week_2/image--15.jpg)
### Scenes
There are multiple scenes in blender that can be found in the top of your screen. Each screen has it's own tools and functionalities.
### Precission
### Precision
If you press `N` in blender you can open the Transform menu. Where you can precisely place objects.
![alt text](../../assets/assets_week_2/image--16.jpg)
@@ -132,7 +132,7 @@ Up here you can edit the select modes. You can select Points, Lines and Surfaces
### Intro
* Characteristics
* Engineering tool
* Surface modeler, Sheet metal and mesh availible
* Surface modeler, Sheet metal and mesh available
* Great for working with assemblies and construction
* Very good at parametric design
* Lots of additional tools like machining, analysis and post processing
@@ -142,7 +142,7 @@ Up here you can edit the select modes. You can select Points, Lines and Surfaces
In the top right there is a project management tab where you can manage all your projects. ![alt text](../../assets/assets_week_2/image--0.jpg)
When you import parts from other files you can change the imported files and then you can update it in the other designs.
Don't forget to label your parts. Dont join everything into one body
Don't forget to label your parts. Don't join everything into one body
### Modeling
Best way to start a design is to start with a sketch. After you've clicked the sketch button you can select a plane. The best plane to start with is the bottom plane
@@ -172,7 +172,7 @@ At the bottom you can see the Timeline. There you can see every action that you
Under the Modify tab you can open the parameter menu and then add parameters to the design
When you're in the parameter menu you can click the `+` icon and then add a paremter. The name is the parameter name and the expression is the value. ![alt text](../../assets/assets_week_2/image--5.jpg)
When you're in the parameter menu you can click the `+` icon and then add a parameter. The name is the parameter name and the expression is the value. ![alt text](../../assets/assets_week_2/image--5.jpg)
When you've added a parameter you can use that parameter instead of setting a value. You can also add calculations within expressions and values like this.
@@ -192,7 +192,7 @@ In there you can define the hole.
You can inspect length and how big it is with the inspect tool. The inspect tool is found in the top menu. There is also a automatic inspect tool in the bottom right. If you select 2 edges or faces you can see the distance between them.
#### Offset plane
The offset plane can be used as a tool for other tools. For example you can place a offset plane and then do a plit body using that plane as a reference.
The offset plane can be used as a tool for other tools. For example you can place a offset plane and then do a split body using that plane as a reference.
![alt text](../../assets/assets_week_2/image--7.jpg)
![alt text](../../assets/assets_week_2/image--11.jpg)
@@ -204,25 +204,24 @@ The offset plane can be used as a tool for other tools. For example you can plac
What your product has to do
What (sub)functions you need fo that
which functions can be combined and which not
what requiremnds fo these functions are
what requirements fo these functions are
#### Product breakdown structure (PBS)
* defining your product structure
* Defining the parts and (sub)systems you need
* the way the prdocut should be build
* the way the product should be build
* managing interfaces between parts
* defining specifications for the components
* finding the design strategy for parts assemblies
* diving the work fistrubtion wihtin aa team
* making risk assements (FMEA)
* making risk assessments (FMEA)
#### Work Breakdown Structure (FBS)
* Which activities you have to do
### Designing
* Design on paper or get visuals of what you want.
* All 3D tools are different. Blender is usefull for visualization, organic structures. Fusion is very much used for production envoirments and making solid models, assemblies, re-use parts in the structure.
* Which 3D tool you use is a personal prefrence.
* All 3D tools are different. Blender is useful for visualization, organic structures. Fusion is very much used for production environment and making solid models, assemblies, re-use parts in the structure.
* Which 3D tool you use is a personal preference.
#### Design strategy
* Example: if you want to make a hole in a part you can do that in different ways. Define the structure with a hole. Or drill it through the part. The sequence affects the way it behaves.