From 3084e84924c0f042c192a3877055f0e74c4a87cb Mon Sep 17 00:00:00 2001 From: sovanna Date: Thu, 1 Aug 2019 14:05:15 +0200 Subject: [PATCH] refactor(website): Updates milkymist --- content/about-us/office.md | 6 +- content/gateware/m1.md | 168 ++++++++++++---------- sass/css/_base.scss | 4 + templates/shortcodes/layout_card.html | 2 +- templates/shortcodes/layout_text_img.html | 4 + 5 files changed, 105 insertions(+), 79 deletions(-) diff --git a/content/about-us/office.md b/content/about-us/office.md index 87d0e32..132a5da 100644 --- a/content/about-us/office.md +++ b/content/about-us/office.md @@ -34,14 +34,14 @@ Those transportation options take you to King's Road, then see the directions be
-{% layout_card(src="images/directions_1@2x.png", imgbottom=true) %} +{% layout_card(src="images/directions_1@2x.png", imgbottom=true, rmcard=true) %} 1 When entering from King's Road, Pan Hoi Street looks like this. Go to the location of the red arrow: {% end %} -{% layout_card(src="images/directions_2@2x.png", imgbottom=true) %} +{% layout_card(src="images/directions_2@2x.png", imgbottom=true, rmcard=true) %}

2 Enter here: @@ -50,7 +50,7 @@ Those transportation options take you to King's Road, then see the directions be {% end %} -{% layout_card(src="images/directions_3@2x.png", imgbottom=true) %} +{% layout_card(src="images/directions_3@2x.png", imgbottom=true, rmcard=true) %}

3 Turn right here, walk a little bit, and M-Labs will be on your left: diff --git a/content/gateware/m1.md b/content/gateware/m1.md index 61b67aa..afff0b3 100644 --- a/content/gateware/m1.md +++ b/content/gateware/m1.md @@ -5,13 +5,9 @@ template = "page.html" +++ -{% layout_centered_content() %} +{% layout_text_img(src="images/m1.jpg", popup="images/m1_large.jpg", alt="", textleft=true) %} - - -{% end %} - -The Milkymist One is an experimental hardware appliance for live video effects. +##### The Milkymist One is an experimental hardware appliance for live video effects. The small 172x145x45mm device creates visualizations similar to those generated by the MilkDrop software, and enables you to mix them with live footage from a camera and interact using MIDI and DMX controllers. @@ -25,10 +21,12 @@ Under the hood, the Milkymist One is like a mini-computer running our Flickernoi But we did not stop at open source software. As a matter of fact, when this project started in August 2007, one of the goals was to open up chip design. Inside the device, which was launched in September 2011, the Flickernoise software is actually running on an open source CPU part of our own system-on-chip. +{% end %} -## Detailed specifications - +{% layout_text_img(src="images/m1_board.jpg", alt="") %} + +##### Detailed specifications - Multi-standard video input (PAL/SECAM/NTSC) - Two DMX512 (RS485) ports @@ -44,7 +42,12 @@ But we did not stop at open source software. As a matter of fact, when - RC-5 compatible infrared receiver - RS232 debug port -## Press +{% end %} + + +{% layout_centered_content(min_width=true, force_left=true, bg="background-image: url(/images/stripe.svg); background-repeat: no-repeat; background-size: auto 100%; padding-left: 40px;") %} + +##### Press - Create Digital Motion (10/02/2012): Milkymist is Digital Visual Synthesizer and Processor, Built as Sophisticated Open Source Hardware - MikroBitti (03/2012): Milkymist One -visualisaattori: Avointa vj-rautaa [FI] @@ -56,80 +59,89 @@ But we did not stop at open source software. As a matter of fact, when - Create Digital Motion (16/08/2010): Milkymist One, All-in-One Open Source VJ Workstation - Linux-Magazin (29/12/2009): 26c3: Bewegtbildgenerator Milkymist bald mit Ethernet und USB [DE] +{% end %} -## Buy a Milkymist One -We are no longer selling Milkymist One. If you want one, you can ask about buying a second-hand unit on the mailing list, or take the open source design files and manufacture it yourself. +{{ layout_separator_empty() }} -## Video + +{{ layout_separator(separator_title="Buy a Milkymist One", css="col-12 text-center mt-2 mb-2 mb-lg-5") }} + + +{% layout_centered_content(min_width=true, css="row d-flex align-items-center mt-5") %} + +##### We are no longer selling Milkymist One. + +If you want one, you can ask about buying a second-hand unit on the mailing list, or take the open source design files and manufacture it yourself. + +##### Video Unboxing the Milkymist One video synthesizer (YouTube) -## Screenshots +##### Screenshots - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +{% end %} -## Milkymist SoC +{% layout_text_img(src="images/jtagserialb.jpg", src2="images/jtagserialt.jpg", alt="", textleft=true) %} - - - - +##### Milkymist SoC The Milkymist SoC is at the core of the Milkymist One, implemented in the Spartan-6 FPGA. @@ -145,8 +157,12 @@ The SoC source distribution includes software libraries, the BIOS and the demons Milkymist SoC is phased out in favor of the more powerful [MiSoC](@/gateware/migen.md). +{% end %} -## Flickernoise + +{% layout_centered_content(min_width=true, force_left=true, css="row d-flex align-items-center mt-5 mb-5 hkstyleh5") %} + +##### Flickernoise Flickernoise is the video synthesis application developed for the Milkymist One and the Milkymist SoC. It renders hardware-accelerated visual effects comparable (and, to some extent, compatible) with those of MilkDrop 1.x, the popular audio visualization plug-in for Winamp. @@ -163,10 +179,12 @@ Flickernoise uses: - liboscparse, a variant of liblo, for OpenSoundControl communications. -## Credits +##### Credits Thanks to the many people who made Milkymist One possible - in no particular order: Sebastien Bourdeauducq (founder), Michael Walle (software), Adam Wang (production engineering), Uwe Bonnes, Werner Almesberger, Jon Phillips (evangelist), Yi Zhang (operations), Christophe Devine, Don Miller, John Lejeune, Wim Vandeputte, Xiangfu Liu (software), Wolfgang Spraul, Joachim roh Steiger (mechanical), Yanjun Luo (jtag-serial design), Lars-Peter Clausen, Cristian Paul (early adopter), Christopher Adams (logo design), Christiaan Virant (advice), Takeshi Matsuya (Linux port), Akuei Chen (smt), Anson Lin (layout), Vera Cheng (layout), Terry (pcb), Nick Chen (remote control), Eva Su (sourcing), Sean Xiao (sourcing), Elisha Tseng (xilinx fae), Henry de Beauchesne, Philip Sheu (nor flash), Arno Lin (vga connector), Sun Hung Kuang (jtag-serial smt), Aaron Lee (usb connector), Ruby Su (sourcing), Yunchao Xie (ccd camera), Xiaochun Lu (power supply), Cailin Dai (box design), Mr. Zhang (box making), Xianke Zhang (eva), Xin Cai (label printing), Ting Jiang (sticker making), Xiaopeng Li (silicone keyboard), Mr. Ba (audio, video cables), Dehua Xiao (ethernet cable), Miss Zhao (usb cable), Shen Chun Yi (package pickup Taipei)... Plus countless workers at dozens of suppliers and many more who created the free technology we were able to build upon. + +{% end %} diff --git a/sass/css/_base.scss b/sass/css/_base.scss index 92ade04..2508e99 100644 --- a/sass/css/_base.scss +++ b/sass/css/_base.scss @@ -219,4 +219,8 @@ ul:not(.navbar-nav) li { a[aria-expanded='true']:after { transform: rotate(-180deg); +} + +.hkstyleh5 h5 { + text-align: center; } \ No newline at end of file diff --git a/templates/shortcodes/layout_card.html b/templates/shortcodes/layout_card.html index c705f46..86e0a42 100644 --- a/templates/shortcodes/layout_card.html +++ b/templates/shortcodes/layout_card.html @@ -1,6 +1,6 @@

-
+
{% if not imgbottom %} diff --git a/templates/shortcodes/layout_text_img.html b/templates/shortcodes/layout_text_img.html index e1f47d6..9dd910a 100644 --- a/templates/shortcodes/layout_text_img.html +++ b/templates/shortcodes/layout_text_img.html @@ -16,6 +16,10 @@ {% if alt %}{{ alt }}{% endif %} {% endif %} + {% if src2 %} + {% if alt %}{{ alt2 }}{% endif %} + {% endif %} +