diff --git a/.gitignore b/.gitignore index b8edd98..998a537 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,4 @@ .pnpm-debug.log .obsidian +.blend1 +.blend diff --git a/.pnpm-debug.log b/.pnpm-debug.log deleted file mode 100644 index 80158db..0000000 --- a/.pnpm-debug.log +++ /dev/null @@ -1,14 +0,0 @@ -{ - "0 debug pnpm:scope": { - "selected": 1 - }, - "1 error pnpm": { - "code": "ERR_PNPM_NO_IMPORTER_MANIFEST_FOUND", - "err": { - "name": "pnpm", - "message": "No package.json (or package.yaml, or package.json5) was found in \"/home/jim/Notes\".", - "code": "ERR_PNPM_NO_IMPORTER_MANIFEST_FOUND", - "stack": "pnpm: No package.json (or package.yaml, or package.json5) was found in \"/home/jim/Notes\".\n at readProjectManifest (/home/jim/.asdf/installs/nodejs/17.8.0/.npm/pnpm-global/5/node_modules/.pnpm/pnpm@6.32.4/node_modules/pnpm/dist/pnpm.cjs:19815:13)\n at async Object.readProjectManifestOnly (/home/jim/.asdf/installs/nodejs/17.8.0/.npm/pnpm-global/5/node_modules/.pnpm/pnpm@6.32.4/node_modules/pnpm/dist/pnpm.cjs:19819:28)\n at async readProjectManifestOnly (/home/jim/.asdf/installs/nodejs/17.8.0/.npm/pnpm-global/5/node_modules/.pnpm/pnpm@6.32.4/node_modules/pnpm/dist/pnpm.cjs:43733:24)\n at async Object.handler (/home/jim/.asdf/installs/nodejs/17.8.0/.npm/pnpm-global/5/node_modules/.pnpm/pnpm@6.32.4/node_modules/pnpm/dist/pnpm.cjs:177853:24)\n at async /home/jim/.asdf/installs/nodejs/17.8.0/.npm/pnpm-global/5/node_modules/.pnpm/pnpm@6.32.4/node_modules/pnpm/dist/pnpm.cjs:182129:21\n at async run (/home/jim/.asdf/installs/nodejs/17.8.0/.npm/pnpm-global/5/node_modules/.pnpm/pnpm@6.32.4/node_modules/pnpm/dist/pnpm.cjs:182103:34)\n at async runPnpm (/home/jim/.asdf/installs/nodejs/17.8.0/.npm/pnpm-global/5/node_modules/.pnpm/pnpm@6.32.4/node_modules/pnpm/dist/pnpm.cjs:182322:5)\n at async /home/jim/.asdf/installs/nodejs/17.8.0/.npm/pnpm-global/5/node_modules/.pnpm/pnpm@6.32.4/node_modules/pnpm/dist/pnpm.cjs:182314:7" - } - } -} \ No newline at end of file diff --git a/Areas/optimizing/dev.md b/Areas/optimizing/dev.md index d2cd4b1..287c981 100644 --- a/Areas/optimizing/dev.md +++ b/Areas/optimizing/dev.md @@ -22,18 +22,27 @@ Has not happened in a while Fixed this by installing the NerdCommenter Plugin Switched to nvim-comment as it seems a bit lighter -## ~~Neovim Auto fix problems shortcut + hover window~~ +## ~~Neovim Auto fix problems shortcut + hover window~~ ## ~~Better git merging in Neovim, like in VScode~~ ## ~~Copying between neovim, tmux and ssh sessions does not work~~ -## Learn how to use splits and buffers in neovim +## Learn how to use splits, buffers and tabs in neovim ## Fix the dictionary for neovim ltex-ls # Linux -## Power Management +## ~~(Arch) Power Management~~ I want to set the Power Mode e.g. Power/Normal/Energy Saver. Maybe with a waybar integration, but not that important. + +**Solution** +Installed power-profiles-daemon, and added a script to waybar to easily switch, profiles are not configurable tho :/ + +## (Arch) Auto Mount USB Stuff + +## (Pipewire) Auto Change Audio Output + +## (Arch) Low Battery Warning diff --git a/Areas/optimizing/live/index.md b/Areas/optimizing/live/index.md index e69de29..b54f513 100644 --- a/Areas/optimizing/live/index.md +++ b/Areas/optimizing/live/index.md @@ -0,0 +1,14 @@ +--- +private +--- + +# What do I want to achieve? + +- Less time in virtual space + - Stop spending time on stupid websites (twitter.com,imgur.com,reddit.com) +- Better sleeping habits + +# How to achieve that? + +- Better sleeping habits -> Set a clock at 8am everyday +- Less time in virtual space -> Find things to do in real space diff --git a/Areas/upv/classes/analog-electricity/Class_03.md b/Areas/upv/classes/analog-electricity/Class_03.md new file mode 100644 index 0000000..1b8fdb9 --- /dev/null +++ b/Areas/upv/classes/analog-electricity/Class_03.md @@ -0,0 +1,95 @@ +# Class 03 + +**Non Linear functions with OAs** + +**Multivibrator** +Has negative and positive feedback, but net positive + + +**Log and AntiLog** +Amplifier with negative Feedback, but also + +**Logarithmic Converters** +Logarithmic / AntiLog (Exponential) Converter + +Sound level is given in Decibels, as it is always compared to the sound threshold. + +$$ +20\log{\frac{P}{P_{0}}} +$$ + + +$V_out = -V_{T}*\ln{}$ + +$V_o = R_1Ie^{\frac{-V_i}{V_T}}$ + +![[Pasted image 20220503133103.png]] +Expression of the above system + +$V_in = -R_in * I_in = -Rin*I_sat e^{\frac{E_o}{V_T}}$ +$\displaystyle E_O = V_T \ln(-\frac{V_in}{R_in*I_sat})$ + +![[Class_03 2022-05-03 13.39.51.excalidraw]] +$$ +\begin{flalign} +&V_1 = -V_T\ln{\frac{Vi}{R1*I_{ES}}}&\\\ +&V_2 = -V_T\ln{\frac{Vi}{R2*I_{ES}}}&\\ +&V_O = -(V_1+V_2)&\\ +&V_O = V_T\ln{(\frac{V_{i1}V_{i2}}{(RI_{ES})^2})}&\\ +&V_O' = -RI_{es}e^{\frac{V_O}{V_T}}&\\ +&V_O' = -\frac{V_{i1}V_{i2}}{RI_{es}}&\\ +\\ +&V_O'' = V_{i1}V_{i2}&\\ +\end{flalign} +$$**** + +```circuitjs +$ 1 0.000005 10.20027730826997 50 5 43 5e-11 +i -192 208 -112 208 0 0.01 +a -112 224 16 224 8 15 -15 1000000 10.624172192589858 0 100000 +g -112 240 -112 288 0 0 +w -112 208 -112 128 0 +t 64 176 64 128 0 1 14.983134150394081 15.001062402219262 100 default +t -16 176 -16 128 0 -1 -0.63704611232159 24.98818848248753 100 default +w -112 128 -32 128 0 +w -16 176 -16 272 0 +w -16 272 96 272 0 +r 96 272 96 336 0 1000 +g 96 336 96 368 0 0 +w 96 272 208 272 0 +r 208 272 208 144 0 1000 +a 112 144 208 144 8 15 -15 1000000 -14.983134150394081 0 100000 +w 0 128 16 128 0 +w 16 128 48 128 0 +w 16 128 16 224 0 +g 64 176 64 192 0 0 +i 192 48 112 48 0 0.01 +w 112 48 112 128 0 +w 80 128 112 128 0 +g 112 160 112 208 0 0 +g 192 48 224 48 0 0 +g -192 208 -224 208 0 0 +O 208 144 240 144 1 0 +x 235 217 265 220 4 24 R1 +x 124 308 154 311 4 24 R2 +``` +$$ +\begin{flalign} +&I_1 = I_{es}e^{\frac{V_{BE_1}}{V_T}} \longrightarrow V_{BE_1} = V_T \ln{\frac{I_1}{I_{es}}}&\\\ +&I_1 = I_{es}e^{\frac{V_{BE_2}}{V_T}} \longrightarrow V_{BE_2} = V_T \ln{\frac{I_2}{I_{es}}}&\\\ +&V_1 = V_O*\frac{R2}{R1+R2}&\\ +&V_O = (1+\frac{R1}{R2})V_T\ln{\frac{I_1}{I_2}} +\end{flalign} +$$ + +![[Pasted image 20220503142156.png]] + +$$ +\begin{flalign} +&V_{ref} = R_{ref}I_1 = R_{ref}I_{es}e^{\frac{V_{BE_1}}{V_T}} \longrightarrow V_T\ln{\frac{V_{ref}}{R_{ref}I_{es}}} = V_{BE_1}&\\\ +&V_O = RI_2 = RI_{es}e^{\frac{V_{BE_2}}{V_T}} \longrightarrow V_T\ln{\frac{V_O}{R_{ref}I_{es}}} = V_{BE_2} &\\ +&V_1 = V_i \frac{R_2}{R_1+R_2}&\\ +&V_i = (1+\frac{R_1}{R_2})V_T \ln{\frac{V_{ref}}{V_O}\frac{R}{R_{ref}}}&\\ +&V_O = \frac{V_{ref}}{} +\end{flalign} +$$ diff --git a/Areas/upv/classes/analog-electricity/Exam_02.md b/Areas/upv/classes/analog-electricity/Exam_02.md new file mode 100644 index 0000000..1d029ea --- /dev/null +++ b/Areas/upv/classes/analog-electricity/Exam_02.md @@ -0,0 +1,47 @@ +```circuitjs +$ 1 0.000009999999999999999 114.32915054483153 70 5 43 5e-11 +R 128 576 128 640 0 2 2000 1 0 0 0.5 +r 128 576 192 576 0 10000 +w 192 576 192 512 0 +c 192 512 304 512 0 1e-8 -1.1876003937016104 0.001 +w 192 512 192 448 0 +r 192 448 304 448 0 100000 +w 304 448 304 512 0 +a 192 592 304 592 8 15 -15 1000000 -0.000011875885178164322 0 100000 +w 304 512 304 592 0 +r 192 608 192 688 0 10000 +g 192 688 192 736 0 0 +O 304 592 384 592 1 0 +i 96 272 96 176 0 2.73e-7 +g 96 272 96 304 0 0 +w 96 176 176 176 0 +r 176 176 288 176 0 50000 +w 288 176 288 256 0 +a 176 256 288 256 8 15 -15 1000000 1.3649863501364987e-7 0 100000 +w 176 176 176 240 0 +g 176 272 176 320 0 0 +O 288 256 352 256 1 0 +v 144 1200 144 1056 0 3 2 2.5 0 0 0.5 +g 144 1200 144 1248 0 0 +r 144 1024 256 1024 0 4700 +c 256 1024 320 1024 0 6.800000000000001e-7 -2.1090889233631698 0.001 +w 320 1024 320 912 0 +r 320 912 448 912 0 47000 +a 320 1040 448 1040 8 15 -15 1000000 0.0000063815283964859994 0 100000 +r 320 1056 320 1152 0 4700 +g 320 1152 320 1200 0 0 +w 448 1040 448 912 0 +O 448 1040 528 1040 0 0 +w 144 1056 144 1024 2 +R 112 1568 112 1648 0 1 31.8 0.5 0 0 0.5 +r 112 1568 192 1568 0 4700 +c 192 1568 272 1568 0 6.800000000000001e-7 0.4208989773913313 0.001 +a 272 1584 384 1584 8 15 -15 1000000 -0.0000013057273954973784 0 100000 +r 272 1600 272 1680 0 1000 +g 272 1680 272 1712 0 0 +w 272 1568 272 1472 0 +r 272 1472 384 1472 0 47000 +w 384 1472 384 1584 0 +O 384 1584 448 1584 1 0 +403 400 1632 624 1760 0 42_64_0_4098_10_0.1_-1_1 +``` diff --git a/Areas/upv/classes/analog-electricity/assets/Class_03 2022-05-03 13.39.51.excalidraw.md b/Areas/upv/classes/analog-electricity/assets/Class_03 2022-05-03 13.39.51.excalidraw.md new file mode 100644 index 0000000..6f80944 --- /dev/null +++ b/Areas/upv/classes/analog-electricity/assets/Class_03 2022-05-03 13.39.51.excalidraw.md @@ -0,0 +1,1460 @@ +--- + +excalidraw-plugin: parsed +tags: [excalidraw] + +--- +==⚠ Switch to EXCALIDRAW VIEW in the MORE OPTIONS menu of this document. ⚠== + + +# Text Elements +Transdiode ^cr5iD4w3 + +Transdiode ^wZPd0T1Q + +V'o ^pyAS0pXv + +Vo ^mYnlJkHh + +Summer ^vDd4fbnI + + +# Embedded files +0eb48da54a795e249f2a9864d15bd4e5d12b75a1: [[Areas/upv/classes/analog-electricity/assets/Pasted Image 20220503134001_401.png]] + +%% +# Drawing +```json +{ + "type": "excalidraw", + "version": 2, + "source": "https://excalidraw.com", + "elements": [ + { + "type": "image", + "version": 233, + "versionNonce": 571447852, + "isDeleted": false, + "id": "A4kMC51nzfXeEk82QaQB_", + "fillStyle": "hachure", + "strokeWidth": 1, + "strokeStyle": "solid", + "roughness": 1, + "opacity": 100, + "angle": 0, + "x": -287.40445908935305, + "y": -215.4298887898151, + "strokeColor": "transparent", + "backgroundColor": "transparent", + "width": 425.5224312590449, + "height": 458, + "seed": 928556332, + "groupIds": [], + "strokeSharpness": "round", + "boundElements": [ + { + "id": "vAKLvo4lCUbKpwYSBY2Qz", + "type": "arrow" + } + ], + "updated": 1651578593355, + "link": null, + "locked": false, + "status": "pending", + "fileId": "0eb48da54a795e249f2a9864d15bd4e5d12b75a1", + "scale": [ + 1, + 1 + ] + }, + { + "type": "freedraw", + "version": 66, + "versionNonce": 2079288980, + "isDeleted": false, + "id": "mY3Li4NAYHbwrJYGu9oRT", + "fillStyle": "hachure", + "strokeWidth": 1, + "strokeStyle": "solid", + "roughness": 1, + "opacity": 100, + "angle": 0, + "x": -150.3626590402503, + "y": -185.8241377065056, + "strokeColor": "#c92a2a", + "backgroundColor": "transparent", + "width": 74.12196912263568, + "height": 60.931886371813334, + "seed": 353007508, + "groupIds": [], + "strokeSharpness": "round", + "boundElements": [], + "updated": 1651578593355, + "link": null, + "locked": false, + "points": [ + [ + 0, + 0 + ], + [ + -2.321600663034559, + -0.47107897306744917 + ], + [ + -4.240610223067449, + -0.8126509817022907 + ], + [ + -7.993252402857735, + -1.2912388851768242 + ], + [ + -12.09498355263159, + -1.4967426500822398 + ], + [ + -18.18328857421878, + -1.5661862021998445 + ], + [ + -23.7554771021793, + -1.3531735068873445 + ], + [ + -28.207228811163674, + -0.8051500822368212 + ], + [ + -32.745305111533725, + -0.05349410207645633 + ], + [ + -38.853318063836355, + 1.3831931666323953 + ], + [ + -41.995070608038674, + 2.751368472450679 + ], + [ + -44.438645212273855, + 4.324123984888985 + ], + [ + -46.62041915090461, + 6.580963134765625 + ], + [ + -48.19035580283716, + 9.111818012438334 + ], + [ + -48.88851768092107, + 11.642664859169429 + ], + [ + -49.325810482627475, + 18.37659333881578 + ], + [ + -49.237598619962995, + 23.644738448293595 + ], + [ + -48.62670898437503, + 28.15935636821547 + ], + [ + -47.71927682976974, + 34.04028641550164 + ], + [ + -46.37737073396383, + 38.7632189298931 + ], + [ + -43.18120052939966, + 45.92036197060034 + ], + [ + -40.5931091308594, + 50.47440378289474 + ], + [ + -38.412274812397214, + 53.27832673725328 + ], + [ + -36.40504535875823, + 55.19359387849508 + ], + [ + -34.6596326326069, + 56.56176115337172 + ], + [ + -32.73967542146383, + 57.79293662623354 + ], + [ + -28.376135575143934, + 58.95560816714638 + ], + [ + -24.624433015522214, + 59.29719623766448 + ], + [ + -20.784518593236015, + 59.36570016961349 + ], + [ + -17.46822959498357, + 59.16018837376646 + ], + [ + -13.103758159436694, + 58.68160850123354 + ], + [ + -1.2358655427631504, + 57.33406468441612 + ], + [ + 4.45831298828125, + 56.61431563527961 + ], + [ + 9.95918675472862, + 55.90770520662008 + ], + [ + 13.88824462890625, + 55.36062140213815 + ], + [ + 16.85545268811677, + 54.74503366570724 + ], + [ + 19.298095703125, + 53.92393413342927 + ], + [ + 21.82895058079768, + 52.55576685855263 + ], + [ + 23.13801012541117, + 51.4615831877056 + ], + [ + 24.09798070004109, + 50.16191984477797 + ], + [ + 24.53433388157893, + 48.86317202919409 + ], + [ + 24.7961586400082, + 47.70050048828125 + ], + [ + 24.7088783665707, + 45.64822548314146 + ], + [ + 24.27252518503289, + 41.54369153474508 + ], + [ + 23.4476832339638, + 35.65432899876646 + ], + [ + 22.31315211245888, + 31.41090794613487 + ], + [ + 20.74228387129932, + 27.17029772306745 + ], + [ + 18.90959087171052, + 23.409206992701485 + ], + [ + 16.20420757092927, + 19.510168778268905 + ], + [ + 14.19697008634867, + 17.390337492290314 + ], + [ + 12.10248445209703, + 15.338062487150495 + ], + [ + 10.18345883018091, + 13.422803376850311 + ], + [ + 8.69985480057565, + 12.19162790398849 + ], + [ + 7.30353104440789, + 11.234460127981095 + ], + [ + 4.51086747018914, + 10.00329268606086 + ], + [ + 2.4163657740542703, + 9.38770494962995 + ], + [ + 0.6709530479029411, + 8.909117046155416 + ], + [ + -0.6381064967105488, + 8.56660541735198 + ], + [ + -1.6844257555510183, + 8.22503340871711 + ], + [ + -1.946234452097059, + 8.1565294767681 + ], + [ + -2.2080431486430996, + 8.020461233038645 + ], + [ + -2.2080431486430996, + 8.020461233038645 + ] + ], + "lastCommittedPoint": null, + "simulatePressure": true, + "pressures": [] + }, + { + "type": "text", + "version": 70, + "versionNonce": 267613356, + "isDeleted": false, + "id": "cr5iD4w3", + "fillStyle": "hachure", + "strokeWidth": 1, + "strokeStyle": "solid", + "roughness": 1, + "opacity": 100, + "angle": 0, + "x": -209.61574131564092, + "y": -243.80009065803728, + "strokeColor": "#c92a2a", + "backgroundColor": "transparent", + "width": 108, + "height": 25, + "seed": 1307496748, + "groupIds": [], + "strokeSharpness": "sharp", + "boundElements": [ + { + "id": "vAKLvo4lCUbKpwYSBY2Qz", + "type": "arrow" + } + ], + "updated": 1651578593355, + "link": null, + "locked": false, + "fontSize": 20, + "fontFamily": 1, + "text": "Transdiode", + "rawText": "Transdiode", + "baseline": 17, + "textAlign": "left", + "verticalAlign": "top", + "containerId": null, + "originalText": "Transdiode" + }, + { + "type": "arrow", + "version": 194, + "versionNonce": 850164756, + "isDeleted": false, + "id": "vAKLvo4lCUbKpwYSBY2Qz", + "fillStyle": "hachure", + "strokeWidth": 1, + "strokeStyle": "solid", + "roughness": 1, + "opacity": 100, + "angle": 0, + "x": -163.36510249630555, + "y": -216.05469684510325, + "strokeColor": "#c92a2a", + "backgroundColor": "transparent", + "width": 0.6934360284225534, + "height": 24.30928164065358, + "seed": 1778501012, + "groupIds": [], + "strokeSharpness": "round", + "boundElements": [], + "updated": 1651578593355, + "link": null, + "locked": false, + "startBinding": { + "elementId": "cr5iD4w3", + "focus": 0.13456474062082788, + "gap": 2.745393812934026 + }, + "endBinding": null, + "lastCommittedPoint": null, + "startArrowhead": null, + "endArrowhead": "arrow", + "points": [ + [ + 0, + 0 + ], + [ + -0.6934360284225534, + 24.30928164065358 + ] + ] + }, + { + "type": "freedraw", + "version": 140, + "versionNonce": 2037907244, + "isDeleted": false, + "id": "l3Xpw52zQB6qbDCCPMhTl", + "fillStyle": "hachure", + "strokeWidth": 1, + "strokeStyle": "solid", + "roughness": 1, + "opacity": 100, + "angle": 0, + "x": -154.17183257699395, + "y": -43.10622577269683, + "strokeColor": "#c92a2a", + "backgroundColor": "transparent", + "width": 74.12196912263568, + "height": 60.931886371813334, + "seed": 1214821524, + "groupIds": [], + "strokeSharpness": "round", + "boundElements": [], + "updated": 1651578593355, + "link": null, + "locked": false, + "points": [ + [ + 0, + 0 + ], + [ + -2.321600663034559, + -0.47107897306744917 + ], + [ + -4.240610223067449, + -0.8126509817022907 + ], + [ + -7.993252402857735, + -1.2912388851768242 + ], + [ + -12.09498355263159, + -1.4967426500822398 + ], + [ + -18.18328857421878, + -1.5661862021998445 + ], + [ + -23.7554771021793, + -1.3531735068873445 + ], + [ + -28.207228811163674, + -0.8051500822368212 + ], + [ + -32.745305111533725, + -0.05349410207645633 + ], + [ + -38.853318063836355, + 1.3831931666323953 + ], + [ + -41.995070608038674, + 2.751368472450679 + ], + [ + -44.438645212273855, + 4.324123984888985 + ], + [ + -46.62041915090461, + 6.580963134765625 + ], + [ + -48.19035580283716, + 9.111818012438334 + ], + [ + -48.88851768092107, + 11.642664859169429 + ], + [ + -49.325810482627475, + 18.37659333881578 + ], + [ + -49.237598619962995, + 23.644738448293595 + ], + [ + -48.62670898437503, + 28.15935636821547 + ], + [ + -47.71927682976974, + 34.04028641550164 + ], + [ + -46.37737073396383, + 38.7632189298931 + ], + [ + -43.18120052939966, + 45.92036197060034 + ], + [ + -40.5931091308594, + 50.47440378289474 + ], + [ + -38.412274812397214, + 53.27832673725328 + ], + [ + -36.40504535875823, + 55.19359387849508 + ], + [ + -34.6596326326069, + 56.56176115337172 + ], + [ + -32.73967542146383, + 57.79293662623354 + ], + [ + -28.376135575143934, + 58.95560816714638 + ], + [ + -24.624433015522214, + 59.29719623766448 + ], + [ + -20.784518593236015, + 59.36570016961349 + ], + [ + -17.46822959498357, + 59.16018837376646 + ], + [ + -13.103758159436694, + 58.68160850123354 + ], + [ + -1.2358655427631504, + 57.33406468441612 + ], + [ + 4.45831298828125, + 56.61431563527961 + ], + [ + 9.95918675472862, + 55.90770520662008 + ], + [ + 13.88824462890625, + 55.36062140213815 + ], + [ + 16.85545268811677, + 54.74503366570724 + ], + [ + 19.298095703125, + 53.92393413342927 + ], + [ + 21.82895058079768, + 52.55576685855263 + ], + [ + 23.13801012541117, + 51.4615831877056 + ], + [ + 24.09798070004109, + 50.16191984477797 + ], + [ + 24.53433388157893, + 48.86317202919409 + ], + [ + 24.7961586400082, + 47.70050048828125 + ], + [ + 24.7088783665707, + 45.64822548314146 + ], + [ + 24.27252518503289, + 41.54369153474508 + ], + [ + 23.4476832339638, + 35.65432899876646 + ], + [ + 22.31315211245888, + 31.41090794613487 + ], + [ + 20.74228387129932, + 27.17029772306745 + ], + [ + 18.90959087171052, + 23.409206992701485 + ], + [ + 16.20420757092927, + 19.510168778268905 + ], + [ + 14.19697008634867, + 17.390337492290314 + ], + [ + 12.10248445209703, + 15.338062487150495 + ], + [ + 10.18345883018091, + 13.422803376850311 + ], + [ + 8.69985480057565, + 12.19162790398849 + ], + [ + 7.30353104440789, + 11.234460127981095 + ], + [ + 4.51086747018914, + 10.00329268606086 + ], + [ + 2.4163657740542703, + 9.38770494962995 + ], + [ + 0.6709530479029411, + 8.909117046155416 + ], + [ + -0.6381064967105488, + 8.56660541735198 + ], + [ + -1.6844257555510183, + 8.22503340871711 + ], + [ + -1.946234452097059, + 8.1565294767681 + ], + [ + -2.2080431486430996, + 8.020461233038645 + ], + [ + -2.2080431486430996, + 8.020461233038645 + ] + ], + "lastCommittedPoint": null, + "simulatePressure": true, + "pressures": [] + }, + { + "type": "text", + "version": 188, + "versionNonce": 2037111188, + "isDeleted": false, + "id": "wZPd0T1Q", + "fillStyle": "hachure", + "strokeWidth": 1, + "strokeStyle": "solid", + "roughness": 1, + "opacity": 100, + "angle": 0, + "x": -207.60621798887357, + "y": -95.58020046710533, + "strokeColor": "#c92a2a", + "backgroundColor": "transparent", + "width": 108, + "height": 25, + "seed": 1461292716, + "groupIds": [], + "strokeSharpness": "sharp", + "boundElements": [], + "updated": 1651578593355, + "link": null, + "locked": false, + "fontSize": 20, + "fontFamily": 1, + "text": "Transdiode", + "rawText": "Transdiode", + "baseline": 17, + "textAlign": "left", + "verticalAlign": "top", + "containerId": null, + "originalText": "Transdiode" + }, + { + "type": "arrow", + "version": 269, + "versionNonce": 117914028, + "isDeleted": false, + "id": "TOXVkhoO-M-bU7CLgV1JN", + "fillStyle": "hachure", + "strokeWidth": 1, + "strokeStyle": "solid", + "roughness": 1, + "opacity": 100, + "angle": 0, + "x": -167.17427603304924, + "y": -73.33678491129447, + "strokeColor": "#c92a2a", + "backgroundColor": "transparent", + "width": 0.6934360284225534, + "height": 24.30928164065358, + "seed": 1812791828, + "groupIds": [], + "strokeSharpness": "round", + "boundElements": [], + "updated": 1651578593355, + "link": null, + "locked": false, + "startBinding": null, + "endBinding": null, + "lastCommittedPoint": null, + "startArrowhead": null, + "endArrowhead": "arrow", + "points": [ + [ + 0, + 0 + ], + [ + -0.6934360284225534, + 24.30928164065358 + ] + ] + }, + { + "type": "text", + "version": 263, + "versionNonce": 378609556, + "isDeleted": false, + "id": "pyAS0pXv", + "fillStyle": "hachure", + "strokeWidth": 1, + "strokeStyle": "solid", + "roughness": 1, + "opacity": 100, + "angle": 0, + "x": -142.4522658022881, + "y": 179.8405569356555, + "strokeColor": "#c92a2a", + "backgroundColor": "transparent", + "width": 28, + "height": 25, + "seed": 74547988, + "groupIds": [], + "strokeSharpness": "sharp", + "boundElements": [], + "updated": 1651578596327, + "link": null, + "locked": false, + "fontSize": 20, + "fontFamily": 1, + "text": "V'o", + "rawText": "V'o", + "baseline": 17, + "textAlign": "left", + "verticalAlign": "top", + "containerId": null, + "originalText": "V'o" + }, + { + "type": "text", + "version": 268, + "versionNonce": 1251220908, + "isDeleted": false, + "id": "mYnlJkHh", + "fillStyle": "hachure", + "strokeWidth": 1, + "strokeStyle": "solid", + "roughness": 1, + "opacity": 100, + "angle": 0, + "x": 76.48150387257397, + "y": -15.4562534388848, + "strokeColor": "#c92a2a", + "backgroundColor": "transparent", + "width": 22, + "height": 25, + "seed": 776033196, + "groupIds": [], + "strokeSharpness": "sharp", + "boundElements": [], + "updated": 1651578601353, + "link": null, + "locked": false, + "fontSize": 20, + "fontFamily": 1, + "text": "Vo", + "rawText": "Vo", + "baseline": 17, + "textAlign": "left", + "verticalAlign": "top", + "containerId": null, + "originalText": "Vo" + }, + { + "id": "3JMQXOq60NUhGMPAUdIDW", + "type": "freedraw", + "x": 11.425053533649361, + "y": -115.58177044256132, + "width": 194.65840059168193, + "height": 144.01841107536762, + "angle": 0, + "strokeColor": "#c92a2a", + "backgroundColor": "transparent", + "fillStyle": "hachure", + "strokeWidth": 1, + "strokeStyle": "solid", + "roughness": 1, + "opacity": 100, + "groupIds": [], + "strokeSharpness": "round", + "seed": 996237460, + "version": 128, + "versionNonce": 730605612, + "isDeleted": false, + "boundElements": null, + "updated": 1651579406323, + "link": null, + "locked": false, + "points": [ + [ + 0, + 0 + ], + [ + -0.5306827320771959, + 0 + ], + [ + -1.839599609375, + 0 + ], + [ + -3.4001967486212834, + 0 + ], + [ + -5.543930951286768, + 0 + ], + [ + -9.640538832720551, + 0.3062528722426521 + ], + [ + -21.930290670955856, + 1.3760196461397243 + ], + [ + -32.46230181525732, + 2.75203929227942 + ], + [ + -42.411175896139696, + 4.281185374540456 + ], + [ + -50.01913631663598, + 6.116584329044116 + ], + [ + -56.649600758272015, + 8.409244312959572 + ], + [ + -66.20831657858452, + 13.30081715303308 + ], + [ + -71.86550364774814, + 17.124723546645214 + ], + [ + -76.74241009880512, + 20.946529612821706 + ], + [ + -80.44884176815253, + 24.462100758272072 + ], + [ + -83.37289249195769, + 28.130780388327196 + ], + [ + -86.6891838522518, + 34.55359963809744 + ], + [ + -91.76115148207717, + 48.92418356502756 + ], + [ + -93.71190688189336, + 55.8042817957261 + ], + [ + -95.27250402113967, + 62.68436207490808 + ], + [ + -96.2478996725643, + 69.56446030560662 + ], + [ + -96.83311911190253, + 75.83205279181985 + ], + [ + -96.63803998161762, + 81.02987850413604 + ], + [ + -95.27250402113967, + 87.2974889418658 + ], + [ + -92.73652918198525, + 91.88490923713235 + ], + [ + -88.63993925206799, + 97.99937528722427 + ], + [ + -83.95811193129592, + 103.80970674402573 + ], + [ + -79.27838493795952, + 108.85440602022055 + ], + [ + -74.596575568704, + 112.67621208639707 + ], + [ + -66.79353601792275, + 118.02716423483457 + ], + [ + -59.96589211856616, + 121.54483570772055 + ], + [ + -51.57973345588232, + 125.36664177389707 + ], + [ + -42.60623707490805, + 129.18844784007354 + ], + [ + -34.99827665441177, + 132.24674000459555 + ], + [ + -28.953031652113964, + 134.84565286075366 + ], + [ + -19.19925465303305, + 138.66745892693012 + ], + [ + -11.591294232536768, + 141.1132453469669 + ], + [ + -4.373492072610247, + 142.79551786534927 + ], + [ + 1.866850011488964, + 143.55903176700366 + ], + [ + 7.3289579503676805, + 144.01841107536762 + ], + [ + 11.620627010569876, + 144.01841107536762 + ], + [ + 16.497551413143412, + 143.40798770680146 + ], + [ + 20.203965130974268, + 142.64239142922793 + ], + [ + 24.493551815257376, + 141.5725887522978 + ], + [ + 29.565501493566217, + 140.3496955422794 + ], + [ + 34.63748707490811, + 139.12680233226104 + ], + [ + 39.514375574448536, + 137.90390912224262 + ], + [ + 46.34205537683823, + 136.06854607077202 + ], + [ + 50.826667336856644, + 134.53939998851104 + ], + [ + 55.313433478860304, + 133.31650677849262 + ], + [ + 60.19032197840073, + 132.09361356847427 + ], + [ + 64.67705221737134, + 130.87072035845586 + ], + [ + 70.13919605928311, + 129.49470071231616 + ], + [ + 73.65054859834561, + 128.73115090762866 + ], + [ + 76.57459932215073, + 128.11868106617646 + ], + [ + 79.11057416130518, + 127.50617532169116 + ], + [ + 81.2564266429228, + 127.04891429227939 + ], + [ + 83.20718204273896, + 126.58953498391543 + ], + [ + 85.548095703125, + 125.82602108226104 + ], + [ + 86.71853458180146, + 125.36664177389707 + ], + [ + 87.69391228170957, + 125.06038890165439 + ], + [ + 88.47422880284927, + 124.75413602941177 + ], + [ + 89.44960650275738, + 124.14374856387866 + ], + [ + 89.837646484375, + 123.5354434742647 + ], + [ + 90.22780474494488, + 122.92293772977939 + ], + [ + 90.81094180836396, + 122.159423828125 + ], + [ + 90.99971995634189, + 122.01258042279409 + ], + [ + 91.38775993795957, + 121.55531939338232 + ], + [ + 91.38775993795957, + 121.20501349954043 + ], + [ + 91.38775993795957, + 120.9847842945772 + ], + [ + 91.38775993795957, + 120.76243681066177 + ], + [ + 91.38775993795957, + 120.54008932674628 + ], + [ + 91.38775993795957, + 120.31982421875 + ], + [ + 91.38775993795957, + 119.79542451746323 + ], + [ + 91.38775993795957, + 119.52065860523896 + ], + [ + 91.58285701976104, + 118.60189998851104 + ], + [ + 91.9729793772978, + 117.6852596507353 + ], + [ + 92.55823471966914, + 116.30924000459555 + ], + [ + 93.14345415900738, + 114.62696748621323 + ], + [ + 93.72867359834561, + 112.94681324678305 + ], + [ + 94.31389303768384, + 111.26454072840073 + ], + [ + 95.48436781939341, + 108.20624856387866 + ], + [ + 95.87452607996323, + 106.370849609375 + ], + [ + 96.2646484375, + 104.53756893382354 + ], + [ + 96.65480669806988, + 102.70216997931982 + ], + [ + 97.0449649586397, + 100.56263643152573 + ], + [ + 97.43512321920957, + 98.42100255629595 + ], + [ + 97.82528147977939, + 94.44607005399814 + ], + [ + 97.82528147977939, + 91.08362534466912 + ], + [ + 97.82528147977939, + 88.17847756778491 + ], + [ + 97.63018439797793, + 85.88579963235293 + ], + [ + 97.24002613740811, + 84.0504186293658 + ], + [ + 96.84990377987134, + 82.06399356617646 + ], + [ + 95.48436781939341, + 77.78280819163604 + ], + [ + 93.92377068014707, + 74.11202823414521 + ], + [ + 92.16807645909927, + 69.98606962316177 + ], + [ + 88.4616268382353, + 62.034122242647044 + ], + [ + 85.34043255974268, + 55.766511804917286 + ], + [ + 82.02414119944854, + 49.039557961856616 + ], + [ + 79.10009047564341, + 43.535479377297804 + ], + [ + 76.3690185546875, + 38.797015021829054 + ], + [ + 73.44288545496323, + 34.05646829044119 + ], + [ + 70.51675235523896, + 29.318021886488964 + ], + [ + 66.61524155560664, + 23.967069738051464 + ], + [ + 64.66448615579043, + 21.215030445772072 + ], + [ + 62.128511316636036, + 18.30986471737134 + ], + [ + 59.98265883501841, + 16.474483714384206 + ], + [ + 57.446683995863964, + 14.7943115234375 + ], + [ + 53.740234375, + 13.112039005055152 + ], + [ + 51.40143899356616, + 12.34642477596509 + ], + [ + 43.01316205193018, + 10.513126148897072 + ], + [ + 37.160895852481644, + 9.290232938878688 + ], + [ + 31.503690831801464, + 8.524618709788598 + ], + [ + 26.823981789981644, + 8.067339728860304 + ], + [ + 21.94705738740811, + 7.761086856617652 + ], + [ + 16.680010627297804, + 7.761086856617652 + ], + [ + 9.657305549172804, + 8.067339728860304 + ], + [ + 5.95085592830884, + 8.220466164981616 + ], + [ + 3.2197840073529846, + 8.524618709788598 + ], + [ + 1.269028607536768, + 8.830853630514724 + ], + [ + -0.2894861557904278, + 9.137106502757348 + ], + [ + -1.4599250344668917, + 9.290232938878688 + ], + [ + -2.8254609949448195, + 9.59438548368567 + ], + [ + -3.6057775160845154, + 9.59438548368567 + ], + [ + -3.9581657858455515, + 9.59438548368567 + ], + [ + -4.134341969209515, + 9.45804371553308 + ], + [ + -4.134341969209515, + 9.45804371553308 + ] + ], + "pressures": [], + "simulatePressure": true, + "lastCommittedPoint": [ + -4.134341969209515, + 9.45804371553308 + ] + }, + { + "id": "vDd4fbnI", + "type": "text", + "x": 0.7609192275832015, + "y": -138.7522883079106, + "width": 69, + "height": 25, + "angle": 0, + "strokeColor": "#c92a2a", + "backgroundColor": "transparent", + "fillStyle": "hachure", + "strokeWidth": 1, + "strokeStyle": "solid", + "roughness": 1, + "opacity": 100, + "groupIds": [], + "strokeSharpness": "sharp", + "seed": 1087029396, + "version": 39, + "versionNonce": 642808236, + "isDeleted": false, + "boundElements": null, + "updated": 1651579416127, + "link": null, + "locked": false, + "text": "Summer", + "rawText": "Summer", + "fontSize": 20, + "fontFamily": 1, + "textAlign": "left", + "verticalAlign": "top", + "baseline": 17, + "containerId": null, + "originalText": "Summer" + } + ], + "appState": { + "theme": "dark", + "viewBackgroundColor": "#ffffff", + "currentItemStrokeColor": "#c92a2a", + "currentItemBackgroundColor": "transparent", + "currentItemFillStyle": "hachure", + "currentItemStrokeWidth": 1, + "currentItemStrokeStyle": "solid", + "currentItemRoughness": 1, + "currentItemOpacity": 100, + "currentItemFontFamily": 1, + "currentItemFontSize": 20, + "currentItemTextAlign": "left", + "currentItemStrokeSharpness": "sharp", + "currentItemStartArrowhead": null, + "currentItemEndArrowhead": "arrow", + "currentItemLinearStrokeSharpness": "round", + "gridSize": null, + "colorPalette": {} + }, + "files": {} +} +``` +%% \ No newline at end of file diff --git a/Areas/upv/classes/analog-electricity/assets/Pasted Image 20220503134001_401.png b/Areas/upv/classes/analog-electricity/assets/Pasted Image 20220503134001_401.png new file mode 100644 index 0000000..21225f3 Binary files /dev/null and b/Areas/upv/classes/analog-electricity/assets/Pasted Image 20220503134001_401.png differ diff --git a/Areas/upv/classes/analog-electricity/assets/Pasted image 20220503131445.png b/Areas/upv/classes/analog-electricity/assets/Pasted image 20220503131445.png new file mode 100644 index 0000000..3d5c407 Binary files /dev/null and b/Areas/upv/classes/analog-electricity/assets/Pasted image 20220503131445.png differ diff --git a/Areas/upv/classes/analog-electricity/assets/Pasted image 20220503131539.png b/Areas/upv/classes/analog-electricity/assets/Pasted image 20220503131539.png new file mode 100644 index 0000000..cce4de7 Binary files /dev/null and b/Areas/upv/classes/analog-electricity/assets/Pasted image 20220503131539.png differ diff --git a/Areas/upv/classes/analog-electricity/assets/Pasted image 20220503133103.png b/Areas/upv/classes/analog-electricity/assets/Pasted image 20220503133103.png new file mode 100644 index 0000000..8cc831e Binary files /dev/null and b/Areas/upv/classes/analog-electricity/assets/Pasted image 20220503133103.png differ diff --git a/Areas/upv/classes/analog-electricity/assets/Pasted image 20220503142156.png b/Areas/upv/classes/analog-electricity/assets/Pasted image 20220503142156.png new file mode 100644 index 0000000..5686182 Binary files /dev/null and b/Areas/upv/classes/analog-electricity/assets/Pasted image 20220503142156.png differ diff --git a/Areas/upv/classes/analog-electricity/assets/index 2022-05-16 08.28.36.excalidraw.md b/Areas/upv/classes/analog-electricity/assets/index 2022-05-16 08.28.36.excalidraw.md new file mode 100644 index 0000000..2760039 --- /dev/null +++ b/Areas/upv/classes/analog-electricity/assets/index 2022-05-16 08.28.36.excalidraw.md @@ -0,0 +1,42 @@ +--- + +excalidraw-plugin: parsed +tags: [excalidraw] + +--- +==⚠ Switch to EXCALIDRAW VIEW in the MORE OPTIONS menu of this document. ⚠== + + +# Text Elements +%% +# Drawing +```json +{ + "type": "excalidraw", + "version": 2, + "source": "https://excalidraw.com", + "elements": [], + "appState": { + "theme": "dark", + "viewBackgroundColor": "#ffffff", + "currentItemStrokeColor": "#000000", + "currentItemBackgroundColor": "transparent", + "currentItemFillStyle": "hachure", + "currentItemStrokeWidth": 1, + "currentItemStrokeStyle": "solid", + "currentItemRoughness": 1, + "currentItemOpacity": 100, + "currentItemFontFamily": 1, + "currentItemFontSize": 20, + "currentItemTextAlign": "left", + "currentItemStrokeSharpness": "sharp", + "currentItemStartArrowhead": null, + "currentItemEndArrowhead": "arrow", + "currentItemLinearStrokeSharpness": "round", + "gridSize": null, + "colorPalette": {} + }, + "files": {} +} +``` +%% \ No newline at end of file diff --git a/Areas/upv/classes/analog-electricity/assets/index 2022-05-16 08.43.59.excalidraw.md b/Areas/upv/classes/analog-electricity/assets/index 2022-05-16 08.43.59.excalidraw.md new file mode 100644 index 0000000..568bc28 --- /dev/null +++ b/Areas/upv/classes/analog-electricity/assets/index 2022-05-16 08.43.59.excalidraw.md @@ -0,0 +1,697 @@ +--- + +excalidraw-plugin: parsed +tags: [excalidraw] + +--- +==⚠ Switch to EXCALIDRAW VIEW in the MORE OPTIONS menu of this document. ⚠== + + +# Text Elements +milk ^hyBkaOoN + +coffee +machine ^XiUPjPdV + +coffee ^jAeBw6gR + +latte +machiato ^H81raFwq + + ^vbf3aQn6 + +water ^Sg07YhhS + +%% +# Drawing +```json +{ + "type": "excalidraw", + "version": 2, + "source": "https://excalidraw.com", + "elements": [ + { + "type": "rectangle", + "version": 366, + "versionNonce": 1921949234, + "isDeleted": false, + "id": "5h7c_bRftqslKy_4WgVqe", + "fillStyle": "hachure", + "strokeWidth": 1, + "strokeStyle": "solid", + "roughness": 1, + "opacity": 100, + "angle": 0, + "x": -309.5998738606771, + "y": -179.2679506937663, + "strokeColor": "#000000", + "backgroundColor": "transparent", + "width": 72, + "height": 43, + "seed": 1635115822, + "groupIds": [], + "strokeSharpness": "sharp", + "boundElements": [ + { + "type": "text", + "id": "hyBkaOoN" + }, + { + "id": "YLXC1S5Tpp3YSCCPQje_p", + "type": "arrow" + } + ], + "updated": 1652683862303, + "link": null, + "locked": false + }, + { + "type": "text", + "version": 301, + "versionNonce": 970397166, + "isDeleted": false, + "id": "hyBkaOoN", + "fillStyle": "hachure", + "strokeWidth": 1, + "strokeStyle": "solid", + "roughness": 1, + "opacity": 100, + "angle": 0, + "x": -304.5998738606771, + "y": -167.7679506937663, + "strokeColor": "#000000", + "backgroundColor": "transparent", + "width": 62, + "height": 20, + "seed": 1704233006, + "groupIds": [], + "strokeSharpness": "sharp", + "boundElements": [], + "updated": 1652683862303, + "link": null, + "locked": false, + "fontSize": 16, + "fontFamily": 1, + "text": "milk", + "rawText": "milk", + "baseline": 13, + "textAlign": "center", + "verticalAlign": "middle", + "containerId": "5h7c_bRftqslKy_4WgVqe", + "originalText": "milk" + }, + { + "type": "rectangle", + "version": 444, + "versionNonce": 1658387250, + "isDeleted": false, + "id": "yHOQMjPYW5KY35vq0o5IQ", + "fillStyle": "hachure", + "strokeWidth": 1, + "strokeStyle": "solid", + "roughness": 1, + "opacity": 100, + "angle": 0, + "x": -100.53697204589844, + "y": -128.56269454956055, + "strokeColor": "#000000", + "backgroundColor": "transparent", + "width": 72, + "height": 75, + "seed": 1939880878, + "groupIds": [], + "strokeSharpness": "sharp", + "boundElements": [ + { + "id": "XiUPjPdV", + "type": "text" + }, + { + "id": "w2-13xGpVtuUuKcsHx5ji", + "type": "arrow" + }, + { + "id": "YLXC1S5Tpp3YSCCPQje_p", + "type": "arrow" + }, + { + "id": "qmDf5jtPUUge_EH4cYm92", + "type": "arrow" + }, + { + "id": "o7mLGRC0zuJRLCtn-q0qy", + "type": "arrow" + } + ], + "updated": 1652683859765, + "link": null, + "locked": false + }, + { + "type": "text", + "version": 394, + "versionNonce": 262998254, + "isDeleted": false, + "id": "XiUPjPdV", + "fillStyle": "hachure", + "strokeWidth": 1, + "strokeStyle": "solid", + "roughness": 1, + "opacity": 100, + "angle": 0, + "x": -95.53697204589844, + "y": -111.06269454956055, + "strokeColor": "#000000", + "backgroundColor": "transparent", + "width": 62, + "height": 40, + "seed": 1112874546, + "groupIds": [], + "strokeSharpness": "sharp", + "boundElements": [], + "updated": 1652683859765, + "link": null, + "locked": false, + "fontSize": 16, + "fontFamily": 1, + "text": "coffee\nmachine", + "rawText": "coffee\nmachine", + "baseline": 33, + "textAlign": "center", + "verticalAlign": "middle", + "containerId": "yHOQMjPYW5KY35vq0o5IQ", + "originalText": "coffee\nmachine" + }, + { + "type": "rectangle", + "version": 393, + "versionNonce": 1412875506, + "isDeleted": false, + "id": "I-l9buc5bkdsIrZCyk_Fg", + "fillStyle": "hachure", + "strokeWidth": 1, + "strokeStyle": "solid", + "roughness": 1, + "opacity": 100, + "angle": 0, + "x": -347.8752899169922, + "y": -107.28217697143555, + "strokeColor": "#000000", + "backgroundColor": "transparent", + "width": 112, + "height": 33, + "seed": 328519090, + "groupIds": [], + "strokeSharpness": "sharp", + "boundElements": [ + { + "id": "jAeBw6gR", + "type": "text" + }, + { + "id": "w2-13xGpVtuUuKcsHx5ji", + "type": "arrow" + } + ], + "updated": 1652683859765, + "link": null, + "locked": false + }, + { + "type": "text", + "version": 383, + "versionNonce": 1127856942, + "isDeleted": false, + "id": "jAeBw6gR", + "fillStyle": "hachure", + "strokeWidth": 1, + "strokeStyle": "solid", + "roughness": 1, + "opacity": 100, + "angle": 0, + "x": -342.8752899169922, + "y": -100.78217697143555, + "strokeColor": "#000000", + "backgroundColor": "transparent", + "width": 102, + "height": 20, + "seed": 925736558, + "groupIds": [], + "strokeSharpness": "sharp", + "boundElements": [], + "updated": 1652683859765, + "link": null, + "locked": false, + "fontSize": 16, + "fontFamily": 1, + "text": "coffee", + "rawText": "coffee", + "baseline": 13, + "textAlign": "center", + "verticalAlign": "middle", + "containerId": "I-l9buc5bkdsIrZCyk_Fg", + "originalText": "coffee" + }, + { + "type": "arrow", + "version": 1335, + "versionNonce": 1924486834, + "isDeleted": false, + "id": "w2-13xGpVtuUuKcsHx5ji", + "fillStyle": "hachure", + "strokeWidth": 1, + "strokeStyle": "solid", + "roughness": 1, + "opacity": 100, + "angle": 0, + "x": -223.37857884276804, + "y": -89.09162521362305, + "strokeColor": "#000000", + "backgroundColor": "transparent", + "width": 108.7708548437446, + "height": 14.40020751953125, + "seed": 1853731314, + "groupIds": [], + "strokeSharpness": "round", + "boundElements": [], + "updated": 1652683859765, + "link": null, + "locked": false, + "startBinding": { + "elementId": "I-l9buc5bkdsIrZCyk_Fg", + "gap": 12.496711074224152, + "focus": -0.16874950093988172 + }, + "endBinding": { + "elementId": "yHOQMjPYW5KY35vq0o5IQ", + "gap": 14.070751953125, + "focus": -0.30480272593060115 + }, + "lastCommittedPoint": null, + "startArrowhead": null, + "endArrowhead": "triangle", + "points": [ + [ + 0, + 0 + ], + [ + 26.04857701171335, + 1.9741184984531515 + ], + [ + 61.07466954101022, + 14.40020751953125 + ], + [ + 108.7708548437446, + 12.232876843810985 + ] + ] + }, + { + "type": "arrow", + "version": 554, + "versionNonce": 1128269810, + "isDeleted": false, + "id": "YLXC1S5Tpp3YSCCPQje_p", + "fillStyle": "hachure", + "strokeWidth": 1, + "strokeStyle": "solid", + "roughness": 1, + "opacity": 100, + "angle": 0, + "x": -230.88571675618493, + "y": -143.12577144757748, + "strokeColor": "#000000", + "backgroundColor": "transparent", + "width": 113.5596822102865, + "height": 41.76321117536068, + "seed": 1462206190, + "groupIds": [], + "strokeSharpness": "round", + "boundElements": [], + "updated": 1652683862303, + "link": null, + "locked": false, + "startBinding": { + "elementId": "5h7c_bRftqslKy_4WgVqe", + "gap": 6.7141571044921875, + "focus": 0.40866224006199764 + }, + "endBinding": { + "elementId": "yHOQMjPYW5KY35vq0o5IQ", + "gap": 16.7890625, + "focus": 0.40826297411526596 + }, + "lastCommittedPoint": null, + "startArrowhead": null, + "endArrowhead": "triangle", + "points": [ + [ + 0, + 0 + ], + [ + 55.839101155598996, + 5.694119378485681 + ], + [ + 72.58278401692712, + 41.76321117536068 + ], + [ + 113.5596822102865, + 39.166802938572616 + ] + ] + }, + { + "type": "rectangle", + "version": 590, + "versionNonce": 1861988466, + "isDeleted": false, + "id": "JXGWJXcUxf4Z40OFyjDFk", + "fillStyle": "hachure", + "strokeWidth": 1, + "strokeStyle": "solid", + "roughness": 1, + "opacity": 100, + "angle": 0, + "x": 105.98942136764526, + "y": -128.04912543296814, + "strokeColor": "#000000", + "backgroundColor": "transparent", + "width": 105, + "height": 70, + "seed": 1342047282, + "groupIds": [], + "strokeSharpness": "sharp", + "boundElements": [ + { + "id": "H81raFwq", + "type": "text" + }, + { + "id": "w2-13xGpVtuUuKcsHx5ji", + "type": "arrow" + }, + { + "id": "YLXC1S5Tpp3YSCCPQje_p", + "type": "arrow" + }, + { + "id": "qmDf5jtPUUge_EH4cYm92", + "type": "arrow" + } + ], + "updated": 1652683859765, + "link": null, + "locked": false + }, + { + "type": "text", + "version": 572, + "versionNonce": 1412122542, + "isDeleted": false, + "id": "H81raFwq", + "fillStyle": "hachure", + "strokeWidth": 1, + "strokeStyle": "solid", + "roughness": 1, + "opacity": 100, + "angle": 0, + "x": 110.98942136764526, + "y": -113.04912543296814, + "strokeColor": "#000000", + "backgroundColor": "transparent", + "width": 95, + "height": 40, + "seed": 972623854, + "groupIds": [], + "strokeSharpness": "sharp", + "boundElements": [], + "updated": 1652683859765, + "link": null, + "locked": false, + "fontSize": 16, + "fontFamily": 1, + "text": "latte\nmachiato", + "rawText": "latte\nmachiato", + "baseline": 33, + "textAlign": "center", + "verticalAlign": "middle", + "containerId": "JXGWJXcUxf4Z40OFyjDFk", + "originalText": "latte\nmachiato" + }, + { + "type": "arrow", + "version": 610, + "versionNonce": 1288753714, + "isDeleted": false, + "id": "qmDf5jtPUUge_EH4cYm92", + "fillStyle": "hachure", + "strokeWidth": 1, + "strokeStyle": "solid", + "roughness": 1, + "opacity": 100, + "angle": 0, + "x": -14.779141139984127, + "y": -74.39696029631116, + "strokeColor": "#000000", + "backgroundColor": "transparent", + "width": 107.28800220489501, + "height": 36.004913330078125, + "seed": 655371886, + "groupIds": [], + "strokeSharpness": "round", + "boundElements": [], + "updated": 1652683859765, + "link": null, + "locked": false, + "startBinding": { + "elementId": "yHOQMjPYW5KY35vq0o5IQ", + "gap": 13.75783090591431, + "focus": 0.4607607214850232 + }, + "endBinding": { + "elementId": "JXGWJXcUxf4Z40OFyjDFk", + "focus": 0.5851106926414881, + "gap": 13.480560302734375 + }, + "lastCommittedPoint": null, + "startArrowhead": null, + "endArrowhead": "triangle", + "points": [ + [ + 0, + 0 + ], + [ + 29.399635505676265, + -23.99576254876635 + ], + [ + 60.217933845520015, + 12.009150781311774 + ], + [ + 107.28800220489501, + -17.228119901075672 + ] + ] + }, + { + "type": "text", + "version": 3, + "versionNonce": 1124213230, + "isDeleted": false, + "id": "vbf3aQn6", + "fillStyle": "hachure", + "strokeWidth": 1, + "strokeStyle": "solid", + "roughness": 1, + "opacity": 100, + "angle": 0, + "x": -197.40771287679672, + "y": -147.50970870256424, + "strokeColor": "#000000", + "backgroundColor": "transparent", + "width": 9, + "height": 20, + "seed": 879394482, + "groupIds": [], + "strokeSharpness": "sharp", + "boundElements": null, + "updated": 1652683859765, + "link": null, + "locked": false, + "fontSize": 16, + "fontFamily": 1, + "text": "", + "rawText": "", + "baseline": 14, + "textAlign": "center", + "verticalAlign": "top", + "containerId": null, + "originalText": "" + }, + { + "type": "rectangle", + "version": 460, + "versionNonce": 2132524018, + "isDeleted": false, + "id": "IZcYNMxZTdrqGXDCS1_W9", + "fillStyle": "hachure", + "strokeWidth": 1, + "strokeStyle": "solid", + "roughness": 1, + "opacity": 100, + "angle": 0, + "x": -341.87991136312485, + "y": -45.187229454517365, + "strokeColor": "#000000", + "backgroundColor": "transparent", + "width": 112, + "height": 33, + "seed": 1612344046, + "groupIds": [], + "strokeSharpness": "sharp", + "boundElements": [ + { + "id": "Sg07YhhS", + "type": "text" + }, + { + "id": "w2-13xGpVtuUuKcsHx5ji", + "type": "arrow" + }, + { + "id": "o7mLGRC0zuJRLCtn-q0qy", + "type": "arrow" + } + ], + "updated": 1652683859765, + "link": null, + "locked": false + }, + { + "type": "text", + "version": 453, + "versionNonce": 1585689646, + "isDeleted": false, + "id": "Sg07YhhS", + "fillStyle": "hachure", + "strokeWidth": 1, + "strokeStyle": "solid", + "roughness": 1, + "opacity": 100, + "angle": 0, + "x": -336.87991136312485, + "y": -38.687229454517365, + "strokeColor": "#000000", + "backgroundColor": "transparent", + "width": 102, + "height": 20, + "seed": 357073650, + "groupIds": [], + "strokeSharpness": "sharp", + "boundElements": [], + "updated": 1652683859765, + "link": null, + "locked": false, + "fontSize": 16, + "fontFamily": 1, + "text": "water", + "rawText": "water", + "baseline": 13, + "textAlign": "center", + "verticalAlign": "middle", + "containerId": "IZcYNMxZTdrqGXDCS1_W9", + "originalText": "water" + }, + { + "id": "o7mLGRC0zuJRLCtn-q0qy", + "type": "arrow", + "x": -223.18935960531235, + "y": -28.092869102954865, + "width": 108.0628967285156, + "height": 26.446216570870646, + "angle": 0, + "strokeColor": "#000000", + "backgroundColor": "transparent", + "fillStyle": "hachure", + "strokeWidth": 1, + "strokeStyle": "solid", + "roughness": 1, + "opacity": 100, + "groupIds": [], + "strokeSharpness": "round", + "seed": 1761803950, + "version": 324, + "versionNonce": 65236402, + "isDeleted": false, + "boundElements": null, + "updated": 1652683859765, + "link": null, + "locked": false, + "points": [ + [ + 0, + 0 + ], + [ + 53.010711669921875, + -0.112335205078125 + ], + [ + 63.19671630859375, + -20.630523681640625 + ], + [ + 108.0628967285156, + -26.446216570870646 + ] + ], + "lastCommittedPoint": [ + 104.78939819335938, + -18.467803955078125 + ], + "startBinding": { + "elementId": "IZcYNMxZTdrqGXDCS1_W9", + "focus": 0.04375850482407367, + "gap": 6.6905517578125 + }, + "endBinding": { + "elementId": "yHOQMjPYW5KY35vq0o5IQ", + "focus": -0.7106611103187035, + "gap": 14.589490830898285 + }, + "startArrowhead": null, + "endArrowhead": "triangle" + } + ], + "appState": { + "theme": "dark", + "viewBackgroundColor": "#ffffff", + "currentItemStrokeColor": "#000000", + "currentItemBackgroundColor": "transparent", + "currentItemFillStyle": "hachure", + "currentItemStrokeWidth": 1, + "currentItemStrokeStyle": "solid", + "currentItemRoughness": 1, + "currentItemOpacity": 100, + "currentItemFontFamily": 1, + "currentItemFontSize": 16, + "currentItemTextAlign": "center", + "currentItemStrokeSharpness": "sharp", + "currentItemStartArrowhead": null, + "currentItemEndArrowhead": "triangle", + "currentItemLinearStrokeSharpness": "round", + "gridSize": null, + "colorPalette": {} + }, + "files": {} +} +``` +%% \ No newline at end of file diff --git a/Areas/upv/classes/analog-electricity/blocks/Multivibrator.md b/Areas/upv/classes/analog-electricity/blocks/Multivibrator.md new file mode 100644 index 0000000..fc81c94 --- /dev/null +++ b/Areas/upv/classes/analog-electricity/blocks/Multivibrator.md @@ -0,0 +1,18 @@ +# Multivibrator + +![[Pasted image 20220503131539.png]] +The Operational Amplifier or Op-amp for short, is a very versatile device that can be used in a variety of different electronic circuits and applications, from voltage amplifiers, to filters, to signal conditioners. But one very simple and extremely useful op-amp circuit based around any general purpose operational amplifier is the Astable Op-amp Multivibrator. + +We saw in our tutorials about Sequential Logic that multivibrator circuits can be constructed using transistors, logic gates or from dedicated chips such as the NE555 timer. We also saw that the astable multivibrator switches continuously between its two unstable states without the need for any external triggering. + +But the problem with using these components to produce an astable multivibrator circuit is that for transistor based astables, many additional components are required, digital astables can generally only be used in digital circuits, and the use of a 555 timer may not always give us a symmetrical output without additional biasing components. The Op-amp Multivibrator circuit however, can provide us with a good rectangular wave signal with the use of just four components, three resistors and a timing capacitor. + +The Op-amp Multivibrator is an astable oscillator circuit that generates a rectangular output waveform using an RC timing network connected to the inverting input of the operational amplifier and a voltage divider network connected to the other non-inverting input. + +Unlike the monostable or bistable, the astable multivibrator has two states, neither of which are stable as it is constantly switching between these two states with the time spent in each state controlled by the charging or discharging of the capacitor through a resistor. + +In the op-amp multivibrator circuit the op-amp works as an analogue comparator. An op-amp comparator compares the voltages on its two inputs and gives a positive or negative output depending on whether the input is greater or less than some reference value, VREF. + +However, because the open-loop op-amp comparator is very sensitive to the voltage changes on its inputs, the output can switch uncontrollably between its positive, +V(sat) and negative, -V(sat) supply rails whenever the input voltage being measured is near to the reference voltage, VREF. + +To eliminate any erratic or uncontrolled switching operations, the op-amp used in the multivibrator circuit is configured as a closed-loop Schmitt Trigger circuit. Consider the circuit below. diff --git a/Areas/upv/classes/analog-electricity/LabExp-2. Differential amplifier and Bode Diagram.pdf b/Areas/upv/classes/analog-electricity/docs/LabExp-2. Differential amplifier and Bode Diagram.pdf similarity index 100% rename from Areas/upv/classes/analog-electricity/LabExp-2. Differential amplifier and Bode Diagram.pdf rename to Areas/upv/classes/analog-electricity/docs/LabExp-2. Differential amplifier and Bode Diagram.pdf diff --git a/Areas/upv/classes/analog-electricity/docs/LabExp-4. Nos-linear circuits based on OAs.pdf b/Areas/upv/classes/analog-electricity/docs/LabExp-4. Nos-linear circuits based on OAs.pdf new file mode 100644 index 0000000..452cb58 Binary files /dev/null and b/Areas/upv/classes/analog-electricity/docs/LabExp-4. Nos-linear circuits based on OAs.pdf differ diff --git a/Areas/upv/classes/analog-electricity/docs/Questions-videos2020-Unit8.pdf b/Areas/upv/classes/analog-electricity/docs/Questions-videos2020-Unit8.pdf new file mode 100644 index 0000000..5f57ac1 Binary files /dev/null and b/Areas/upv/classes/analog-electricity/docs/Questions-videos2020-Unit8.pdf differ diff --git a/Areas/upv/classes/analog-electricity/Unit1_2020.pdf b/Areas/upv/classes/analog-electricity/docs/Unit1_2020.pdf similarity index 100% rename from Areas/upv/classes/analog-electricity/Unit1_2020.pdf rename to Areas/upv/classes/analog-electricity/docs/Unit1_2020.pdf diff --git a/Areas/upv/classes/analog-electricity/Unit2_2020.pdf b/Areas/upv/classes/analog-electricity/docs/Unit2_2020.pdf similarity index 100% rename from Areas/upv/classes/analog-electricity/Unit2_2020.pdf rename to Areas/upv/classes/analog-electricity/docs/Unit2_2020.pdf diff --git a/Areas/upv/classes/analog-electricity/docs/Unit3_2020.pdf b/Areas/upv/classes/analog-electricity/docs/Unit3_2020.pdf new file mode 100644 index 0000000..5e6a08a Binary files /dev/null and b/Areas/upv/classes/analog-electricity/docs/Unit3_2020.pdf differ diff --git a/Areas/upv/classes/analog-electricity/docs/Unit4_2020.pdf b/Areas/upv/classes/analog-electricity/docs/Unit4_2020.pdf new file mode 100644 index 0000000..c2ea2f7 Binary files /dev/null and b/Areas/upv/classes/analog-electricity/docs/Unit4_2020.pdf differ diff --git a/Areas/upv/classes/analog-electricity/docs/Unit5_2020.pdf b/Areas/upv/classes/analog-electricity/docs/Unit5_2020.pdf new file mode 100644 index 0000000..724d5b5 Binary files /dev/null and b/Areas/upv/classes/analog-electricity/docs/Unit5_2020.pdf differ diff --git a/Areas/upv/classes/analog-electricity/docs/Unit6_2020.pdf b/Areas/upv/classes/analog-electricity/docs/Unit6_2020.pdf new file mode 100644 index 0000000..df25169 Binary files /dev/null and b/Areas/upv/classes/analog-electricity/docs/Unit6_2020.pdf differ diff --git a/Areas/upv/classes/analog-electricity/Unit7_2020.pdf b/Areas/upv/classes/analog-electricity/docs/Unit7_2020.pdf similarity index 100% rename from Areas/upv/classes/analog-electricity/Unit7_2020.pdf rename to Areas/upv/classes/analog-electricity/docs/Unit7_2020.pdf diff --git a/Areas/upv/classes/analog-electricity/docs/Unit8_2020.pdf b/Areas/upv/classes/analog-electricity/docs/Unit8_2020.pdf new file mode 100644 index 0000000..05e9b07 Binary files /dev/null and b/Areas/upv/classes/analog-electricity/docs/Unit8_2020.pdf differ diff --git a/Areas/upv/classes/analog-electricity/docs/Unit9_2020.pdf b/Areas/upv/classes/analog-electricity/docs/Unit9_2020.pdf new file mode 100644 index 0000000..c165ef1 Binary files /dev/null and b/Areas/upv/classes/analog-electricity/docs/Unit9_2020.pdf differ diff --git a/Areas/upv/classes/analog-electricity/lab-experiment-2.md b/Areas/upv/classes/analog-electricity/lab-experiment-2.md index 39a0d5a..cbf1132 100644 --- a/Areas/upv/classes/analog-electricity/lab-experiment-2.md +++ b/Areas/upv/classes/analog-electricity/lab-experiment-2.md @@ -1,6 +1,5 @@ # Voltage-controlled current source - ```circuitjs $ 1 0.000005 10.20027730826997 50 5 50 5e-11 409 640 368 800 368 1 0.6 -16.023420346306043 0.023100000000000002 0 @@ -42,7 +41,6 @@ o 9 16 0 159746 14.661466041813108 0.0001 0 1 ``` # Pseudo Integrators based on OA - ```circuitjs $ 1 0.000005 10.20027730826997 50 5 50 5e-11 409 624 432 768 432 1 0.6 29.035877276181203 0.0231 0 @@ -60,4 +58,4 @@ c 624 288 768 288 0 1.0000000000000001e-7 12.907537355618608 0.001 r 512 416 624 416 0 1000 o 8 16 0 159746 13.58313090577521 0.0001 0 1 o 5 16 0 159746 0.9999999999999959 0.0001 0 2 5 3 -``` \ No newline at end of file +``` diff --git a/Areas/upv/classes/analog-electricity/lab-experiment-3.md b/Areas/upv/classes/analog-electricity/lab-experiment-3.md index 9d96226..c07b082 100644 --- a/Areas/upv/classes/analog-electricity/lab-experiment-3.md +++ b/Areas/upv/classes/analog-electricity/lab-experiment-3.md @@ -49,9 +49,6 @@ layout: columns width: 80% ``` - - - ```circuitjs $ 64 0.000005 1.0312258501325766 50 5 50 5e-11 v 128 288 128 192 0 1 40 5 0 0 0.5 @@ -65,4 +62,4 @@ R 288 176 288 144 0 0 40 -15 0 0 0.5 R 288 240 288 288 0 0 40 15 0 0 0.5 w 352 208 352 112 0 O 352 208 416 208 1 0 -``` \ No newline at end of file +``` diff --git a/Areas/upv/classes/analog-electricity/lab-experiment-4.md b/Areas/upv/classes/analog-electricity/lab-experiment-4.md new file mode 100644 index 0000000..e69de29 diff --git a/Areas/upv/classes/analog-electricity/ohms-law.md b/Areas/upv/classes/analog-electricity/ohms-law.md deleted file mode 100644 index 6859853..0000000 --- a/Areas/upv/classes/analog-electricity/ohms-law.md +++ /dev/null @@ -1,12 +0,0 @@ -# Ohms Law - -Ohms law is used to calculate the relationship between voltage, current, resistance - -```latex -E = I * R -voltage = current * resistance; -volts = amps * ohms; -V = A x Ω. -``` - - diff --git a/Areas/upv/classes/analog-electricity/task-project.md b/Areas/upv/classes/analog-electricity/task-project.md index f5c4690..3dc3500 100644 --- a/Areas/upv/classes/analog-electricity/task-project.md +++ b/Areas/upv/classes/analog-electricity/task-project.md @@ -53,4 +53,64 @@ x 300 345 324 348 4 12 HPF 38 3 F1 0 1 500000 -1 Rs 38 8 F1 0 1 500000 0 \0 38 4 F1 0 1 500000 0 \0 +``` + + +# Design 2 + +```circuitjs +$ 1 0.000005 10.20027730826997 50 5 43 5e-11 +g -80 272 -80 304 0 0 +v -80 272 -80 176 0 0 40 10 0 0 0.5 +w -80 176 32 176 0 +w 32 176 32 192 0 +w 32 192 0 192 0 +w 32 192 64 192 0 +r 0 192 0 288 0 251000 +r 0 288 0 368 0 251000 +r 64 192 64 256 0 251000 +w 64 368 32 368 0 +w 0 368 32 368 0 +w 32 368 32 384 0 +g 32 384 32 416 0 0 +w 0 288 160 288 0 +w 64 256 160 256 0 +w 160 256 160 208 2 +w 160 288 160 304 2 +w 160 208 256 208 0 +w 160 304 256 304 0 +a 256 224 368 224 9 10 -10 1000000 2.115054761480507 2.115075912028122 100000 +a 256 320 368 320 9 10 -10 1000000 4.999950000499995 5 100000 +w 256 240 256 272 0 +w 256 272 368 272 0 +w 368 224 368 272 0 +w 256 368 368 368 0 +w 256 336 256 368 0 +w 368 368 368 320 0 +w 368 320 448 320 0 +w 368 272 448 272 0 +r 448 272 528 272 0 1000 +r 448 320 528 320 0 1000 +w 528 320 528 304 0 +w 528 176 528 272 0 +a 528 288 640 288 9 10 -10 1000000 1.0928261699808117 1.0927953310887633 100000 +w 528 320 528 368 0 +r 528 368 640 368 0 1069 +c 528 416 640 416 0 0.000001 4.17671537481608 0.001 +w 528 368 528 416 0 +w 640 416 640 368 0 +w 640 368 640 288 0 +c 528 128 640 128 0 0.000001 1.0927953310887633 0.001 +r 528 176 640 176 0 1069 +w 528 176 528 128 0 +w 640 128 640 176 0 +g 640 176 640 192 0 0 +O 640 288 704 288 1 0 +b -48 80 112 455 0 +x -42 107 46 110 4 24 SIGNAL +x 127 106 239 109 4 24 BUFFERS +b 119 80 439 455 0 +b 448 82 768 457 0 +x 456 108 676 111 4 24 INV-DIF-AMPLIFIER +374 64 256 64 368 0 0.32680000000000003 Light\sBrightness ``` \ No newline at end of file diff --git a/Areas/upv/classes/empresario/07-Marketing-Fundamentals.md b/Areas/upv/classes/empresario/07-Marketing-Fundamentals.md new file mode 100644 index 0000000..fdd7014 --- /dev/null +++ b/Areas/upv/classes/empresario/07-Marketing-Fundamentals.md @@ -0,0 +1,103 @@ +## What is Marketing? + +- Find out the needs of your customers +- That helps to develop products that meet those needs +- Create communication that creates demand for those products +- Define/Design how to distribute those products + +There are two dimensions to this, the **strategy** (needs) and **operational** (product, price, communication and distributing). Which then create two types of marketing: + +## Strategic Marketing + +Its mission is to study the needs of the market and its evolution, to detect opportunities and threats that, combined with the resources and capabilities of the company, allow defining a strategy that represents a long-term sustainable competitive advantage and is consistent with the mission and the general strategy of the business. + +It helps us to reflect on the values of the company to know where we are and where we want to go. + +Example: Differentiation of the competition for the quality of the product. + +**Strategic Marketing Plan =** ++ Analysis of the situation ++ Diagnostic of the situation ++ Marketing objectives ++ Marketing strategies ++ Operational decisions + +## Functions +1. D + +## Operational Marketing + +# 01 - Define the Market Potential and the competition + +Group of people or companies with the ability to use or buy a product to cover a need + +**Example:** +Define the potential market in which to compete. + +*Need:* communication +*Potential market:* Mobile phone users + +# 02 - Segment the potential market + +## What is Segmentation +Divide the potential market into some smaller markets, with different commercial behavior in order to apply a specific marketing plan to each one of them. + +## What characteristics do these segments have +**Homogeneous**: Grouping similar customers. +**Substantial**: Having enough sales potential. +**Accessible**: Being able to reach them with reasonable efforts. + +![[07-Marketing-Fundamentals 2022-05-26 20.46.58.excalidraw]] + +## Segmentation of the potential consumer market + +**Who buys?** + +- Demographic Variables + - age + - sex + - family size + +**Why do the buy?** +- Functionality +- symbol +- quality + +**How they buy?** +- Faithful to brand → strong, changing, none +- frequency of use → high, medium, low + +## Segmentation of the potential business market + +**What benefits?** +Operation or performance needs that the product us meet + +**To whom?** +According to the profile of the business customers + +**How to they buy?** + + +# 03 - Demand analysis and forecasts + +- Statistical Analysis (time series) +- Correlated indexed (births/diapers) +- Chain proportion (multiplication of percentages) +- Construction of market (combine the demand of several segments) +- Others.... + +# 04 - Analyze the competition + +- Number of direct competitors +- How many competitors supports the town???? :/ +- What share of the market is captured by the major competitors +- What is the service image that the people have of the main competitors. +- What basic advantages do main competitors have. +- Do the competitors have cost advantages. +- Are there competitors with differentiation advantages? What type of differentiation? +- Are there barriers of entry for new competitors? +- What are the main barriers of entry? + +# 05 - Select the market segment(s) + +# 06 - Position yourself in the segment(s)/market diff --git a/Areas/upv/classes/empresario/07a-Price-Elasticity.md b/Areas/upv/classes/empresario/07a-Price-Elasticity.md new file mode 100644 index 0000000..ee0174c --- /dev/null +++ b/Areas/upv/classes/empresario/07a-Price-Elasticity.md @@ -0,0 +1,83 @@ +# Price Elasticity + +We can calculate how our projected profits change when increasing or decreasing the price of our product. + +$|E_d| = \frac{\Delta Q(\%)}{\Delta p(\%)}$ + +If $E_d > 1$ the price is **elastic**, when $E_d < 1$ the price is **inelastic** and when $E_d = 1$ the price is **unitary**. + +If we break the formula down, it is basically % Change in Quantity / % Change in price. + + + +**Example:** + +You sell 10.000 reams of paper at 100€/ream, you raise the price to 150€/ream and sell 7.000 reams. + +The Price Elasticity is now $\displaystyle \frac{\frac{QN-QI}{(QN+QI)/2}}{\frac{PN-PI}{(PN+PI)/2}}$ + +$QN$= old Quantity +$QI$= new Quantity +$PN$= old Price +$PI$= new Price + +So when we replace the variables with our numbers we get: + +$\displaystyle E_d = \frac{\frac{10000-7000}{(10000+7000)/2}}{\frac{100-150}{(100+150)/2}}$ + +$\displaystyle E_d \approx −0.88$ + +This means the price is inelastic. Meaning changes in price result in small changes to demand. + + +**Moar Examples:** + +At a price of € 4 the quantity demanded of a particular good is +100 units. + +1. Calculate the value of the price elasticity. +2. Explain what type of demand. +3. Plot the elasticity of demand + +In each case: + +a) If the price increases to 5 € and quantity demanded decreases to 90 units. +b) If the price increases to 5 € and quantity demanded decreases to 50 units. +c) If the price increases to 5 € and quantity demanded decreases to 75 units. +d) If the price increases to 5 € and quantity demanded remains unchanged. +e) If the price stays the same and the quantity demanded increases by 10 units. + +$\displaystyle a = \frac{\frac{100-90}{(100+90)/2}}{\frac{4-5}{(4+5)/2}} \approx -0.47$ + +→ **Inelastic** + +$\displaystyle b = \frac{\frac{100-50}{(100+50)/2}}{\frac{4-5}{(4+5)/2}} = -3$ + +→ **Elastic** + +$\displaystyle c = \frac{\frac{100-75}{(100+75)/2}}{\frac{4-5}{(4+5)/2}} \approx -1.28$ + +→ **Elastic** + +$\displaystyle d = 0$ + +→ **Perfectly Inelastic** + + +$\displaystyle e = \frac{(100-110)/((100+110)/2)}{(4-4)/((4+4)/2)} = -\frac{2}{0} = Infinity$ + +→ **Perfectly Elastic** + + +**Example 3:** + +ppu = 30 +quantity = 300 + +new ppu = 45 +new quantity = 225 + +$\displaystyle E_d = \frac{(300-225)/((300+225)/2)}{(30-45)/((30+45)/2)} \approx |-0.71|$ + +→ **Inelastic** + diff --git a/Areas/upv/classes/empresario/08-Marketing-Mix.md b/Areas/upv/classes/empresario/08-Marketing-Mix.md new file mode 100644 index 0000000..0746495 --- /dev/null +++ b/Areas/upv/classes/empresario/08-Marketing-Mix.md @@ -0,0 +1,126 @@ +# Marketing Mix + +## 01 Operational Marketing + +**What is Operational Marketing?** +Its mission is to create and execute a marketing plan according to the business strategy. + +1. Establish detailed business goals +2. With the help of the marketing mix create action that achieve those goals +3. Prepare the budget for those actions +4. Execute the planned actions +5. Check the correct execution of the marketing plan + +## 02 Marketing Mix + +**What is Marketing Mix?** +Combination of elements on which decisions must be made to define Marketing actions necessary to achieve the stated goals. + +![[08-Marketing-Mix 2022-05-26 21.16.44.excalidraw]] + +## 03 Product + +Groups of attributes of a product that benefit the consumer by satisfying his needs. + +- Quality +- Aspects +- Options +- Style +- Brand +- Packing +- Sizes +- Services +- Guarantees +- Utilities + +Do not offer me things, offer me ideas, emotions, feelings and advantages. + +![[08-Marketing-Mix 2022-05-26 21.22.59.excalidraw]] + +### Product Lifecycle + +→ Introduction +- Slow evaluation of sales +- Uncertainty, acceptance, competitors reactions +- High costs +- Few accessories and variation +- High retail Price +- Few selected wholesalers + +→ Growth +- Sales increase significantly +- competitors reactions +- Improve product +- Segment the market +- Establish adequate price policy +- Communication: differentiate + +→ Maturity +- Sales plateau +- Growth by replacement or vegetative +- Differentiate the product and communicate in order to: + - Justify higher price + - attract new client + - take clients from competitors + - achieve more frequent use + - intensify price competition + - reduce costs + +→ Decline +- significant decrease in sales +- low prices +- competitors take off +- get rid of stocks +- stand in the last position + +## 04 Price + +**What is Price?** +Monetary expression of the products value. + +- What is the value of the goods or services for the buyer. +- What are the prices of similar goods or services. +- Is the buyer sensitive to price +- What discounts should be offered. +- How is your price compared to the price of your competition. + +→ Price List +→ Discounts +→ Grant + +**How to decide a price?** + +Based on competition +Based on break even point +Based on margins + +**Pricing Strategies** +- Differential Strategy → Exploit the heterogeneity of consumers +- Fixed Price +- Quantity Discounts +- Cash Discounts +- Deferral of the payment +- Random discounts +- Newspaper Discounts + +## 05 Promotion + +**→ AIDA** + +1. Personal Sales +2. Sales Promotion +3. Public Relations +4. Direct Marketing + +## 06 Place + +- Where do our clients find our product +- What kinf of store are we going for +- How I can access the mai distribution channels +- Do I need to use an own sales team + +## 07 Trends: Extended Marketing (+3P's) + +- Process → How will we do it? +- Physical Evidence / Presentation → How will we present it? +- People → Staff? \ No newline at end of file diff --git a/Areas/upv/classes/empresario/cards.md b/Areas/upv/classes/empresario/cards.md new file mode 100644 index 0000000..8126757 --- /dev/null +++ b/Areas/upv/classes/empresario/cards.md @@ -0,0 +1,18 @@ +--- +cards-deck: upv::classes::empresario +--- + +# Empresario #card + +## Price Elasticity Formula #card + +$\displaystyle E_d = |\frac{(QN-QI)/((QN+QI)/2)}{(PN-PI)/((PN-PI)/2)}|$ +^1654441616550 + +## Price Elasticity Ranges #card + +$E_d = \infty$ → **Perfectly Elastic** +$E_d > 1$ → **Elastic** +$E_d < 1$ → **Inelastic** +$E_d = 0$ → **Perfectly Inelastic** +^1654442925625 diff --git a/Areas/upv/classes/empresario/docs-english/Annex Unit 8-Elasticity of the demand.pdf b/Areas/upv/classes/empresario/docs-english/Annex Unit 8-Elasticity of the demand.pdf new file mode 100644 index 0000000..f24795c Binary files /dev/null and b/Areas/upv/classes/empresario/docs-english/Annex Unit 8-Elasticity of the demand.pdf differ diff --git a/Areas/upv/classes/empresario/docs-english/Annex Unit 8-Price strategies.pdf b/Areas/upv/classes/empresario/docs-english/Annex Unit 8-Price strategies.pdf new file mode 100644 index 0000000..f7e6f31 Binary files /dev/null and b/Areas/upv/classes/empresario/docs-english/Annex Unit 8-Price strategies.pdf differ diff --git a/Areas/upv/classes/empresario/docs-english/Annex-Lesson 1.pdf b/Areas/upv/classes/empresario/docs-english/Annex-Lesson 1.pdf new file mode 100644 index 0000000..f8dc9b5 Binary files /dev/null and b/Areas/upv/classes/empresario/docs-english/Annex-Lesson 1.pdf differ diff --git a/Areas/upv/classes/empresario/docs-english/Lesson 1 - Introduction to business.pdf b/Areas/upv/classes/empresario/docs-english/Lesson 1 - Introduction to business.pdf new file mode 100644 index 0000000..f992a40 Binary files /dev/null and b/Areas/upv/classes/empresario/docs-english/Lesson 1 - Introduction to business.pdf differ diff --git a/Areas/upv/classes/empresario/docs-english/Lesson 3-General concepts of management.pdf b/Areas/upv/classes/empresario/docs-english/Lesson 3-General concepts of management.pdf new file mode 100644 index 0000000..8d745a0 Binary files /dev/null and b/Areas/upv/classes/empresario/docs-english/Lesson 3-General concepts of management.pdf differ diff --git a/Areas/upv/classes/empresario/docs-english/Lesson 4-Planning and Control.pdf b/Areas/upv/classes/empresario/docs-english/Lesson 4-Planning and Control.pdf new file mode 100644 index 0000000..632527b Binary files /dev/null and b/Areas/upv/classes/empresario/docs-english/Lesson 4-Planning and Control.pdf differ diff --git a/Areas/upv/classes/empresario/docs-english/Unit 2-The economic environment of the business.pdf b/Areas/upv/classes/empresario/docs-english/Unit 2-The economic environment of the business.pdf new file mode 100644 index 0000000..9424bf4 Binary files /dev/null and b/Areas/upv/classes/empresario/docs-english/Unit 2-The economic environment of the business.pdf differ diff --git a/Areas/upv/classes/empresario/docs-english/Unit 5 - Organization.pdf b/Areas/upv/classes/empresario/docs-english/Unit 5 - Organization.pdf new file mode 100644 index 0000000..ecfcbab Binary files /dev/null and b/Areas/upv/classes/empresario/docs-english/Unit 5 - Organization.pdf differ diff --git a/Areas/upv/classes/empresario/docs-english/Unit 6-Management.pdf b/Areas/upv/classes/empresario/docs-english/Unit 6-Management.pdf new file mode 100644 index 0000000..182de11 Binary files /dev/null and b/Areas/upv/classes/empresario/docs-english/Unit 6-Management.pdf differ diff --git a/Areas/upv/classes/empresario/docs-english/Unit 7-Marketing Basics.pdf b/Areas/upv/classes/empresario/docs-english/Unit 7-Marketing Basics.pdf new file mode 100644 index 0000000..24e22be Binary files /dev/null and b/Areas/upv/classes/empresario/docs-english/Unit 7-Marketing Basics.pdf differ diff --git a/Areas/upv/classes/empresario/docs-english/Unit 8-Variables of the marketing-mix.pdf b/Areas/upv/classes/empresario/docs-english/Unit 8-Variables of the marketing-mix.pdf new file mode 100644 index 0000000..5cb04bd Binary files /dev/null and b/Areas/upv/classes/empresario/docs-english/Unit 8-Variables of the marketing-mix.pdf differ diff --git a/Areas/upv/classes/empresario/docs/Empresa_T8-Elasticidad_ejercicios.pdf b/Areas/upv/classes/empresario/docs/Empresa_T8-Elasticidad_ejercicios.pdf new file mode 100644 index 0000000..69381d8 Binary files /dev/null and b/Areas/upv/classes/empresario/docs/Empresa_T8-Elasticidad_ejercicios.pdf differ diff --git a/Areas/upv/classes/empresario/docs/T7-Fundamentos_del_marketing.pdf b/Areas/upv/classes/empresario/docs/T7-Fundamentos_del_marketing.pdf new file mode 100644 index 0000000..6b741ae Binary files /dev/null and b/Areas/upv/classes/empresario/docs/T7-Fundamentos_del_marketing.pdf differ diff --git a/Areas/upv/classes/empresario/docs/T8-Variables_del_marketing-mix.pdf b/Areas/upv/classes/empresario/docs/T8-Variables_del_marketing-mix.pdf new file mode 100644 index 0000000..4b73dbc Binary files /dev/null and b/Areas/upv/classes/empresario/docs/T8-Variables_del_marketing-mix.pdf differ diff --git a/Areas/upv/classes/empresario/index.md b/Areas/upv/classes/empresario/index.md index 8e7442e..88f7902 100644 --- a/Areas/upv/classes/empresario/index.md +++ b/Areas/upv/classes/empresario/index.md @@ -63,3 +63,26 @@ - [x] Liderazgo *Leadership* - [x] Motivación *Motivation* - [x] Comunicación *Communication* + +## T7 Marketing Fundamentals + +[[T7-Fundamentos_del_marketing.pdf|PDF]] + +- [x] Definir el mercado potencial en el que competir *Define the potential market in which to compete* +- [x] Segmentar el mercado potencial *Segment the potential market* +- [x] Cuantificar la demanda y su evolucion *Quantify demand and its evolution* +- [x] Analizar la competencia *Analyze the competetion* +- [x] Seleccionar el/los semento/s objetivo *Select the target segment(s)* +- [x] Posicionarse en el segmento/mercado *Position yourself in the market segment(s)* + +## T8 Marketing Mix + +[[T8-Variables_del_marketing-mix.pdf|PDF]] + +- [ ] Marketing Operacional *Operational Marketing* +- [ ] Marketing Mix 4P's +- [ ] Producto *Product* +- [ ] Precio *Price* +- [ ] Promocion *Promotion* +- [ ] Plaza o Distribucion *Place/Distribution* +- [ ] Tendencias: Marketing extendido *Trends, extended marketing* diff --git a/Areas/upv/classes/ingles-especialidad/01-class.md b/Areas/upv/classes/ingles-especialidad/classes/01-class.md similarity index 78% rename from Areas/upv/classes/ingles-especialidad/01-class.md rename to Areas/upv/classes/ingles-especialidad/classes/01-class.md index 1411810..ce9fb92 100644 --- a/Areas/upv/classes/ingles-especialidad/01-class.md +++ b/Areas/upv/classes/ingles-especialidad/classes/01-class.md @@ -26,11 +26,11 @@ On the plates are broccoli and some sort of grilled cheese. The televsion show i **Task 7.** -Guiselle wants to run a own restuaruon +Guiselle wants to run a own restaurant. -Jared wants to made his name by the age 22 +Jared wants to make his name by the age 22 -Maise wants to have a chain of restaurants by the time shes 22. +Maise wants to have a chain of restaurants by the time she's 22. **Task 8.** @@ -41,16 +41,16 @@ And what will you have learned by then do you think? Hopefully I'll be making enough to be a judge on junior chef one time. -Where do you think you'll be in ten years time. +Where do you think you'll be in ten years time? -Somebody will be going home at the end of today's show, but its not going to be me. +Somebody will be going home at the end of today's show, but it's not going to be me. **Task 9. Elision** Are you going to make it to the final -> Are you gonna make it to the final -Its a kind of raioli with seafood +Its a kind of ravioli with seafood -> Its a kinda ravioli with seafood I want to be famous @@ -65,10 +65,10 @@ I do a lot of pasta dishes at home 2. What will you have achieved at the end of this course. -3. Will you be working by this time next year. +3. Will you be working by this time next year? -4. What will you be doing this weekend. -4. What you gonna do this weekend. +4. What will you be doing this weekend? +4. What you gonna do this weekend? 5. Are you going to use English in the future? diff --git a/Areas/upv/classes/ingles-especialidad/02-class.md b/Areas/upv/classes/ingles-especialidad/classes/02-class.md similarity index 100% rename from Areas/upv/classes/ingles-especialidad/02-class.md rename to Areas/upv/classes/ingles-especialidad/classes/02-class.md diff --git a/Areas/upv/classes/ingles-especialidad/03-class.md b/Areas/upv/classes/ingles-especialidad/classes/03-class.md similarity index 100% rename from Areas/upv/classes/ingles-especialidad/03-class.md rename to Areas/upv/classes/ingles-especialidad/classes/03-class.md diff --git a/Areas/upv/classes/ingles-especialidad/04-class.md b/Areas/upv/classes/ingles-especialidad/classes/04-class.md similarity index 100% rename from Areas/upv/classes/ingles-especialidad/04-class.md rename to Areas/upv/classes/ingles-especialidad/classes/04-class.md diff --git a/Areas/upv/classes/ingles-especialidad/05-class.md b/Areas/upv/classes/ingles-especialidad/classes/05-class.md similarity index 100% rename from Areas/upv/classes/ingles-especialidad/05-class.md rename to Areas/upv/classes/ingles-especialidad/classes/05-class.md diff --git a/Areas/upv/classes/ingles-especialidad/06-class.md b/Areas/upv/classes/ingles-especialidad/classes/06-class.md similarity index 100% rename from Areas/upv/classes/ingles-especialidad/06-class.md rename to Areas/upv/classes/ingles-especialidad/classes/06-class.md diff --git a/Areas/upv/classes/ingles-especialidad/07-class.md b/Areas/upv/classes/ingles-especialidad/classes/07-class.md similarity index 100% rename from Areas/upv/classes/ingles-especialidad/07-class.md rename to Areas/upv/classes/ingles-especialidad/classes/07-class.md diff --git a/Areas/upv/classes/ingles-especialidad/classes/08-class.md b/Areas/upv/classes/ingles-especialidad/classes/08-class.md new file mode 100644 index 0000000..742127b --- /dev/null +++ b/Areas/upv/classes/ingles-especialidad/classes/08-class.md @@ -0,0 +1,3 @@ +# Class 08 + + diff --git a/Areas/upv/classes/ingles-especialidad/classes/09-class.md b/Areas/upv/classes/ingles-especialidad/classes/09-class.md new file mode 100644 index 0000000..39f4e44 --- /dev/null +++ b/Areas/upv/classes/ingles-especialidad/classes/09-class.md @@ -0,0 +1,63 @@ +# Class 09 + +Reduced Relative Causes + +Reduced relative clauses never include relative pronouns. +We form a reduced relative clause by replacing the relative pronoun and using an -ing form or past participle. + + +→ We use -ing, when the relative clause is in the active form. + Visitors arriving by car can park for free. (who arrive/who are arriving) + +→ We use a past participle when the relative clause is in the passive form + Some of the adverts shown on TV are terrible (which are shown) + +! We can only use the reduced relative clause when the relative pronoun would + +## 9 + +**Exercise 4** +1. The ideas suggested by the new team were great. +2. Young Artists seeking an experience are welcome here. +3. The candidates interviewed yesterday were excellent. +4. Students enrolling in this course must be over eighteen. +5. Adverts, paid for in advance, get a discount. +6. Clients needing personal attention should make an appointment. +7. Customers paying a deposit are given priority. +8. The applications processed yesterday are on file. + +## 10 + +**Exercise 1** +1. phoned +2. were thinking +3. had gone wrong +4. hadn't had +5. would write +6. might request + +**Exercise 4** +1. were using +2. had decided +3. could deal with +4. was going to be +5. wouldn't bother +6. was +7. didn't mean +8. were +9. had +10. had been travelling +11. had tweeted + + +**Exercise 8a** + +1. + Noun +thank you for, i am writing with reference to + +2. +ing +we look forward to meeting +i am writing + +3. +verb clause +im pleased to say that, i am afraid that, don't hesitate to, diff --git a/Areas/upv/classes/ingles-especialidad/conditionals.md b/Areas/upv/classes/ingles-especialidad/conditionals.md deleted file mode 100644 index 2dd3f86..0000000 --- a/Areas/upv/classes/ingles-especialidad/conditionals.md +++ /dev/null @@ -1,19 +0,0 @@ -# Zero Conditional - -When something is generally true. - -*If my room is dirty, i will clean it.* - -# First Conditional - -When something may happen in the future. - -# Second Conditional - -Impossible things in the present and unlikely things in the future. - -# Third Conditional - -Things that did not happen in the past and their imaginary results. - -# [Mixed Conditionals](https://www.englishpage.com/conditional/mixedconditional.html) diff --git a/Areas/upv/classes/ingles-especialidad/glossary.md b/Areas/upv/classes/ingles-especialidad/glossary.md index d53de93..a618ae3 100644 --- a/Areas/upv/classes/ingles-especialidad/glossary.md +++ b/Areas/upv/classes/ingles-especialidad/glossary.md @@ -1,6 +1,6 @@ # Extreme Adjectives *Example:* -apalling, terrible, awfull, useless +appalling, terrible, awful, useless We cannot use certain modifiers with extreme adjectives. diff --git a/Areas/upv/classes/ingles-especialidad/passive-voice.md b/Areas/upv/classes/ingles-especialidad/passive-voice.md deleted file mode 100644 index 8b717ef..0000000 --- a/Areas/upv/classes/ingles-especialidad/passive-voice.md +++ /dev/null @@ -1,32 +0,0 @@ -# Passive Voice - -# Use - -We use the pasive to focus on what happend the action or process which takes place. Information about the agent (who or what does the ation) doesnt need to appear in the sentence. The passive is often used in formal writing contexts such as academic, business or legal texts and also when describing processes which consist of a series of stages. The choice between the use of the passive or active form of a verb depends on whether we want to emphasize the action (passive) or the agent (active). - -# How - -We form the passive with the verb be+ the past particible of the main verb. We can use the verb be i all tenses and with modal verbs, although the present perfect continous and past perfect continuous form of the passive are not used very often. - -We us be in the negative and question form to make negative passibel sentences. - -## Tenses - -### Past Simple -**examples** - -### Past Continous -**example** -_Were_ the subjects in the trial _being monitored_ during the trial - -### Present Perfect -**example:** -Several market research surveys _have been carried out_ so far. - -## Modals -When _will_ the app _be launched_. -The media _cant be told_ until next week. -Existing needs _must be_ clearly _identified_. -Results _should be reviewed_ by peers in academic settings. - - diff --git a/Areas/upv/classes/ingles-especialidad/07-email.md b/Areas/upv/classes/ingles-especialidad/tasks/07-email.md similarity index 100% rename from Areas/upv/classes/ingles-especialidad/07-email.md rename to Areas/upv/classes/ingles-especialidad/tasks/07-email.md diff --git a/Areas/upv/classes/ingles-especialidad/task-product-review.md b/Areas/upv/classes/ingles-especialidad/tasks/task-product-review.md similarity index 100% rename from Areas/upv/classes/ingles-especialidad/task-product-review.md rename to Areas/upv/classes/ingles-especialidad/tasks/task-product-review.md diff --git a/Areas/upv/classes/ingles-especialidad/tenses.md b/Areas/upv/classes/ingles-especialidad/tenses.md deleted file mode 100644 index de6be68..0000000 --- a/Areas/upv/classes/ingles-especialidad/tenses.md +++ /dev/null @@ -1,37 +0,0 @@ -# Future Simple - -Something that has not happened yet. - -## Example: -I will go to the bathroom. - -## Formula: - -will + [root form of verb] - -**or:** - -[am/is/are] + going to + [root form of verb] - -**negative** - -will **not** + [root form of verb] - -**or:** - -[am/is/are] + **not** going to + [root form of verb] - - -# Future Perfect - -Something that will have happened before a certain point in time. - -## Example: - -You will have cleaned your room by tomorrow. - -## Formula: - -will + have + [past participle] - - diff --git a/Areas/upv/classes/ingles-especialidad/topics/conditionals.md b/Areas/upv/classes/ingles-especialidad/topics/conditionals.md new file mode 100644 index 0000000..4617e20 --- /dev/null +++ b/Areas/upv/classes/ingles-especialidad/topics/conditionals.md @@ -0,0 +1,29 @@ +# Conditionals + +Conditional forms are used to imagine events in certain conditions. + +## Zero Conditional + +When something is generally true. + +*If my room is dirty, I clean it.* + +## First Conditional + +When something may happen in the future. + +*If the weather is good tomorrow, we will go to the beach.* + +## Second Conditional + +Impossible things in the present and unlikely things in the future. Or simply imaginary events. + +*If I had a lot of money, I would travel the world* + +## Third Conditional + +Things that did not happen in the past and their imaginary results. + +*If I hadn't gone to Valencia, I would not have met all this nice people* + +## [Mixed Conditionals](https://www.englishpage.com/conditional/mixedconditional.html) diff --git a/Areas/upv/classes/ingles-especialidad/topics/direct_indirect_speech.md b/Areas/upv/classes/ingles-especialidad/topics/direct_indirect_speech.md new file mode 100644 index 0000000..cb410a1 --- /dev/null +++ b/Areas/upv/classes/ingles-especialidad/topics/direct_indirect_speech.md @@ -0,0 +1,12 @@ +# Adjective Changes + +*Direct Speech* | Reported Speech + +**Example:** +Direct speech: Bill said, "I can't come in today, because I'm sick." +Indirect speech: Bill said (that) he can't come in today because he's sick. + +My → His/Her +Your → singular(his/her) / plural(their) +His → His +Her → Her diff --git a/Areas/upv/classes/ingles-especialidad/topics/passive-voice.md b/Areas/upv/classes/ingles-especialidad/topics/passive-voice.md new file mode 100644 index 0000000..32e64d1 --- /dev/null +++ b/Areas/upv/classes/ingles-especialidad/topics/passive-voice.md @@ -0,0 +1,32 @@ +# Passive Voice + +# Use + +We use the passive to focus on what happened the action or process which takes place. Information about the agent (who or what does the ation) doesnt need to appear in the sentence. The passive is often used in formal writing contexts such as academic, business or legal texts and also when describing processes which consist of a series of stages. The choice between the use of the passive or active form of a verb depends on whether we want to emphasize the action (passive) or the agent (active). + +# How + +We form the passive with the verb be+ the past participle of the main verb. We can use the verb be i all tenses and with modal verbs, although the present perfect continous and past perfect continuous form of the passive are not used very often. + +Furthermore, we us be in the negative and question form to make negative passibel sentences. + +## Tenses + +### Past Simple +**examples** + +### Past Continuous +**example** +_Were_ the subjects in the trial _being monitored_ during the trial + +### Present Perfect +**example:** +Several market research surveys _have been carried out_ so far. + +## Modals +When _will_ the app _be launched_. +The media _can't be told_ until next week. +Existing needs _must be_ clearly _identified_. +Results _should be reviewed_ by peers in academic settings. + + diff --git a/Areas/upv/classes/ingles-especialidad/topics/relative_clauses.md b/Areas/upv/classes/ingles-especialidad/topics/relative_clauses.md new file mode 100644 index 0000000..5d4773c --- /dev/null +++ b/Areas/upv/classes/ingles-especialidad/topics/relative_clauses.md @@ -0,0 +1,16 @@ +# Relative Clauses + +Relative clauses are used to modify the object or subject of a sentence to add more information. + +**Example:** +She is the woman *who he met at the party* last week. + + +# Reduced Relative Clause + +In a reduced relative clause the relative clause of a sentence is shorted. This can only be applied to the subject of the sentence. + +**Example:** + +The man who works at Costco lives in Seattle. +→ The man working at Costco lives in Seattle. diff --git a/Areas/upv/classes/ingles-especialidad/topics/tenses.md b/Areas/upv/classes/ingles-especialidad/topics/tenses.md new file mode 100644 index 0000000..24f2c3a --- /dev/null +++ b/Areas/upv/classes/ingles-especialidad/topics/tenses.md @@ -0,0 +1,62 @@ +# Simple Present +Things that happen every day. + +**Example:** +He usually goes for a walk every afternoon. + + + +# Simple Past +Something that happened in the past. + +**Example:** +I ate a sandwich yesterday. + + +# Present Perfect +Something that began in the past and continuous to the present. + +**Example:** +I have been in Valencia for four months. + +# Past Perfect +Something that happened before something else. + +**Example:** +I travelled through france before arriving in Valencia. + +# Simple Future +Something that has not happened yet. + +**Example:** +I will go to the bathroom. + +## Formula: + +will + [root form of verb] + +**or:** + +[am/is/are] + going to + [root form of verb] + +**negative** + +will **not** + [root form of verb] + +**or:** + +[am/is/are] + **not** going to + [root form of verb] + + +# Future Perfect +Something that will have happened before a certain point in time. + +## Example: + +You will have cleaned your room by tomorrow. + +## Formula: + +will + have + [past participle] + + diff --git a/Areas/upv/classes/models-innovation/NomadSpace-svg.jpg b/Areas/upv/classes/models-innovation/NomadSpace-svg.jpg new file mode 100644 index 0000000..8e59646 Binary files /dev/null and b/Areas/upv/classes/models-innovation/NomadSpace-svg.jpg differ diff --git a/Areas/upv/classes/models-innovation/ReferenceModel.blend b/Areas/upv/classes/models-innovation/ReferenceModel.blend new file mode 100644 index 0000000..fda1f84 Binary files /dev/null and b/Areas/upv/classes/models-innovation/ReferenceModel.blend differ diff --git a/Areas/upv/classes/models-innovation/ReferenceModel.blend1 b/Areas/upv/classes/models-innovation/ReferenceModel.blend1 new file mode 100644 index 0000000..f4156e7 Binary files /dev/null and b/Areas/upv/classes/models-innovation/ReferenceModel.blend1 differ diff --git a/Areas/upv/classes/models-innovation/article.md b/Areas/upv/classes/models-innovation/article.md new file mode 100644 index 0000000..8572c72 --- /dev/null +++ b/Areas/upv/classes/models-innovation/article.md @@ -0,0 +1,45 @@ +# State of the Art + +The niche we develop NomadSpace in is not new, when you search amazon for "mobile car organizer" there are hundreds of products trying to solve the same problems as we do. There is one thing a lot of these solutions have in common, there are either lacking in design and aesthetics, or are very bulky and expensive. + +In the following section we examine some examples closer. Note that we tried to choose products which represent the existing landscape. + +## Car Backseat Organizer + +The Car Backseat organizer attaches to the back of any car seat, providing organized storage and a way to hold cups and tablets. + +***Materials*** + +The main body of the product is made from artificial leather with some parts made from different types of fabrics. + +***Positives*** + +***Negatives*** + +## GripMaster Passenger Seat Table + +The GripMaster is a table with storage, as well as a charger and smartphone holder. It attaches to the passenger seat of the car. + +***Materials*** +The main body of the organizer is made of some sort of plastics. There are some decorative wood elements made from different types of wood. The top is made from a type of anti-slip surface. + +***Positives*** +The products seems to have a good build quality, a lot of reviews mention its sturdiness. It also provides a lot of space and opportunities of organizing things. + +***Negatives*** +For around 500$ the GripMaster is the most expensive item on our list of items. Due to its design, it is only usable while attached to the passenger seat, so you are not able to use it in any other situation. + +## Multifunction Steering Wheel Table + +The Multifunction Steering Wheel Table is a foldable and expandable table which connects to the steering wheel of a car. + +***Materials*** + +***Positives*** + +***Negatives*** + +# Review Analysis + +While manually reading and analyzing Amazon reviews, we had the idea to automate the process of this task. + diff --git a/Areas/upv/classes/models-innovation/render/car1.png b/Areas/upv/classes/models-innovation/render/car1.png new file mode 100644 index 0000000..75c7952 Binary files /dev/null and b/Areas/upv/classes/models-innovation/render/car1.png differ diff --git a/Areas/upv/classes/models-innovation/render/car2.png b/Areas/upv/classes/models-innovation/render/car2.png new file mode 100644 index 0000000..b15ff8d Binary files /dev/null and b/Areas/upv/classes/models-innovation/render/car2.png differ diff --git a/Areas/upv/classes/models-innovation/render/closeup1.png b/Areas/upv/classes/models-innovation/render/closeup1.png new file mode 100644 index 0000000..d9cc1e7 Binary files /dev/null and b/Areas/upv/classes/models-innovation/render/closeup1.png differ diff --git a/Areas/upv/classes/models-innovation/render/closeup2.png b/Areas/upv/classes/models-innovation/render/closeup2.png new file mode 100644 index 0000000..4c4de68 Binary files /dev/null and b/Areas/upv/classes/models-innovation/render/closeup2.png differ diff --git a/Areas/upv/classes/models-innovation/render/closeup3.png b/Areas/upv/classes/models-innovation/render/closeup3.png new file mode 100644 index 0000000..4aaaf4c Binary files /dev/null and b/Areas/upv/classes/models-innovation/render/closeup3.png differ diff --git a/Areas/upv/classes/models-innovation/render/closeup4.png b/Areas/upv/classes/models-innovation/render/closeup4.png new file mode 100644 index 0000000..f20e014 Binary files /dev/null and b/Areas/upv/classes/models-innovation/render/closeup4.png differ diff --git a/Areas/upv/classes/models-innovation/render/closeup5.png b/Areas/upv/classes/models-innovation/render/closeup5.png new file mode 100644 index 0000000..76551f1 Binary files /dev/null and b/Areas/upv/classes/models-innovation/render/closeup5.png differ diff --git a/Areas/upv/classes/models-innovation/render/dude1.png b/Areas/upv/classes/models-innovation/render/dude1.png new file mode 100644 index 0000000..c8c890c Binary files /dev/null and b/Areas/upv/classes/models-innovation/render/dude1.png differ diff --git a/Areas/upv/classes/models-innovation/render/dude2.png b/Areas/upv/classes/models-innovation/render/dude2.png new file mode 100644 index 0000000..f7d289f Binary files /dev/null and b/Areas/upv/classes/models-innovation/render/dude2.png differ diff --git a/Areas/upv/classes/models-innovation/render/girl1.png b/Areas/upv/classes/models-innovation/render/girl1.png new file mode 100644 index 0000000..a40057b Binary files /dev/null and b/Areas/upv/classes/models-innovation/render/girl1.png differ diff --git a/Areas/upv/classes/models-innovation/render/scene1.png b/Areas/upv/classes/models-innovation/render/scene1.png new file mode 100644 index 0000000..a1b122f Binary files /dev/null and b/Areas/upv/classes/models-innovation/render/scene1.png differ diff --git a/Areas/upv/classes/models-innovation/render/turntable-macbook0002-0200.mp4 b/Areas/upv/classes/models-innovation/render/turntable-macbook0002-0200.mp4 new file mode 100644 index 0000000..d7078a9 Binary files /dev/null and b/Areas/upv/classes/models-innovation/render/turntable-macbook0002-0200.mp4 differ diff --git a/Areas/upv/classes/models-innovation/render/turntable-macbook20002-0200.mp4 b/Areas/upv/classes/models-innovation/render/turntable-macbook20002-0200.mp4 new file mode 100644 index 0000000..d099dcc Binary files /dev/null and b/Areas/upv/classes/models-innovation/render/turntable-macbook20002-0200.mp4 differ diff --git a/Areas/upv/classes/models-innovation/untitled.png b/Areas/upv/classes/models-innovation/untitled.png new file mode 100644 index 0000000..9c69f27 Binary files /dev/null and b/Areas/upv/classes/models-innovation/untitled.png differ diff --git a/Media/index.md b/Media/index.md new file mode 100644 index 0000000..975a027 --- /dev/null +++ b/Media/index.md @@ -0,0 +1,10 @@ +# Movies + +```dataview +table without id + file.link as Title, + status, + rating +from #movie +sort rating desc +``` \ No newline at end of file diff --git a/Media/movies/Her.md b/Media/movies/Her.md new file mode 100644 index 0000000..a4fc767 --- /dev/null +++ b/Media/movies/Her.md @@ -0,0 +1,7 @@ +--- +status: seen +year: 2019 +rating: 4 +--- +#movie +# Her \ No newline at end of file diff --git a/Media/movies/Roma.md b/Media/movies/Roma.md new file mode 100644 index 0000000..d385105 --- /dev/null +++ b/Media/movies/Roma.md @@ -0,0 +1,8 @@ +--- +status: open +year: 2018 +--- +#movie + +# Roma + diff --git a/Notes/habits.md b/Notes/habits.md new file mode 100644 index 0000000..f38e63c --- /dev/null +++ b/Notes/habits.md @@ -0,0 +1,7 @@ +| Date | 🍔 | 🧘🏽‍♀ | 😴 < 24:00 | 😁 M | 😁 A | P | 🧹 B | M | Activity | | +| ---------------- | ---------------- | ---------------- | ---------------- | ---------------- | ---------------- | ---------------- | ---------------- | ---------------- | ---------------- | --------------- | +| date | checkbox | checkbox | checkbox | checkbox | checkbox | checkbox | checkbox | tag | text | | +| column-id-qcj0h2 | column-id-u71xk7 | column-id-8vvnd9 | column-id-d2vi07 | column-id-tzbvo7 | column-id-bfpd2m | column-id-i881g7 | column-id-3yswet | column-id-jz5d5o | column-id-6dmpz6 | table-id-egtps1 | +| 2022/06/05 | [x] | [ ] | [ ] | [ ] | [ ] | [ ] | [ ] | ⭐ | | row-id-1i81jq | +| | [ ] | [ ] | [ ] | [ ] | [ ] | [ ] | [ ] | ⭐⭐ | | row-id-l3t3fi | + diff --git a/Notes/index1.md b/Notes/index1.md deleted file mode 100644 index e22b846..0000000 --- a/Notes/index1.md +++ /dev/null @@ -1 +0,0 @@ -# This is a new Node diff --git a/Notes/test.md b/Notes/test.md deleted file mode 100644 index af2f7f4..0000000 --- a/Notes/test.md +++ /dev/null @@ -1,9 +0,0 @@ -## Delete Me1 - -## Delete Me2 - -## Delete Me3 - -## Delete Me4 - -[SomeLink](../Ressources/dev/javascript.md#EasingFunctions) diff --git a/Notes/tododolo.md b/Notes/tododolo.md new file mode 100644 index 0000000..e1191bb --- /dev/null +++ b/Notes/tododolo.md @@ -0,0 +1,12 @@ +--- +type: todo +--- + +- [ ] 1 hour of electronics +- [ ] Sketching List of Plants +- [ ] Papa nen Bild von meiner Unterschrift schicken +- [x] Request Signature for Erasmus stuff +- [x] Heroku: Send email with details +- [x] Fill out the business model innovation stuff +- [x] Send the email to heroku to reset 2fa +- [x] Write Lena diff --git a/Projects/plantarium/index.md b/Projects/plantarium/index.md new file mode 100644 index 0000000..82ab07e --- /dev/null +++ b/Projects/plantarium/index.md @@ -0,0 +1,27 @@ +# Plantarium + +Hi :) + +This guide will help you understand how Node based Interfaces work in general, and how the Plantarium Nodesystem works. + +-> Lets get started. + +I like to think of Nodesystem as little factories connected by pipes. Each Node, or Factory gets some inputs, transforms them and outputs something new. + +-> Okay...?, Understood! + +Alright, who wants a coffee? + +-> Mee!, No thanks... + +Well then, what do we need to make a coffee? A coffee machine of course! + +You can create one by pressing [shift+a] and search for *machine*. + +We also need someone who can consume our coffee, lets add a human. + +Now its time to connect these two nodes. + +![[index 2022-05-16 08.43.59.excalidraw]] + + diff --git a/Resources/blender/addons.md b/Resources/blender/addons.md new file mode 100644 index 0000000..d89f77b --- /dev/null +++ b/Resources/blender/addons.md @@ -0,0 +1,3 @@ +# Google Maps Importers + +![MapsModelsImporter](https://github.com/eliemichel/MapsModelsImporter) diff --git a/Resources/blender/index.md b/Resources/blender/index.md new file mode 100644 index 0000000..e69de29 diff --git a/Resources/dev/neovim.md b/Resources/dev/neovim.md index 13bb955..3c30e01 100644 --- a/Resources/dev/neovim.md +++ b/Resources/dev/neovim.md @@ -24,3 +24,29 @@ viwS ```bash *ciw n.n.n.n.n ``` + +## Delete multiple Occurrences of the same selection + +```bash +# Enter Visual selection +# Select what you want to delete +dgn,dgn,dgn +``` + +## A tale of Buffers, Splits and Tabs + +**Buffers**, are proxies for files, e.g. save a buffer -> its content gets written to a file. +Multiple buffers can be open at the same time + +**Split** are a way to show multiple buffers at the same time. + +Split Horizontal `h` +Split Vertical `v` + +Resize splits with mouse is easiest + +**Tabs** + +Move to next Tab `gt` +Move to previous Tab `gT` +move to specific Tab `3gt` -> remapped to `3` diff --git a/Resources/electricity/active-components/op-amp.md b/Resources/electricity/active-components/op-amp.md index 51c9219..697ea63 100644 --- a/Resources/electricity/active-components/op-amp.md +++ b/Resources/electricity/active-components/op-amp.md @@ -5,15 +5,15 @@ The operational amplifier has a very high input impedance which makes it very go Basically the OpAmp is a function like this: -$\displaystyle Y = A_v (X_1 - X_2)$ +$\displaystyle V_o = A_v (V_1 - V_2)$ Where: $$ \begin{flalign} -&Y = \text{Output Voltage}&\\\ +&V_o = \text{Output Voltage}&\\\ &A_v = \text{Open Loop Gain}\\ -&X_1 = \text{Input V1 (Non Inverting Input)}\\ -&X_2 = \text{Input V2 (Inverting Input)}\\ +&V_1 = \text{Input V1 (Non Inverting Input)}\\ +&V_2 = \text{Input V2 (Inverting Input)}\\ \end{flalign} $$ # Rules @@ -35,7 +35,7 @@ This is how the Op-Amp normally functions. **Saturation Region** When the output of the op-amp would be higher than $+V_{CC}$ or lower than $-V_{CC}$ the output value is clamped to those values. -In real life OpAmps have $A_V$ values as high as $10^8$ or $10^9$ due to this even very small input voltages would quickly leave the linear region. That is why we need +In real life OpAmps have $A_V$ values as high as $10^8$ or $10^9$ due to this even very small input voltages would quickly leave the linear region. That is why we need: # Negative Feedback To use negative feedback we connect the output of the OpAmp to one of its inputs. This connection is modified by a *feedback factor* ($\beta$) which can be in the range $0 \le \beta \le 1$. diff --git a/Resources/electricity/assets/07-Marketing-Fundamentals 2022-05-26 20.46.58.excalidraw.md b/Resources/electricity/assets/07-Marketing-Fundamentals 2022-05-26 20.46.58.excalidraw.md new file mode 100644 index 0000000..85d1168 --- /dev/null +++ b/Resources/electricity/assets/07-Marketing-Fundamentals 2022-05-26 20.46.58.excalidraw.md @@ -0,0 +1,855 @@ +--- + +excalidraw-plugin: parsed +tags: [excalidraw] + +--- +==⚠ Switch to EXCALIDRAW VIEW in the MORE OPTIONS menu of this document. ⚠== + + +# Text Elements +Consumer Markets ^i8o1vZJn + +Types of Segmentation ^LwmvPyAt + +Company Markets ^g1AJe63D + +Segmentation Criteria ^ReuWLjte + +Which are the benefits? +Who is destined for? +How to purchase? ^u4vgPWZQ + +Who buys? +Why is it bought? +How is it bought? ^0iXSaI2o + +%% +# Drawing +```json +{ + "type": "excalidraw", + "version": 2, + "source": "https://excalidraw.com", + "elements": [ + { + "type": "rectangle", + "version": 195, + "versionNonce": 833300239, + "isDeleted": false, + "id": "p4MJY6ZIUBeTe8jJhE9Md", + "fillStyle": "hachure", + "strokeWidth": 1, + "strokeStyle": "solid", + "roughness": 2, + "opacity": 100, + "angle": 0, + "x": -98.66400146484375, + "y": -266.8048973083496, + "strokeColor": "#000000", + "backgroundColor": "#fab005", + "width": 289, + "height": 56, + "seed": 240195919, + "groupIds": [], + "strokeSharpness": "round", + "boundElements": [ + { + "id": "LwmvPyAt", + "type": "text" + }, + { + "id": "N-wn4KVaIBXuu6WVnwjmD", + "type": "arrow" + }, + { + "id": "68ZKMDOfYYj2W71FX7Y_5", + "type": "arrow" + } + ], + "updated": 1653591068321, + "link": null, + "locked": false + }, + { + "type": "text", + "version": 122, + "versionNonce": 738922241, + "isDeleted": false, + "id": "LwmvPyAt", + "fillStyle": "hachure", + "strokeWidth": 1, + "strokeStyle": "solid", + "roughness": 2, + "opacity": 100, + "angle": 0, + "x": -93.66400146484375, + "y": -251.3048973083496, + "strokeColor": "#000000", + "backgroundColor": "transparent", + "width": 279, + "height": 25, + "seed": 312416111, + "groupIds": [], + "strokeSharpness": "round", + "boundElements": [], + "updated": 1653591037471, + "link": null, + "locked": false, + "fontSize": 20.001838221650203, + "fontFamily": 1, + "text": "Types of Segmentation", + "rawText": "Types of Segmentation", + "baseline": 17, + "textAlign": "center", + "verticalAlign": "middle", + "containerId": "p4MJY6ZIUBeTe8jJhE9Md", + "originalText": "Types of Segmentation" + }, + { + "type": "rectangle", + "version": 280, + "versionNonce": 1552850159, + "isDeleted": false, + "id": "tEbHp-l1xy1cDWwoiGuzk", + "fillStyle": "hachure", + "strokeWidth": 1, + "strokeStyle": "solid", + "roughness": 2, + "opacity": 100, + "angle": 0, + "x": -366.75567626953125, + "y": -132.2135124206543, + "strokeColor": "#000000", + "backgroundColor": "#4c6ef5", + "width": 289, + "height": 56, + "seed": 905534113, + "groupIds": [], + "strokeSharpness": "round", + "boundElements": [ + { + "type": "text", + "id": "i8o1vZJn" + }, + { + "id": "N-wn4KVaIBXuu6WVnwjmD", + "type": "arrow" + }, + { + "id": "27hpJhXxtjOOG8Tg04Emz", + "type": "arrow" + } + ], + "updated": 1653591063660, + "link": null, + "locked": false + }, + { + "type": "text", + "version": 224, + "versionNonce": 273672687, + "isDeleted": false, + "id": "i8o1vZJn", + "fillStyle": "hachure", + "strokeWidth": 1, + "strokeStyle": "solid", + "roughness": 2, + "opacity": 100, + "angle": 0, + "x": -361.75567626953125, + "y": -116.7135124206543, + "strokeColor": "#000000", + "backgroundColor": "transparent", + "width": 279, + "height": 25, + "seed": 499592673, + "groupIds": [], + "strokeSharpness": "round", + "boundElements": [], + "updated": 1653591035819, + "link": null, + "locked": false, + "fontSize": 20.001838221650203, + "fontFamily": 1, + "text": "Consumer Markets", + "rawText": "Consumer Markets", + "baseline": 17, + "textAlign": "center", + "verticalAlign": "middle", + "containerId": "tEbHp-l1xy1cDWwoiGuzk", + "originalText": "Consumer Markets" + }, + { + "type": "arrow", + "version": 978, + "versionNonce": 322719201, + "isDeleted": false, + "id": "N-wn4KVaIBXuu6WVnwjmD", + "fillStyle": "hachure", + "strokeWidth": 1, + "strokeStyle": "solid", + "roughness": 2, + "opacity": 100, + "angle": 0, + "x": -110.5510146132427, + "y": -241.69834751573637, + "strokeColor": "#000000", + "backgroundColor": "transparent", + "width": 123.5602872597488, + "height": 99.91806263414458, + "seed": 2021616865, + "groupIds": [], + "strokeSharpness": "round", + "boundElements": [], + "updated": 1653591051862, + "link": null, + "locked": false, + "startBinding": { + "elementId": "p4MJY6ZIUBeTe8jJhE9Md", + "focus": 0.3082926736866069, + "gap": 11.88701314839895 + }, + "endBinding": { + "elementId": "tEbHp-l1xy1cDWwoiGuzk", + "gap": 9.5667724609375, + "focus": -0.07801516824946159 + }, + "lastCommittedPoint": null, + "startArrowhead": null, + "endArrowhead": "arrow", + "points": [ + [ + 0, + 0 + ], + [ + -117.61326150980415, + 6.035051769886763 + ], + [ + -123.5602872597488, + 99.91806263414458 + ] + ] + }, + { + "type": "rectangle", + "version": 317, + "versionNonce": 891506383, + "isDeleted": false, + "id": "zF2_XuWam70z4QvfvB2AE", + "fillStyle": "hachure", + "strokeWidth": 1, + "strokeStyle": "solid", + "roughness": 2, + "opacity": 100, + "angle": 0, + "x": 139.72463989257812, + "y": -119.88334274291992, + "strokeColor": "#000000", + "backgroundColor": "#fa5252", + "width": 289, + "height": 56, + "seed": 213331375, + "groupIds": [], + "strokeSharpness": "round", + "boundElements": [ + { + "id": "g1AJe63D", + "type": "text" + }, + { + "id": "N-wn4KVaIBXuu6WVnwjmD", + "type": "arrow" + }, + { + "id": "68ZKMDOfYYj2W71FX7Y_5", + "type": "arrow" + }, + { + "id": "caiB4AmfO_dME4Lx5Ou2r", + "type": "arrow" + } + ], + "updated": 1653591060151, + "link": null, + "locked": false + }, + { + "type": "text", + "version": 274, + "versionNonce": 302996143, + "isDeleted": false, + "id": "g1AJe63D", + "fillStyle": "hachure", + "strokeWidth": 1, + "strokeStyle": "solid", + "roughness": 2, + "opacity": 100, + "angle": 0, + "x": 144.72463989257812, + "y": -104.38334274291992, + "strokeColor": "#000000", + "backgroundColor": "transparent", + "width": 279, + "height": 25, + "seed": 534710465, + "groupIds": [], + "strokeSharpness": "round", + "boundElements": [], + "updated": 1653591033184, + "link": null, + "locked": false, + "fontSize": 20.001838221650203, + "fontFamily": 1, + "text": "Company Markets", + "rawText": "Company Markets", + "baseline": 17, + "textAlign": "center", + "verticalAlign": "middle", + "containerId": "zF2_XuWam70z4QvfvB2AE", + "originalText": "Company Markets" + }, + { + "type": "arrow", + "version": 596, + "versionNonce": 1963115233, + "isDeleted": false, + "id": "68ZKMDOfYYj2W71FX7Y_5", + "fillStyle": "hachure", + "strokeWidth": 1, + "strokeStyle": "solid", + "roughness": 2, + "opacity": 100, + "angle": 0, + "x": 202.03323364257812, + "y": -250.12975534939386, + "strokeColor": "#000000", + "backgroundColor": "transparent", + "width": 91.21182549295537, + "height": 124.10722193264581, + "seed": 839429583, + "groupIds": [], + "strokeSharpness": "round", + "boundElements": [], + "updated": 1653591043017, + "link": null, + "locked": false, + "startBinding": { + "elementId": "p4MJY6ZIUBeTe8jJhE9Md", + "gap": 11.697235107421875, + "focus": 0.08598939331367914 + }, + "endBinding": { + "elementId": "zF2_XuWam70z4QvfvB2AE", + "gap": 6.139190673828125, + "focus": 0.09668738327570867 + }, + "lastCommittedPoint": null, + "startArrowhead": null, + "endArrowhead": "arrow", + "points": [ + [ + 0, + 0 + ], + [ + 84.81500244140625, + 20.26455530666925 + ], + [ + 91.21182549295537, + 124.10722193264581 + ] + ] + }, + { + "type": "rectangle", + "version": 272, + "versionNonce": 441216239, + "isDeleted": false, + "id": "lMdQ65BiodtrMC_VNzINL", + "fillStyle": "hachure", + "strokeWidth": 1, + "strokeStyle": "solid", + "roughness": 2, + "opacity": 100, + "angle": 0, + "x": -127.40176391601562, + "y": -21.734783172607422, + "strokeColor": "#000000", + "backgroundColor": "transparent", + "width": 289, + "height": 56, + "seed": 1542893487, + "groupIds": [], + "strokeSharpness": "round", + "boundElements": [ + { + "id": "ReuWLjte", + "type": "text" + }, + { + "id": "N-wn4KVaIBXuu6WVnwjmD", + "type": "arrow" + }, + { + "id": "27hpJhXxtjOOG8Tg04Emz", + "type": "arrow" + }, + { + "id": "caiB4AmfO_dME4Lx5Ou2r", + "type": "arrow" + }, + { + "id": "hB6XYJ5pDV3fDwN_mi1sP", + "type": "arrow" + }, + { + "id": "AQjs9-2PESDH8ldYWF8zZ", + "type": "arrow" + } + ], + "updated": 1653591020535, + "link": null, + "locked": false + }, + { + "type": "text", + "version": 238, + "versionNonce": 1971110287, + "isDeleted": false, + "id": "ReuWLjte", + "fillStyle": "hachure", + "strokeWidth": 1, + "strokeStyle": "solid", + "roughness": 2, + "opacity": 100, + "angle": 0, + "x": -122.40176391601562, + "y": -6.234783172607422, + "strokeColor": "#000000", + "backgroundColor": "transparent", + "width": 279, + "height": 25, + "seed": 131114689, + "groupIds": [], + "strokeSharpness": "round", + "boundElements": [], + "updated": 1653590960452, + "link": null, + "locked": false, + "fontSize": 20.001838221650203, + "fontFamily": 1, + "text": "Segmentation Criteria", + "rawText": "Segmentation Criteria", + "baseline": 17, + "textAlign": "center", + "verticalAlign": "middle", + "containerId": "lMdQ65BiodtrMC_VNzINL", + "originalText": "Segmentation Criteria" + }, + { + "type": "arrow", + "version": 169, + "versionNonce": 1505416207, + "isDeleted": false, + "id": "27hpJhXxtjOOG8Tg04Emz", + "fillStyle": "hachure", + "strokeWidth": 1, + "strokeStyle": "solid", + "roughness": 2, + "opacity": 100, + "angle": 0, + "x": -227.9408784116559, + "y": -67.4419059753418, + "strokeColor": "#000000", + "backgroundColor": "transparent", + "width": 87.98638012064026, + "height": 76.69540405273436, + "seed": 514570159, + "groupIds": [], + "strokeSharpness": "round", + "boundElements": [], + "updated": 1653591035819, + "link": null, + "locked": false, + "startBinding": { + "elementId": "tEbHp-l1xy1cDWwoiGuzk", + "gap": 8.7716064453125, + "focus": 0.040473001311751716 + }, + "endBinding": { + "elementId": "lMdQ65BiodtrMC_VNzINL", + "gap": 12.552734375, + "focus": -0.3473555161258999 + }, + "lastCommittedPoint": null, + "startArrowhead": null, + "endArrowhead": "arrow", + "points": [ + [ + 0, + 0 + ], + [ + 0.3257966245465127, + 71.16827392578124 + ], + [ + 87.98638012064026, + 76.69540405273436 + ] + ] + }, + { + "type": "arrow", + "version": 119, + "versionNonce": 2077109455, + "isDeleted": false, + "id": "caiB4AmfO_dME4Lx5Ou2r", + "fillStyle": "hachure", + "strokeWidth": 1, + "strokeStyle": "solid", + "roughness": 2, + "opacity": 100, + "angle": 0, + "x": 279.520938519385, + "y": -55.1538200378418, + "strokeColor": "#000000", + "backgroundColor": "transparent", + "width": 111.71676981821312, + "height": 65.40933227539062, + "seed": 154301441, + "groupIds": [], + "strokeSharpness": "round", + "boundElements": [], + "updated": 1653591033184, + "link": null, + "locked": false, + "startBinding": { + "elementId": "zF2_XuWam70z4QvfvB2AE", + "gap": 8.729522705078125, + "focus": -0.000053216895866077014 + }, + "endBinding": { + "elementId": "lMdQ65BiodtrMC_VNzINL", + "gap": 6.2059326171875, + "focus": 0.5168995085003573 + }, + "lastCommittedPoint": null, + "startArrowhead": null, + "endArrowhead": "arrow", + "points": [ + [ + 0, + 0 + ], + [ + -6.529758099463152, + 50.90325927734375 + ], + [ + -111.71676981821312, + 65.40933227539062 + ] + ] + }, + { + "type": "rectangle", + "version": 429, + "versionNonce": 74022849, + "isDeleted": false, + "id": "YCX5IzhNBoMe_tPpmZhfj", + "fillStyle": "hachure", + "strokeWidth": 1, + "strokeStyle": "solid", + "roughness": 2, + "opacity": 100, + "angle": 0, + "x": -279.85890555381775, + "y": 137.47495079040527, + "strokeColor": "#000000", + "backgroundColor": "transparent", + "width": 264, + "height": 113, + "seed": 490113057, + "groupIds": [], + "strokeSharpness": "round", + "boundElements": [ + { + "id": "0iXSaI2o", + "type": "text" + }, + { + "id": "N-wn4KVaIBXuu6WVnwjmD", + "type": "arrow" + }, + { + "id": "27hpJhXxtjOOG8Tg04Emz", + "type": "arrow" + }, + { + "id": "caiB4AmfO_dME4Lx5Ou2r", + "type": "arrow" + }, + { + "type": "text", + "id": "0iXSaI2o" + }, + { + "id": "hB6XYJ5pDV3fDwN_mi1sP", + "type": "arrow" + } + ], + "updated": 1653591017006, + "link": null, + "locked": false + }, + { + "type": "text", + "version": 402, + "versionNonce": 641778159, + "isDeleted": false, + "id": "0iXSaI2o", + "fillStyle": "hachure", + "strokeWidth": 1, + "strokeStyle": "solid", + "roughness": 2, + "opacity": 100, + "angle": 0, + "x": -274.85890555381775, + "y": 156.47495079040527, + "strokeColor": "#000000", + "backgroundColor": "transparent", + "width": 254, + "height": 75, + "seed": 743627777, + "groupIds": [], + "strokeSharpness": "round", + "boundElements": [], + "updated": 1653591013104, + "link": null, + "locked": false, + "fontSize": 20.001838221650203, + "fontFamily": 1, + "text": "Who buys?\nWhy is it bought?\nHow is it bought?", + "rawText": "Who buys?\nWhy is it bought?\nHow is it bought?", + "baseline": 67, + "textAlign": "center", + "verticalAlign": "middle", + "containerId": "YCX5IzhNBoMe_tPpmZhfj", + "originalText": "Who buys?\nWhy is it bought?\nHow is it bought?" + }, + { + "type": "rectangle", + "version": 482, + "versionNonce": 388953871, + "isDeleted": false, + "id": "BPchcX8WUD-gRBMJwLGSN", + "fillStyle": "hachure", + "strokeWidth": 1, + "strokeStyle": "solid", + "roughness": 2, + "opacity": 100, + "angle": 0, + "x": 89.0586359500885, + "y": 137.47495079040527, + "strokeColor": "#000000", + "backgroundColor": "transparent", + "width": 264, + "height": 113, + "seed": 2033308463, + "groupIds": [], + "strokeSharpness": "round", + "boundElements": [ + { + "id": "u4vgPWZQ", + "type": "text" + }, + { + "id": "N-wn4KVaIBXuu6WVnwjmD", + "type": "arrow" + }, + { + "id": "27hpJhXxtjOOG8Tg04Emz", + "type": "arrow" + }, + { + "id": "caiB4AmfO_dME4Lx5Ou2r", + "type": "arrow" + }, + { + "id": "AQjs9-2PESDH8ldYWF8zZ", + "type": "arrow" + } + ], + "updated": 1653591020535, + "link": null, + "locked": false + }, + { + "type": "text", + "version": 457, + "versionNonce": 647642881, + "isDeleted": false, + "id": "u4vgPWZQ", + "fillStyle": "hachure", + "strokeWidth": 1, + "strokeStyle": "solid", + "roughness": 2, + "opacity": 100, + "angle": 0, + "x": 94.0586359500885, + "y": 156.47495079040527, + "strokeColor": "#000000", + "backgroundColor": "transparent", + "width": 254, + "height": 75, + "seed": 1240169281, + "groupIds": [], + "strokeSharpness": "round", + "boundElements": [], + "updated": 1653591013688, + "link": null, + "locked": false, + "fontSize": 20.001838221650203, + "fontFamily": 1, + "text": "Which are the benefits? \nWho is destined for?\nHow to purchase?", + "rawText": "Which are the benefits? \nWho is destined for?\nHow to purchase?", + "baseline": 67, + "textAlign": "center", + "verticalAlign": "middle", + "containerId": "BPchcX8WUD-gRBMJwLGSN", + "originalText": "Which are the benefits? \nWho is destined for?\nHow to purchase?" + }, + { + "id": "hB6XYJ5pDV3fDwN_mi1sP", + "type": "arrow", + "x": 10.481609582900994, + "y": 44.4576473236084, + "width": 94.0171953924559, + "height": 77.01730346679688, + "angle": 0, + "strokeColor": "#000000", + "backgroundColor": "transparent", + "fillStyle": "hachure", + "strokeWidth": 1, + "strokeStyle": "solid", + "roughness": 2, + "opacity": 100, + "groupIds": [], + "strokeSharpness": "round", + "seed": 31241953, + "version": 54, + "versionNonce": 1686172047, + "isDeleted": false, + "boundElements": null, + "updated": 1653591017199, + "link": null, + "locked": false, + "points": [ + [ + 0, + 0 + ], + [ + -94.0171953924559, + 77.01730346679688 + ] + ], + "lastCommittedPoint": [ + -92.27484130859375, + 75.58999633789062 + ], + "startBinding": { + "elementId": "lMdQ65BiodtrMC_VNzINL", + "gap": 10.19243049621582, + "focus": -0.22389670743179904 + }, + "endBinding": { + "elementId": "YCX5IzhNBoMe_tPpmZhfj", + "gap": 16, + "focus": -0.12031317208273061 + }, + "startArrowhead": null, + "endArrowhead": "arrow" + }, + { + "id": "AQjs9-2PESDH8ldYWF8zZ", + "type": "arrow", + "x": 46.6826593875885, + "y": 41.55499839782715, + "width": 84.0544486556202, + "height": 74.00206198066473, + "angle": 0, + "strokeColor": "#000000", + "backgroundColor": "transparent", + "fillStyle": "hachure", + "strokeWidth": 1, + "strokeStyle": "solid", + "roughness": 2, + "opacity": 100, + "groupIds": [], + "strokeSharpness": "round", + "seed": 1433137889, + "version": 137, + "versionNonce": 533274735, + "isDeleted": false, + "boundElements": null, + "updated": 1653591025647, + "link": null, + "locked": false, + "points": [ + [ + 0, + 0 + ], + [ + 84.0544486556202, + 74.00206198066473 + ] + ], + "lastCommittedPoint": [ + 36.1119384765625, + 80.51095581054688 + ], + "startBinding": { + "elementId": "lMdQ65BiodtrMC_VNzINL", + "focus": 0.0595512666014376, + "gap": 7.28978157043457 + }, + "endBinding": { + "elementId": "BPchcX8WUD-gRBMJwLGSN", + "focus": -0.006379041107164495, + "gap": 21.91789041191339 + }, + "startArrowhead": null, + "endArrowhead": "arrow" + } + ], + "appState": { + "theme": "light", + "viewBackgroundColor": "#ffffff", + "currentItemStrokeColor": "#000000", + "currentItemBackgroundColor": "#fab005", + "currentItemFillStyle": "hachure", + "currentItemStrokeWidth": 1, + "currentItemStrokeStyle": "solid", + "currentItemRoughness": 2, + "currentItemOpacity": 100, + "currentItemFontFamily": 1, + "currentItemFontSize": 20, + "currentItemTextAlign": "center", + "currentItemStrokeSharpness": "round", + "currentItemStartArrowhead": null, + "currentItemEndArrowhead": "arrow", + "currentItemLinearStrokeSharpness": "round", + "gridSize": null, + "colorPalette": {} + }, + "files": {} +} +``` +%% \ No newline at end of file diff --git a/Resources/electricity/assets/08-Marketing-Mix 2022-05-26 21.16.44.excalidraw.md b/Resources/electricity/assets/08-Marketing-Mix 2022-05-26 21.16.44.excalidraw.md new file mode 100644 index 0000000..fb06d30 --- /dev/null +++ b/Resources/electricity/assets/08-Marketing-Mix 2022-05-26 21.16.44.excalidraw.md @@ -0,0 +1,383 @@ +--- + +excalidraw-plugin: parsed +tags: [excalidraw] + +--- +==⚠ Switch to EXCALIDRAW VIEW in the MORE OPTIONS menu of this document. ⚠== + + +# Text Elements +Product ^hwp65s2J + +Market ^WSWyvko7 + +Price ^4Eafn8yz + +Place ^GOFXaXGC + +Promotion ^wctsCnRg + +%% +# Drawing +```json +{ + "type": "excalidraw", + "version": 2, + "source": "https://excalidraw.com", + "elements": [ + { + "type": "ellipse", + "version": 322, + "versionNonce": 202502485, + "isDeleted": false, + "id": "NriT20XsCNuFrDAsGLBD4", + "fillStyle": "hachure", + "strokeWidth": 1, + "strokeStyle": "solid", + "roughness": 1, + "opacity": 100, + "angle": 0, + "x": -250.06491364213747, + "y": -305.5771215625275, + "strokeColor": "#000000", + "backgroundColor": "transparent", + "width": 210, + "height": 208, + "seed": 835416719, + "groupIds": [], + "strokeSharpness": "sharp", + "boundElements": [ + { + "id": "4Eafn8yz", + "type": "text" + } + ], + "updated": 1653592733542, + "link": null, + "locked": false + }, + { + "type": "text", + "version": 326, + "versionNonce": 1799371387, + "isDeleted": false, + "id": "4Eafn8yz", + "fillStyle": "hachure", + "strokeWidth": 1, + "strokeStyle": "solid", + "roughness": 1, + "opacity": 100, + "angle": 0, + "x": -245.06491364213747, + "y": -214.0771215625275, + "strokeColor": "#000000", + "backgroundColor": "transparent", + "width": 200, + "height": 25, + "seed": 536627375, + "groupIds": [], + "strokeSharpness": "sharp", + "boundElements": [], + "updated": 1653592733542, + "link": null, + "locked": false, + "fontSize": 20, + "fontFamily": 1, + "text": "Price", + "rawText": "Price", + "baseline": 17, + "textAlign": "center", + "verticalAlign": "middle", + "containerId": "NriT20XsCNuFrDAsGLBD4", + "originalText": "Price" + }, + { + "type": "ellipse", + "version": 300, + "versionNonce": 1951251963, + "isDeleted": false, + "id": "e0uz3B5JPlS_oyzk_oMI2", + "fillStyle": "hachure", + "strokeWidth": 1, + "strokeStyle": "solid", + "roughness": 1, + "opacity": 100, + "angle": 0, + "x": -51.22351188946487, + "y": -298.54097326178305, + "strokeColor": "#000000", + "backgroundColor": "transparent", + "width": 208.87163434709828, + "height": 208.87163434709828, + "seed": 1614569679, + "groupIds": [], + "strokeSharpness": "sharp", + "boundElements": [ + { + "id": "GOFXaXGC", + "type": "text" + } + ], + "updated": 1653592727847, + "link": null, + "locked": false + }, + { + "type": "text", + "version": 341, + "versionNonce": 250704693, + "isDeleted": false, + "id": "GOFXaXGC", + "fillStyle": "hachure", + "strokeWidth": 1, + "strokeStyle": "solid", + "roughness": 1, + "opacity": 100, + "angle": 0, + "x": -46.22351188946487, + "y": -206.6051560882339, + "strokeColor": "#000000", + "backgroundColor": "transparent", + "width": 199, + "height": 25, + "seed": 649424623, + "groupIds": [], + "strokeSharpness": "sharp", + "boundElements": [], + "updated": 1653592727847, + "link": null, + "locked": false, + "fontSize": 20, + "fontFamily": 1, + "text": "Place", + "rawText": "Place", + "baseline": 17, + "textAlign": "center", + "verticalAlign": "middle", + "containerId": "e0uz3B5JPlS_oyzk_oMI2", + "originalText": "Place" + }, + { + "type": "ellipse", + "version": 347, + "versionNonce": 762304661, + "isDeleted": false, + "id": "Fl6H__zrqtom0FIdnF121", + "fillStyle": "hachure", + "strokeWidth": 1, + "strokeStyle": "solid", + "roughness": 1, + "opacity": 100, + "angle": 0, + "x": -58.38931457978441, + "y": -136.66599850188516, + "strokeColor": "#000000", + "backgroundColor": "transparent", + "width": 205.62940095600334, + "height": 205.62940095600334, + "seed": 1692271951, + "groupIds": [], + "strokeSharpness": "sharp", + "boundElements": [ + { + "id": "wctsCnRg", + "type": "text" + } + ], + "updated": 1653592726042, + "link": null, + "locked": false + }, + { + "type": "text", + "version": 361, + "versionNonce": 75982651, + "isDeleted": false, + "id": "wctsCnRg", + "fillStyle": "hachure", + "strokeWidth": 1, + "strokeStyle": "solid", + "roughness": 1, + "opacity": 100, + "angle": 0, + "x": -53.38931457978441, + "y": -46.35129802388349, + "strokeColor": "#000000", + "backgroundColor": "transparent", + "width": 196, + "height": 25, + "seed": 1622049647, + "groupIds": [], + "strokeSharpness": "sharp", + "boundElements": [], + "updated": 1653592726042, + "link": null, + "locked": false, + "fontSize": 20, + "fontFamily": 1, + "text": "Promotion", + "rawText": "Promotion", + "baseline": 17, + "textAlign": "center", + "verticalAlign": "middle", + "containerId": "Fl6H__zrqtom0FIdnF121", + "originalText": "Promotion" + }, + { + "type": "ellipse", + "version": 327, + "versionNonce": 579635355, + "isDeleted": false, + "id": "3qaUhvhPxpyKAyqRXNUyR", + "fillStyle": "hachure", + "strokeWidth": 1, + "strokeStyle": "solid", + "roughness": 1, + "opacity": 100, + "angle": 0, + "x": -236.37789320407947, + "y": -139.92567968727056, + "strokeColor": "#000000", + "backgroundColor": "transparent", + "width": 213.42741313733552, + "height": 213.42741313733552, + "seed": 285901121, + "groupIds": [], + "strokeSharpness": "sharp", + "boundElements": [ + { + "type": "text", + "id": "hwp65s2J" + } + ], + "updated": 1653592724942, + "link": null, + "locked": false + }, + { + "type": "text", + "version": 353, + "versionNonce": 13771413, + "isDeleted": false, + "id": "hwp65s2J", + "fillStyle": "hachure", + "strokeWidth": 1, + "strokeStyle": "solid", + "roughness": 1, + "opacity": 100, + "angle": 0, + "x": -231.37789320407947, + "y": -45.7119731186028, + "strokeColor": "#000000", + "backgroundColor": "transparent", + "width": 204, + "height": 25, + "seed": 185299457, + "groupIds": [], + "strokeSharpness": "sharp", + "boundElements": [], + "updated": 1653592724942, + "link": null, + "locked": false, + "fontSize": 20, + "fontFamily": 1, + "text": "Product", + "rawText": "Product", + "baseline": 17, + "textAlign": "center", + "verticalAlign": "middle", + "containerId": "3qaUhvhPxpyKAyqRXNUyR", + "originalText": "Product" + }, + { + "type": "ellipse", + "version": 58, + "versionNonce": 700935899, + "isDeleted": false, + "id": "s3snM7S3K7yns8FaINKxl", + "fillStyle": "solid", + "strokeWidth": 1, + "strokeStyle": "solid", + "roughness": 1, + "opacity": 100, + "angle": 0, + "x": -106.82376098632812, + "y": -173.49540328979492, + "strokeColor": "#000000", + "backgroundColor": "#4c6ef5", + "width": 130.4620361328125, + "height": 130.4620361328125, + "seed": 623815567, + "groupIds": [], + "strokeSharpness": "sharp", + "boundElements": [ + { + "id": "WSWyvko7", + "type": "text" + } + ], + "updated": 1653592708664, + "link": null, + "locked": false + }, + { + "type": "text", + "version": 16, + "versionNonce": 1271906389, + "isDeleted": false, + "id": "WSWyvko7", + "fillStyle": "hachure", + "strokeWidth": 1, + "strokeStyle": "solid", + "roughness": 1, + "opacity": 100, + "angle": 0, + "x": -101.82376098632812, + "y": -120.76438522338867, + "strokeColor": "#000000", + "backgroundColor": "transparent", + "width": 120.4620361328125, + "height": 25, + "seed": 345006511, + "groupIds": [], + "strokeSharpness": "sharp", + "boundElements": [], + "updated": 1653592708664, + "link": null, + "locked": false, + "fontSize": 20.077006022135414, + "fontFamily": 1, + "text": "Market", + "rawText": "Market", + "baseline": 17, + "textAlign": "center", + "verticalAlign": "middle", + "containerId": "s3snM7S3K7yns8FaINKxl", + "originalText": "Market" + } + ], + "appState": { + "theme": "light", + "viewBackgroundColor": "#ffffff", + "currentItemStrokeColor": "#000000", + "currentItemBackgroundColor": "#4c6ef5", + "currentItemFillStyle": "solid", + "currentItemStrokeWidth": 1, + "currentItemStrokeStyle": "solid", + "currentItemRoughness": 1, + "currentItemOpacity": 100, + "currentItemFontFamily": 1, + "currentItemFontSize": 20, + "currentItemTextAlign": "left", + "currentItemStrokeSharpness": "sharp", + "currentItemStartArrowhead": null, + "currentItemEndArrowhead": "arrow", + "currentItemLinearStrokeSharpness": "round", + "gridSize": null, + "colorPalette": {} + }, + "files": {} +} +``` +%% \ No newline at end of file diff --git a/Resources/electricity/assets/08-Marketing-Mix 2022-05-26 21.22.59.excalidraw.md b/Resources/electricity/assets/08-Marketing-Mix 2022-05-26 21.22.59.excalidraw.md new file mode 100644 index 0000000..31a89b1 --- /dev/null +++ b/Resources/electricity/assets/08-Marketing-Mix 2022-05-26 21.22.59.excalidraw.md @@ -0,0 +1,237 @@ +--- + +excalidraw-plugin: parsed +tags: [excalidraw] + +--- +==⚠ Switch to EXCALIDRAW VIEW in the MORE OPTIONS menu of this document. ⚠== + + +# Text Elements +Basic Product ^t8ec1Dhr + +Real Product ^xMdmKZoU + +Extended Product ^0oYA9Kd6 + +%% +# Drawing +```json +{ + "type": "excalidraw", + "version": 2, + "source": "https://excalidraw.com", + "elements": [ + { + "type": "ellipse", + "version": 165, + "versionNonce": 293647413, + "isDeleted": false, + "id": "AEqIKXiayF7YA6q3yiUUq", + "fillStyle": "hachure", + "strokeWidth": 1, + "strokeStyle": "solid", + "roughness": 1, + "opacity": 100, + "angle": 0, + "x": -247.82656860351562, + "y": -245.45173263549805, + "strokeColor": "#000000", + "backgroundColor": "#228be6", + "width": 457.08441162109375, + "height": 457.08441162109375, + "seed": 1112419925, + "groupIds": [], + "strokeSharpness": "sharp", + "boundElements": [], + "updated": 1653593049639, + "link": null, + "locked": false + }, + { + "type": "ellipse", + "version": 48, + "versionNonce": 797243, + "isDeleted": false, + "id": "R7er_u6cQK5ahAUOzA6ws", + "fillStyle": "solid", + "strokeWidth": 1, + "strokeStyle": "solid", + "roughness": 1, + "opacity": 100, + "angle": 0, + "x": -110.83895874023438, + "y": -115.01462936401367, + "strokeColor": "#000000", + "backgroundColor": "#fab005", + "width": 187, + "height": 186.5572509765625, + "seed": 248209429, + "groupIds": [], + "strokeSharpness": "sharp", + "boundElements": [ + { + "type": "text", + "id": "t8ec1Dhr" + } + ], + "updated": 1653593053443, + "link": null, + "locked": false + }, + { + "type": "text", + "version": 27, + "versionNonce": 131570069, + "isDeleted": false, + "id": "t8ec1Dhr", + "fillStyle": "hachure", + "strokeWidth": 1, + "strokeStyle": "solid", + "roughness": 1, + "opacity": 100, + "angle": 0, + "x": -105.83895874023438, + "y": -34.23600387573242, + "strokeColor": "#000000", + "backgroundColor": "transparent", + "width": 177, + "height": 25, + "seed": 453376379, + "groupIds": [], + "strokeSharpness": "sharp", + "boundElements": [], + "updated": 1653592991127, + "link": null, + "locked": false, + "fontSize": 20, + "fontFamily": 1, + "text": "Basic Product", + "rawText": "Basic Product", + "baseline": 17, + "textAlign": "center", + "verticalAlign": "middle", + "containerId": "R7er_u6cQK5ahAUOzA6ws", + "originalText": "Basic Product" + }, + { + "type": "text", + "version": 67, + "versionNonce": 1086208987, + "isDeleted": false, + "id": "xMdmKZoU", + "fillStyle": "hachure", + "strokeWidth": 1, + "strokeStyle": "solid", + "roughness": 1, + "opacity": 100, + "angle": 0, + "x": -89.84042358398438, + "y": -175.5886344909668, + "strokeColor": "#000000", + "backgroundColor": "transparent", + "width": 131, + "height": 25, + "seed": 1540952731, + "groupIds": [], + "strokeSharpness": "sharp", + "boundElements": [], + "updated": 1653593012850, + "link": null, + "locked": false, + "fontSize": 20, + "fontFamily": 1, + "text": "Real Product", + "rawText": "Real Product", + "baseline": 17, + "textAlign": "left", + "verticalAlign": "top", + "containerId": null, + "originalText": "Real Product" + }, + { + "type": "ellipse", + "version": 302, + "versionNonce": 791430523, + "isDeleted": false, + "id": "hXvjfV9lC_mXxARd9JdSg", + "fillStyle": "hachure", + "strokeWidth": 1, + "strokeStyle": "solid", + "roughness": 1, + "opacity": 100, + "angle": 0, + "x": -394.22137451171875, + "y": -394.0070457458496, + "strokeColor": "#000000", + "backgroundColor": "transparent", + "width": 754.4520874023438, + "height": 754.4520874023438, + "seed": 2032186965, + "groupIds": [], + "strokeSharpness": "sharp", + "boundElements": [], + "updated": 1653593021832, + "link": null, + "locked": false + }, + { + "type": "text", + "version": 160, + "versionNonce": 1313045275, + "isDeleted": false, + "id": "0oYA9Kd6", + "fillStyle": "hachure", + "strokeWidth": 1, + "strokeStyle": "solid", + "roughness": 1, + "opacity": 100, + "angle": 0, + "x": -110.92367553710938, + "y": -324.8755760192871, + "strokeColor": "#000000", + "backgroundColor": "transparent", + "width": 178, + "height": 25, + "seed": 1043700501, + "groupIds": [], + "strokeSharpness": "sharp", + "boundElements": [], + "updated": 1653593033286, + "link": null, + "locked": false, + "fontSize": 20, + "fontFamily": 1, + "text": "Extended Product", + "rawText": "Extended Product", + "baseline": 17, + "textAlign": "left", + "verticalAlign": "top", + "containerId": null, + "originalText": "Extended Product" + } + ], + "appState": { + "theme": "light", + "viewBackgroundColor": "#ffffff", + "currentItemStrokeColor": "#000000", + "currentItemBackgroundColor": "#228be6", + "currentItemFillStyle": "solid", + "currentItemStrokeWidth": 1, + "currentItemStrokeStyle": "solid", + "currentItemRoughness": 1, + "currentItemOpacity": 100, + "currentItemFontFamily": 1, + "currentItemFontSize": 20, + "currentItemTextAlign": "left", + "currentItemStrokeSharpness": "sharp", + "currentItemStartArrowhead": null, + "currentItemEndArrowhead": "arrow", + "currentItemLinearStrokeSharpness": "round", + "gridSize": null, + "colorPalette": {} + }, + "files": {} +} +``` +%% \ No newline at end of file diff --git a/Resources/electricity/assets/galvanic_isolation_wiki.png b/Resources/electricity/assets/galvanic_isolation_wiki.png new file mode 100644 index 0000000..a855b71 Binary files /dev/null and b/Resources/electricity/assets/galvanic_isolation_wiki.png differ diff --git a/Resources/electricity/circuits/op-amp-adder.md b/Resources/electricity/circuits/op-amp-adder.md new file mode 100644 index 0000000..1ce598d --- /dev/null +++ b/Resources/electricity/circuits/op-amp-adder.md @@ -0,0 +1,36 @@ +# Inverting Summing Amplifier +```circuitjs +$ 64 0.000005 20.712724888983452 50 5 50 5e-11 +R 128 224 64 224 0 1 200 5 0 0 0.5 +R 128 304 64 304 0 2 40 5 0 0 0.5 +r 128 224 176 224 0 1000 +r 128 304 176 304 0 1000 +w 176 224 176 304 0 +w 176 304 240 304 0 +a 240 320 352 320 8 15 -15 1000000 0.000011958947409199515 0 100000 +g 240 336 240 384 0 0 +w 240 304 240 240 0 +r 240 240 352 240 0 1000 +w 352 320 352 240 0 +O 352 320 416 320 0 0 +o 11 64 0 4098 10 0.1 0 1 +``` + +# Non-Inverting Summing Amplifiers + +```circuitjs +$ 64 0.000005 20.712724888983452 50 5 50 5e-11 +R 128 224 64 224 0 1 200 5 0 0 0.5 +R 128 304 64 304 0 2 40 5 0 0 0.5 +r 128 224 176 224 0 1000 +r 128 304 176 304 0 1000 +w 176 224 176 304 0 +w 176 304 240 304 0 +a 240 320 352 320 8 15 -15 1000000 0.000011958947409199515 0 100000 +g 240 336 240 384 0 0 +w 240 304 240 240 0 +r 240 240 352 240 0 1000 +w 352 320 352 240 0 +O 352 320 416 320 0 0 +o 11 64 0 4098 10 0.1 0 1 +``` \ No newline at end of file diff --git a/Resources/electricity/circuits/peak-detector.md b/Resources/electricity/circuits/peak-detector.md new file mode 100644 index 0000000..2cfb31d --- /dev/null +++ b/Resources/electricity/circuits/peak-detector.md @@ -0,0 +1,18 @@ +```circuitjs +$ 64 0.000005 1.0312258501325766 50 5 50 5e-11 +v 96 176 208 176 0 1 110 5 0 0 0.5 +g 16 176 16 208 0 0 +v 16 176 96 176 0 1 40 5 0 0 0.5 +a 240 192 336 192 9 15 -15 1000000 9.598666598287988 -2.4876948987910166 100000 +d 336 192 416 192 2 default +w 240 208 240 256 0 +w 240 256 416 256 0 +w 416 192 416 256 0 +c 416 256 416 352 0 0.00001 9.598666598287988 0.001 +g 416 352 416 400 0 0 +O 416 192 464 192 0 0 +w 208 176 240 176 0 +o 10 64 0 4098 10 0.1 0 1 +o 11 64 0 x101006 10 0.1 0 1 +``` + diff --git a/Resources/electricity/formulas.md b/Resources/electricity/formulas.md index 84603d3..44887f8 100644 --- a/Resources/electricity/formulas.md +++ b/Resources/electricity/formulas.md @@ -1,24 +1,30 @@ -# Ohms Law -Solve for voltage: +--- +cards-deck: electricity +--- -$\displaystyle V = \frac{I}{R}$ +# Ohms Law #card -*Solve for resistance:* +*Solve for voltage:* #card -$R = \frac{V}{I}$ +$\displaystyle V = I*R$ +^1654443735379 -_Solve for current_ -$$ -\begin{flalign} -I & = \frac{V}{R} & -\end{flalign} -$$ +*Solve for resistance:* #card -# Resistors in Series +$\displaystyle R = \frac{V}{I}$ +^1654443831648 + +*Solve for current* #card + +$\displaystyle I = \frac{V}{R}$ +^1654443831659 + +# Resistors in Series #card $R = R1 + R2 + R3 ...$ +^1654443735407 -# Resistors in Parallel +# Resistors in Parallel #card $$ \begin{flalign} @@ -29,25 +35,24 @@ $$ &R = \frac{R1 * R2}{R1 + R2} &\\\ \end{flalign} $$ - ***Tip:*** If resistors of the same value are in parallel the total resistance is a single resistor divided by the amount if resistors. +^1654443735425 ## Thevenin’s Theorem States that it is possible to simplify any linear circuit, no matter how complex, to an equivalent circuit with just a single voltage source and series resistance connected to a load. # Kirchhoff's Law -## Conservation of Charge (First Law) +## Conservation of Charge (First Law) #card All current entering a node must also leave that node - $$ \begin{flalign} \sum{I_{IN}} = \sum{I_{OUT}}&& \end{flalign} $$ - +^1654443735443 **Example:** ![](kirchhoffs-law-01.svg) @@ -65,7 +70,7 @@ $\displaystyle \sum{V} = 0$ $\displaystyle \frac{1}{C_{t}} = \frac{1}{C_{1}}+\frac{1}{C_{2}}+\frac{1}{C_{3}} ...$ -### Impedance in a Circuit +### Impedance in a Circuit #card $$ \begin{flalign} @@ -74,14 +79,17 @@ $$ &X = X_{L} - X_{C} \\ \end{flalign} $$ +^1654444201375 -# Capacitive Reactance +# Capacitive Reactance #card $\displaystyle X_{c} = \frac{1}{2 \pi fC}$ +^1654444201382 -# Inductive Reactance +# Inductive Reactance #card $\displaystyle X_{l} = 2\pi fL$ +^1654444201388 # Analog Filters @@ -113,9 +121,10 @@ $\displaystyle f_{o} = \frac{1}{2\pi \sqrt{LC}}$ $f_{c} = \sqrt{f_{h}*f_{l}}$ -## Filter Response for RC Filters +## Filter Response for RC Filters #card $V_{out} = V_{in}(\frac{X_c}{\sqrt{R_{1}^2+X_{c}^2}})$ +^1654442437438 ## Cutoff Frequency $\pi$ Topology Filter @@ -127,9 +136,10 @@ $\displaystyle f_c = \frac{1}{4\pi\sqrt{LC}}$ $V_{out} = V_{in}(\frac{R_{1}}{R_1+R_2})$ -# Angular Frequency ($\omega$) +# Angular Frequency ($\omega$) #card -$\omega = 2\pi f = \frac{2\pi}{T}$ ^4ad7fc +$\omega = 2\pi f = \frac{2\pi}{T}$ +^1654444201395 # RLC Series Response @@ -141,6 +151,8 @@ Where $Z$ is the impedance: $Z = \sqrt{R^2 + (X_L - X_C)^2}$ +$X_L$ = Reactive Inductance +$X_C$ = Reactive Capacativw # Current through a transistor @@ -148,6 +160,7 @@ $\displaystyle I_{EQ} = \frac{V_{BB}-{V_{BE}}}{\frac{R_B}{(\beta+1)}+R_E}$ # Gain Bandwidth Product $GBP = A_V * f_c$ + $\displaystyle f_c = \frac{GBP}{A_V}$ @@ -156,4 +169,10 @@ $\displaystyle f_c = \frac{GBP}{A_V}$ Where $n$ = number of stages and $BW$ = Bandwidth of single op-amp -$BW_E = BW\sqrt{2^\frac{1}{n}-1}$ \ No newline at end of file +$BW_E = BW\sqrt{2^\frac{1}{n}-1}$ + + +# Power lost in a Resistor + +$P = IV = I^2R = \frac{V^2}{R}$ + diff --git a/Resources/electricity/glossary.md b/Resources/electricity/glossary.md index 5a27f1e..7307a40 100644 --- a/Resources/electricity/glossary.md +++ b/Resources/electricity/glossary.md @@ -84,4 +84,9 @@ The Transfer function is a mathematical model of some analog filter that represe # Angular Frequency ($\omega$) -![[formulas#^4ad7fc]] \ No newline at end of file +![[formulas#Angular Frequency omega]] + +# Galvanic Isolation +Galvanic isolation is a design technique that separates electrical circuits to eliminate stray currents + +![[galvanic_isolation_wiki.png]] diff --git a/Resources/electricity/passive-components/inductors.md b/Resources/electricity/passive-components/inductors.md index 617c6b4..e1cb420 100644 --- a/Resources/electricity/passive-components/inductors.md +++ b/Resources/electricity/passive-components/inductors.md @@ -17,7 +17,7 @@ $$ &N = \text{Coil Turns} \\ &A = \text{Area of the coild} \\ &\micro = \text{Permeability} \\ -&\textit{How easily a magnetic field can be crated} \\ +&\textit{How easily a magnetic field can be created in the medium of the inductor} \\ &l = \text{Length of coil} \\ \end{flalign} diff --git a/Resources/electricity/passive-components/transformers.md b/Resources/electricity/passive-components/transformers.md index 7315d57..199ec5e 100644 --- a/Resources/electricity/passive-components/transformers.md +++ b/Resources/electricity/passive-components/transformers.md @@ -10,4 +10,5 @@ There are two main types of transformers: When there are more turns on the primary winding, that means that the voltage on the secondary winding is lower, but the current is higher, and vice versa. Also this relationshop is linear, so half the amount of turns in the second winding, mean half the amount of voltage and double the amount of current. In formula this means: -$\displaystyle \frac{V_{out}}{V_{in}} = \frac{N_{s}}{N_{p}} = \frac{I_{in}}{I_{out}}$ \ No newline at end of file +$\displaystyle \frac{V_{out}}{V_{in}} = \frac{N_{s}}{N_{p}} = \frac{I_{in}}{I_{out}}$ + diff --git a/Resources/films/index.md b/Resources/films/index.md deleted file mode 100644 index 7c8c330..0000000 --- a/Resources/films/index.md +++ /dev/null @@ -1,5 +0,0 @@ -# Movies - -To Watch: - -https://en.wikipedia.org/wiki/Roma_(2018_film) diff --git a/Resources/games/index.md b/Resources/games/index.md new file mode 100644 index 0000000..e69de29 diff --git a/Resources/games/rpg.md b/Resources/games/rpg.md new file mode 100644 index 0000000..58b8295 --- /dev/null +++ b/Resources/games/rpg.md @@ -0,0 +1,3 @@ +# MMORPGs + +[Moon Hunters](https://www.humblebundle.com/store/moon-hunters) diff --git a/Resources/games/web-based.md b/Resources/games/web-based.md new file mode 100644 index 0000000..799528a --- /dev/null +++ b/Resources/games/web-based.md @@ -0,0 +1,18 @@ +# MackerelMedia Fish +http://mackerelmediafish.com/# + +# IsleWards +https://bigbadwaffle.itch.io/isleward + + +# FallenLondon +https://www.fallenlondon.com + +# SurviveIO +https://surviv.io/ + +# Worlds Hardest Game +https://www.crazygames.com/game/worlds-hardest-game + +# Wilds.io +https://wilds.io/# diff --git a/Resources/mathematics/derivation/index.md b/Resources/mathematics/derivation/index.md new file mode 100644 index 0000000..d6fedff --- /dev/null +++ b/Resources/mathematics/derivation/index.md @@ -0,0 +1,133 @@ +# Derivation +The derivative of a function gives us the slope of that function at a specific point. + +# Constant Derivatives +Deriving any constant gives us a derivative of $x = 0$ + +$f(x) = 5$ +$f'(x) = 0$ + +# Power Rule +$\frac{d}{dx}(x^n) = nx^{(n-1)}$ + +$f(x) = x^2$ +$f'(x) = x$ + +$f(x) = x^5$ +$f'(x) = 5x^4$ + +You can also use the power rule to solve $f(x) = \frac{1}{x}$ + +$$ +\begin{flalign} +&f(x) = \frac{1}{x}&\\\ +&f(x) = x^{-1}\\ +&f('x) = -1x^{-1-1} = -1x^{-2} = \frac{-1x^{-2}}{1}\\ +&f'(x) = \frac{-1}{x^2}\\ +\end{flalign} +$$ + +# Constant Multiple Rule +The derivative of $constant * f(x)$ is $constant * f'(x)$. So we can see that the constant doesn't change. + +$f(x) = 5x^4$ +$f'(x) = 5*4x^3 = 20x^3$ + +$f(x) = 8x^4$ +$f'(x) = 32x^3$ + +$f(x) = 5x^6$ +$f'(x) = 30x^5$ + +# Derive Radical Functions 🤘 +$$ +\begin{flalign} +&f(x) = \sqrt{x}&\\\ +&f(x) = \sqrt[2]{x^1}\\ +&f(x) = x^{\frac{1}{2}}\\ +&f'(x) = \frac{1}{2}x^{\frac{1}{2}-1} = \frac{1}{2}x^{-\frac{1}{²}}\\ +&f'(x) = \frac{1x^{-\frac{1}{2}}}{2}\\ +&f'(x) = \frac{1}{2x^{\frac{1}{2}}}\\ +&f'(x) = \frac{1}{2\sqrt{x}} +\end{flalign} +$$ + +# Derive Sine/Cosine + +$\frac{d}{dx}[\sin{x}] = \cos{x}$ +$\frac{d}{dx}[\cos{x}] = -\sin{x}$ + +# Product Rule +This rule applies when you try to derive functions that are multiplied. +$\frac{d}{dx}[f*x] = f'*g + f*g'$ + +# Example +$$ +\begin{flalign} +&f(x) = x^3+7x^2-8x+6&\\\ +&f'(x) = 3x^2+14x-8 +\end{flalign} +$$ +$$ +\begin{flalign} +&f(x) = 4x^5+3x^4+9x+7&\\\ +&f'(x) = 20x^4+12x^3+9 +\end{flalign} +$$ + +$$ +\begin{flalign} +&f(x) = 2x^5+5x^3+3x^2+4&\\\ +&\text{Find the slope at } x = 2\\ +&f'(x) = 10x^4+15x^2+6x\\ +&f'(2) = 10(2)^4+15(2)^2+6(2)\\ +&f'(2) = 232\\ +\end{flalign} +$$ + +$$ +\begin{flalign} +&f(x) = \frac{1}{x^2}&\\\ +&f(x) = x^{-2}\\ +&f'(x) = -2x^{-3}\\ +&f'(x) = \frac{-2}{x^3n } +\end{flalign} +$$ + +$$ +\begin{flalign} +&f(x) = \sqrt[3]{x^5}&\\\ +&f(x) = x^{\frac{5}{3}}\\ +&f'(x) = \frac{5}{3}x^{\frac{2}{3}}\\ +&f'(x) = \frac{5x^{\frac{2}{3}}}{3}\\ +&f'(x) = \frac{5\sqrt[3]{x^2}}{3}\\ +\end{flalign} +$$ + +$$ +\begin{flalign} +&f(x) = \sqrt[7]{x^4}&\\\ +&f(x) = x^{\frac{4}{7}}\\ +&f'(x) = \frac{4}{7}x^{-\frac{3}{7}}\\ +&f'(x) = \frac{4x^{-\frac{3}{7}}}{7}\\ +&f'(x) = \frac{4}{7x^{\frac{3}{7}}}\\ +&f'(x) = \frac{4}{7\sqrt[7]{x^3}} +\end{flalign} +$$ + +$$ +\begin{flalign} +&f(x) = (2x-3)^2&\\\ +&f(x) = 4x^2-12x+9\\ +&f'(x) = 8x - 12 +\end{flalign} +$$ + +$$ +\begin{flalign} +&f(x) = \frac{x^5+6x^4+5x^3}{x^2}&\\\ +&f(x) = x^{-2}(x^5+6x^4+5x^3)\\ +&f(x) = x^3+6x^2+5x\\ +&f'(x) = 3x^2+12x+5 +\end{flalign} +$$ \ No newline at end of file diff --git a/Resources/mathematics/derivation/lim-proof.md b/Resources/mathematics/derivation/lim-proof.md new file mode 100644 index 0000000..71bd452 --- /dev/null +++ b/Resources/mathematics/derivation/lim-proof.md @@ -0,0 +1,34 @@ +# Proof of x² = 2x + + +$$ +\begin{flalign} +& \frac{d}{dx}(x^2) = 2 &\\\ +\\ +& f(x) = x^2 &\\\ +\\ +&f'(x) = \lim_{x \to 0} \frac{f(x+h) - f(x)}{h} \\ +\\ +&\text{So what is }f(x+h)?\\ +&\text{We just replace the x in the base formula with }(x+h)\\ +&f(x+h) = (x+h)^2\\ +\\ +&f'(x) = \lim_{x \to 0} \frac{(x+h)^2-x^2}{h} \\ +&f'(x) = \lim_{x \to 0} \frac{x^2+2xh+h^2-x^2}{h} \\ +&f'(x) = \lim_{x \to 0} \frac{2xh+h^2}{h} \\ +&f'(x) = \lim_{x \to 0} \frac{h(2x+h)}{h} \\ +&f'(x) = \lim_{x \to 0} 2x+h \\ + +\end{flalign} +$$ + + +```desmos-graph +left=-2; right=2; +bottom=-2; top=2; +--- +y=x^2 +y=2x +``` + + diff --git a/Resources/mathematics/geometry/euclidean.md b/Resources/mathematics/geometry/euclidean.md new file mode 100644 index 0000000..d4c3b8d --- /dev/null +++ b/Resources/mathematics/geometry/euclidean.md @@ -0,0 +1,35 @@ +# Create a orthogonal Vector + +For this we can use the dotproduct. + +Example: + +$V_1 = [1,6,2]$ +$V_2 = ?$ + +We know that the dot product of these two vectors must be zero, we can use that + +$V_1 \cdot V_2 = 0$ + +Lets plugin our numbers + +$1 * V_2x + 6 * V_2y + 2 *V_2z = 0$ + +Lets choose arbitrary numbers for $V_2x$ and $V_2y$, for now $1$ because that makes the calculation a bit easier + +$1*1+6*1+2*V_2z = 0$ + +$7+2V_2z = 0$ + +$V_2z = -3.5$ + +```ts +// Note the the resulting vector can be very large +function findOrthogonalVector([x,y,z]:number[]){ + return [1,1,-((x+y)/z)] +} + +``` + + + diff --git a/Resources/mathematics/index.md b/Resources/mathematics/index.md new file mode 100644 index 0000000..e69de29 diff --git a/Resources/mathematics/integration/index.md b/Resources/mathematics/integration/index.md new file mode 100644 index 0000000..e618499 --- /dev/null +++ b/Resources/mathematics/integration/index.md @@ -0,0 +1,3 @@ +# Integration + +Integration is basically the solution to the problem of trying to find the area under a graph. \ No newline at end of file diff --git a/Resources/music/theory.md b/Resources/music/theory.md index 52d164f..fa817d3 100644 --- a/Resources/music/theory.md +++ b/Resources/music/theory.md @@ -7,7 +7,6 @@ Every move up one fret of the guitar represents a halfstep. So moving frets mean Double the frequency = One Octave higher Half the frequency = One Octave lower - # Scales Scales are patterns of intervals. diff --git a/Resources/travelling/index.md b/Resources/travelling/index.md new file mode 100644 index 0000000..e69de29 diff --git a/Resources/travelling/valencia.md b/Resources/travelling/valencia.md new file mode 100644 index 0000000..9a0082e --- /dev/null +++ b/Resources/travelling/valencia.md @@ -0,0 +1 @@ +# Things to do in valencia