diff --git a/src/pug/_device_selector.pug b/src/pug/_selector.pug similarity index 68% rename from src/pug/_device_selector.pug rename to src/pug/_selector.pug index 18c1af4..94eff99 100644 --- a/src/pug/_device_selector.pug +++ b/src/pug/_selector.pug @@ -1,23 +1,26 @@ - const active = (bool) => bool ? 'active' : 'inactive' -br -//- h1.primary -//- a(class=active(SECTION=='alpakka') href='/alpakka') Alpakka -//- a(class=active(SECTION=='kapybara') href='/kapybara') Kapybara -//- a(class=active(SECTION=='marmota') href='/marmota') Marmota if SECTION == 'alpakka' + h1.primary Alpakka 1 h1.secondary a.sub(class=active(PAGE=='alpakka') href='/alpakka') Overview a.sub(class=active(SECTION_2=='manual') href=redirect.alpakkaManual) Manual a.sub(class=active(PAGE=='gallery') href='/alpakka/gallery') Gallery a.sub(class=active(PAGE=='components') href='/alpakka/components') Components +if SECTION == 'alpakka_2' + h1.primary Alpakka 2 + h1.secondary + a.sub(class=active(PAGE=='alpakka_2') href='/alpakka_2') Overview + a.sub(class=active(PAGE=='specs') href='/alpakka_2/specs') Specs + + if SECTION == 'kapybara' - br + h1 Kapybara //- h1.secondary //- a.sub(class=active(PAGE=='kapybara') href='/kapybara') Overview if SECTION == 'marmota' - br + h1 Marmota diff --git a/src/pug/alpakka.pug b/src/pug/alpakka.pug index 5905bbb..8e98c71 100644 --- a/src/pug/alpakka.pug +++ b/src/pug/alpakka.pug @@ -4,7 +4,7 @@ block title | Alpakka controller block page - include _device_selector.pug + include _selector.pug div.boxes.grid div.box diff --git a/src/pug/alpakka/components.pug b/src/pug/alpakka/components.pug index 36f827f..ced324a 100644 --- a/src/pug/alpakka/components.pug +++ b/src/pug/alpakka/components.pug @@ -4,7 +4,7 @@ block title | Alpakka components block page - include ../_device_selector.pug + include ../_selector.pug div.boxes.grid diff --git a/src/pug/alpakka/gallery.pug b/src/pug/alpakka/gallery.pug index 1b8eb6d..b193b8e 100644 --- a/src/pug/alpakka/gallery.pug +++ b/src/pug/alpakka/gallery.pug @@ -4,7 +4,7 @@ block title | Alpakka images and videos block page - include ../_device_selector.pug + include ../_selector.pug mixin boximg(src) div.box.image diff --git a/src/pug/alpakka/manual/_manual.pug b/src/pug/alpakka/manual/_manual.pug index 3ff54ec..bd96596 100644 --- a/src/pug/alpakka/manual/_manual.pug +++ b/src/pug/alpakka/manual/_manual.pug @@ -6,7 +6,7 @@ block title | block page - include ../../_device_selector.pug + include ../../_selector.pug mixin home img(src='/static/manual/button_home.svg' height='14px') diff --git a/src/pug/alpakka_2.pug b/src/pug/alpakka_2.pug index 4d73a5e..cf2430c 100644 --- a/src/pug/alpakka_2.pug +++ b/src/pug/alpakka_2.pug @@ -4,7 +4,7 @@ block title | Alpakka 2 block page - h1 Alpakka 2 + include _selector.pug mixin boximg(src) div.box.image diff --git a/src/pug/alpakka_2/specs.pug b/src/pug/alpakka_2/specs.pug index aff6c34..8ba285d 100644 --- a/src/pug/alpakka_2/specs.pug +++ b/src/pug/alpakka_2/specs.pug @@ -4,44 +4,82 @@ block title | Alpakka 2 specs block page - h1 Alpakka 2 specs + include ../_selector.pug mixin boximg(src) div.box.image a.img(href=src target='_blank') img(src=src) + div.boxes.grid div.box - h2 New on Alpakka 2 + h2 Input ul - li 4 high quality IMU sensors (working in parallel). - li 2 full-size thumbsticks. - li 2 scroll-wheels (mouse-like). - li Display for profile preview and config. - li Injection molded case and buttons in the PRO version. - li 1000 hz polling rate wired (~0.5 milliseconds latency) + li Single-piece cross dpad. + li 4 Face buttons (ABXY) with Thumb-sense touch surface. + li 4 Select/start buttons. + li 2 High quality thumbsticks. + li 2 Scrollwheels (mouse-like). + li 2 Bumper buttons. + li 2 Swappable triggers (mouse-like click or analog). + li 4 Back buttons. + li: i [We will investigate using mechanical switches] + li: i [We will investigate using hall-effect / TMR thumbsticks] div.box - h2 Inherited from Alpakka 1.0 + h2 Output ul - li Open source app with Linux support. (#[+a('/alpakka/manual/ctrl_app') Ctrl app features]) - li Thumb touch surface for gyro engage/disengage. - li Wireless dongle with low-latency 2.4 GHz protocol. - li 12 customizable profile slots (8 built-in + 4 custom) in the controller memory. - li Compatible with 100% games and launchers. + li 1000 hz polling rate wired (~0.5 ms latency). + li Wireless dongle with 2.4 GHz protocol (~2 ms latency). + li OLED 128x64 display for profile preview and config. li USB-C connector. - li Rechargeable 1200 mAh LiPo battery. - li No drivers required (detected as HID mouse, HID keyboard, and XInput or generic gamepad). + li Multi-protocol output. + ul + li HID mouse. + li HID keyboard. + li HID gamepad / DirectInput (+generic steering wheel). + li XInput gamepad (Compatible with Steam Input). + + div.box + h2 Firmware + ul + li 12 customizable profile slots in the controller memory. + li Compatible with 100% games and launchers. + li No drivers required. + li Operating System support: + ul + li Windows 10/11. + li GNU/Linux (distros with xpad). + li Android (limited support / experimental). + li Steam Deck / Steam Machine. div.box - h2 To be tested in development - p: b: i (Not confirmed) + h2 App ul - li Hall effect / TMR thumbsticks. - li Mechanical switch buttons. - li Final arrangement of back paddles. - li Dual-action triggers (digital and analog). - li Low-poly / classic Alpakka case for the DIY version (to be decided). + li Available on browsers or as PWA native-like app. + li Cross-device mappings (mouse, keyboard, gamepad). + li Long-press and double-press mappings. + li Gyro touch-on and touch-off modes assignable to thumb-sense or any button. + li Gyro steering-wheel and plane-joystick modes. + li Thumbstick deadzone, anti-deadzone, and saturation. + li Thumbstick 4 and 8 button-pad modes. + li Glyphstick and daisywheel keyboard typing modes. + li Many more #[+a('/alpakka/manual/ctrl_app') Ctrl app features]. + + div.box + h2 Internals + ul + li 4 high quality IMU sensors (working in parallel). + li Rechargeable 1200 mAh LiPo battery. + li Raspberry RP2350 microcontroller: + ul + li 150 MHz core frequency. + li 520 KB of SRAM. + li FPU co-processor (floating point unit). + li 2 ARM Cortex-M33 cores. + li 2 RISC-V Hazard3 cores. +boximg('/static/gallery/alpakka_2_label.jpg') + + div: b: i *All specs are subject to change diff --git a/src/pug/kapybara.pug b/src/pug/kapybara.pug index 6d6c69e..1b0e224 100644 --- a/src/pug/kapybara.pug +++ b/src/pug/kapybara.pug @@ -4,7 +4,7 @@ block title | Kapybara controller block page - include _device_selector.pug + include _selector.pug div.boxes.grid div.box diff --git a/src/pug/marmota.pug b/src/pug/marmota.pug index e947436..56d018d 100644 --- a/src/pug/marmota.pug +++ b/src/pug/marmota.pug @@ -4,7 +4,7 @@ block title | Marmota core block page - include _device_selector.pug + include _selector.pug //- div.warning.boxes //- div: span MARMOTA REFERENCE DESIGN IS NOT YET FINAL diff --git a/src/static/style.css b/src/static/style.css index 5f7501a..8a9b3d8 100644 --- a/src/static/style.css +++ b/src/static/style.css @@ -194,9 +194,9 @@ h1.dynamic { font-size: 24px; } h1.primary { - margin-top: 15px; - margin-bottom: 10px; - font-size: 28px; + margin-bottom: 0px; + /* margin-top: 15px; */ + /* font-size: 28px; */ } h1.secondary { margin-top: 0px;