diff options
author | Hugo Hörnquist <hugo@hornquist.se> | 2019-08-25 11:29:14 +0200 |
---|---|---|
committer | Hugo Hörnquist <hugo@hornquist.se> | 2019-08-25 11:29:14 +0200 |
commit | a95150187d7b7658fa04d9fa0ca2e7b46c094814 (patch) | |
tree | aceaa5210ea57796d0f190b90c5126fe0eb815cb /Dator | |
parent | Sun, 25 Aug 2019 11:28:30 +0200 (diff) | |
parent | Merge branch 'master' of git:git/wiki-public (diff) | |
download | wiki-public-a95150187d7b7658fa04d9fa0ca2e7b46c094814.tar.gz wiki-public-a95150187d7b7658fa04d9fa0ca2e7b46c094814.tar.xz |
Merge branch 'master' of git.hornquist.se:git/wiki-public
Diffstat (limited to '')
-rw-r--r-- | Dator.wiki | 23 | ||||
-rw-r--r-- | Dator/4.wiki | 13 | ||||
-rw-r--r-- | Dator/5.wiki | 19 | ||||
-rw-r--r-- | Dator/Ny.wiki | 17 |
4 files changed, 72 insertions, 0 deletions
diff --git a/Dator.wiki b/Dator.wiki new file mode 100644 index 0000000..5c53b93 --- /dev/null +++ b/Dator.wiki @@ -0,0 +1,23 @@ += Dator = + +== Ny == + +[[Dator/Ny]] + + + +== Invetarie == + +Inventarie över mina datorkomponenter. Nummer bör aldrig återanvändas +Vidare kommentarer läggs i fil `Dator/##.wiki` (`##` är löpnummret). + +1. GPU MSI +2. GPU Wallenberg +3. GPU Radeon HD 6870 + - Hugo 2012 +4. [[Dator/4|PSU Fujitsu]] +5. [[Dator/5|PSU Corsair]] +6. Disk 500GB +7. Disk 3TB +8. Disk 1TB Wallenberg +9. Disk 2TB Stupan diff --git a/Dator/4.wiki b/Dator/4.wiki new file mode 100644 index 0000000..4f4ce26 --- /dev/null +++ b/Dator/4.wiki @@ -0,0 +1,13 @@ += Pinout = +:PSU: + +Från i7-datorn i LiU:s kattakomber + +| 12 gul | 0 sv | +| 12 gul | 0 sv | +| 12 gul | 0 sv | +| 0 sv | 12 gul | +| 0 sv | 12 gul | +| 0 sv | 12 gul | +| 0? grå | grön | +| - | 12 gul/brun | diff --git a/Dator/5.wiki b/Dator/5.wiki new file mode 100644 index 0000000..7824fd0 --- /dev/null +++ b/Dator/5.wiki @@ -0,0 +1,19 @@ += Pinout = +:PSU: + +800W, köpt ca. 2015 + +== "Stora kontakten" == +| 3.4 orange | 3.4 orange | +| 11.5 blå | 3.4 orange | +| 0 svart | 3.4 svart | +| grön | 5.1 röd | +| 0 svart | 0 svart | +| 0 svart | 5.1 röd | +| 0 svart | 0 svart | +| - | 5.1 grå | +| 5.1 röd | 5.1 lila | +| 5.1 röd | 12.1 gul | +|------------|------------| +| 5.1 röd | 12.1 gul | +| 0 svart | 3.4 orange | diff --git a/Dator/Ny.wiki b/Dator/Ny.wiki new file mode 100644 index 0000000..3ec6644 --- /dev/null +++ b/Dator/Ny.wiki @@ -0,0 +1,17 @@ += Dator = + +| Moderkort | MSI B450 Tomahawk | 1200 | https://www.prisjakt.nu/produkt.php?p=4894211 | +| RAM | God. T. DDR4 2x8GB | _800 | | +| CPU | Ryzen 5 3600 | 2400 | https://www.prisjakt.nu/produkt.php?p=5139853 [1] | +| GPU | Radeon RX Vego 56 8GB | 3100 | https://www.prisjakt.nu/produkt.php?p=4639778 | +| | | | | +| Totalt | | 7500 | | +[1]: https://www.prisjakt.nu/kategori.php?k=s409738967&catId=500 + +== Moderkort == + +1500 https://www.prisjakt.nu/produkt.php?p=4759611 +1200 https://www.prisjakt.nu/produkt.php?p=4894211 +https://www.prisjakt.nu/jamfor/produkter/4759611,4894211?categoryId=1320 + +MSI B450-A PRO Moderkort - AMD B450 - AMD AM4 socket - DDR4 RAM - ATX |