diff --git a/docs/components.md b/docs/components.md index f4627fa..d214455 100644 --- a/docs/components.md +++ b/docs/components.md @@ -22,7 +22,7 @@ Components #Linus Room 1xVoice Reciever - Round screen thingy -1xSound System? +1xSound System ??? #Amirs Room @@ -36,7 +36,7 @@ Components 1xTiny PC with Mini Touchscreen 1xCamera 1xVoice Reciever - Round screen thingy -1xSound System? +1xSound System ##Summed totals @@ -51,20 +51,19 @@ Components 1x Beamer 4x Voice Reciever - round screen thingy (Living Room, Loggia, Linus Room, Kitchen) 1x HA Voice PE -4x Sound System (2 confirmed: Living Room, Loggia — 2 marked "?": Linus Room, Kitchen) +4x Sound System (all confirmed: Living Room, Loggia, Linus Room, Kitchen) 1x Tiny PC with Mini Touchscreen (Kitchen) 1x Camera (Kitchen) #By room Living Room: 1x ThinClient, 1x Voice Reciever, 1x Sound System Loggia: 1x Miniscreen System (have), 1x Sound System, 1x Voice Reciever -Linus Room: 1x Voice Reciever, 1x Sound System?, +1 unresolved (???) +Linus Room: 1x Voice Reciever, 1x Sound System, +1 unresolved (???) Amirs Room: 1x Beamer, 1x ThinClient, 1x HA Voice PE -Kitchen: 1x Tiny PC w/ Touchscreen, 1x Camera, 1x Voice Reciever, 1x Sound System? +Kitchen: 1x Tiny PC w/ Touchscreen, 1x Camera, 1x Voice Reciever, 1x Sound System #Open items - Linus Room's "???" line is still undecided. -- Sound System is unconfirmed ("?") in Linus Room and Kitchen — 2 of the 4 total. #Have 1xSound System @@ -112,9 +111,8 @@ is a kit of: 4x board + 4x power adapter (+ cable if not bundled). -#Sound System (Living Room + Loggia confirmed; Linus Room + Kitchen unconfirmed) — need 1 confirmed, up to 3 total -Have 1 already, need 4 total (2 confirmed, 2 pending the "?"/"???" decisions above) -→ need 1 now, +2 more if Linus Room/Kitchen are confirmed. Each unit is a kit of: +#Sound System (all 4 rooms confirmed: Living Room, Loggia, Linus Room, Kitchen) — need 3 +Have 1 already, need 4 total, all confirmed → need 3 more. Each unit is a kit of: - [Fosi Audio V3 stereo amp (300W x2, TPA3255, w/ 48V PSU)](https://www.amazon.com/Fosi-Audio-V3-Amplifier-48V/dp/B0CGCSM191) (~€130 per docs/project-plan.md §1.13) — USB DAC/amp for the passive speakers below, same choice this repo's `hosts/audio-endpoint/` and `hosts/thin-client/` docs already @@ -124,8 +122,7 @@ Have 1 already, need 4 total (2 confirmed, 2 pending the "?"/"???" decisions abo - [16-gauge speaker wire, 100ft spool](https://www.amazon.com/AmazonBasics-16-Gauge-Speaker-Wire-Feet/dp/B006LW0W5Y) (one spool easily covers multiple rooms — buy once, not once per Sound System) -1x spool of wire total; 1–3x (amp + speaker pair) depending on how many of the -"?"/"???" rooms end up wanting one. +1x spool of wire total; 3x (amp + speaker pair). #Kitchen — need 1 touchscreen + 1 camera `hosts/kitchen-display/` (Phase 17) — the Tiny PC is covered by "Have", these two @@ -139,8 +136,6 @@ are not: support, not a specific requirement #Open items carried over from above -- Whether Linus Room and Kitchen actually get a Sound System (the two "?" marks) - decides whether 1 or 3 more amp+speaker kits are needed. - Linus Room's "???" line is still a completely open slot — nothing to shop for until it's decided what it is. - Loggia's Lenovo all-in-one is already owned, so nothing to buy. `hosts/touch-panel/` @@ -169,22 +164,16 @@ local pricing/VAT/shipping. | Ceiling/shelf mount *(optional)* | 1 | €15–25 | €15–25 | | Waveshare ESP32-S3-Touch-LCD-1.85C board | 4 | €35–45 | €140–180 | | USB-C 5V/3A wall adapter | 4 | €7–12 | €28–48 | -| Fosi Audio V3 amp | 1 (confirmed) | €130 | €130 | -| Micca MB42X G2 speakers, pair | 1 (confirmed) | €100 | €100 | +| Fosi Audio V3 amp | 3 | €130 | €390 | +| Micca MB42X G2 speakers, pair | 3 | €100 | €300 | | 16AWG speaker wire, 100ft spool *(one-time)* | 1 | €15–22 | €15–22 | | 10.3" portable USB-C touchscreen monitor | 1 | €85–130 | €85–130 | | Logitech HD Pro Webcam C920 | 1 | €55–75 | €55–75 | -**Subtotal, confirmed need only (excludes the optional beamer mount): ~€799–1,010** -**Subtotal, including the optional beamer mount: ~€814–1,035** +**Subtotal (excludes the optional beamer mount): ~€1,259–1,470** +**Subtotal, including the optional beamer mount: ~€1,274–1,495** -Not included above — priced separately since they're conditional, not confirmed: - -| If confirmed | Qty | Est. unit price | Est. subtotal | -|---|---|---|---| -| Fosi Audio V3 amp + Micca MB42X G2 pair (Linus Room Sound System) | 1 kit | €230 | €230 | -| Fosi Audio V3 amp + Micca MB42X G2 pair (Kitchen Sound System) | 1 kit | €230 | €230 | - -**If both "?" Sound Systems are confirmed: add ~€460, for a grand total of -~€1,259–1,470.** Linus Room's still-blank "???" line isn't priced at all — there's -nothing to estimate until it's decided what it is. +Both previously-"?" Sound Systems (Linus Room, Kitchen) are now confirmed — see +`#Open items` above — so all 3 amp+speaker kits needed are in the main table, not a +separate conditional one. Linus Room's still-blank "???" line isn't priced at all — +there's nothing to estimate until it's decided what it is.