Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Added suport for Jacuzzi juniper (Acer Spin C311 Chromebook) #62

Open
wants to merge 6 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5,795 changes: 5,795 additions & 0 deletions baseboard/kukui/kernel-config-jacuzzi

Large diffs are not rendered by default.

14 changes: 14 additions & 0 deletions baseboard/kukui/kernel.its
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,16 @@
algo = "sha1";
};
};
fdt@3{
description = "mt8183-kukui-jacuzzi-juniper-sku16.dtb";
data = /incbin/("arch/arm64/boot/dts/mediatek/mt8183-kukui-jacuzzi-juniper-sku16.dtb");
type = "flat_dt";
arch = "arm64";
compression = "none";
hash@1{
algo = "sha1";
};
};
};
configurations {
default = "conf@1";
Expand All @@ -43,5 +53,9 @@
kernel = "kernel@1";
fdt = "fdt@2";
};
conf@3{
kernel = "kernel@1";
fdt = "fdt@3";
};
};
};
2 changes: 2 additions & 0 deletions board/jacuzzi-juniper/accel-matrix.hwdb
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
sensor:modalias:platform:*
ACCEL_MOUNT_MATRIX=0, 1, 0; -1, 0, 0; 0, 0, -1
8 changes: 8 additions & 0 deletions board/jacuzzi-juniper/boardinfo
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
#!/bin/false

# explanation is in HACKING.md
# arch missing? go to baseboard/$BASEBOARD/boardinfo

export BASEBOARD=kukui
export BOARD=jacuzzi-juniper
export TYPE=convertible-laptop
4 changes: 4 additions & 0 deletions board/jacuzzi-juniper/libinput-quirk
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
[Google Chromebook Duet]
MatchUdevType=touchpad
ModelChromebook=1
AttrPressureRange=20:10
232 changes: 232 additions & 0 deletions board/jacuzzi-juniper/sway-config
Original file line number Diff line number Diff line change
@@ -0,0 +1,232 @@
# Default config for sway
#
# Copy this to ~/.config/sway/config and edit it to your liking.
#
# Read `man 5 sway` for a complete reference.

output DSI-1 scale 1.3 transform 270
input type:touch map_to_output DSI-1
input type:touchpad click_method clickfinger

# this is for Lenovo's USI pen
input 10182:3632:hid-over-i2c_27C6:0E30 map_to_output DSI-1

bindsym Mod4+F6 exec brightnessctl s 5%-
bindsym Mod4+F7 exec brightnessctl s 5%+

default_border pixel 1

### Variables
#
# Logo key. Use Mod1 for Alt.
set $mod Mod1
# Home row direction keys, like vim
set $left h
set $down j
set $up k
set $right l
# Your preferred terminal emulator
set $term xfce4-terminal
# Your preferred application launcher
# Note: pass the final command to swaymsg so that the resulting window can be opened
# on the original workspace that the command was run on.
set $menu dmenu_path | dmenu | xargs swaymsg exec --

include /etc/sway/config-vars.d/*

### Output configuration
#
# Default wallpaper (more resolutions are available in /usr/share/backgrounds/sway/)
output * bg /usr/share/backgrounds/sway/Sway_Wallpaper_Blue_1920x1080.png fill
#
# Example configuration:
#
# output HDMI-A-1 resolution 1920x1080 position 1920,0
#
# You can get the names of your outputs by running: swaymsg -t get_outputs

### Idle configuration
#
# Example configuration:
#
# exec swayidle -w \
# timeout 300 'swaylock -f -c 000000' \
# timeout 600 'swaymsg "output * dpms off"' resume 'swaymsg "output * dpms on"' \
# before-sleep 'swaylock -f -c 000000'
#
# This will lock your screen after 300 seconds of inactivity, then turn off
# your displays after another 300 seconds, and turn your screens back on when
# resumed. It will also lock your screen before your computer goes to sleep.

### Input configuration
#
# Example configuration:
#
# input "2:14:SynPS/2_Synaptics_TouchPad" {
# dwt enabled
# tap enabled
# natural_scroll enabled
# middle_emulation enabled
# }
#
# You can get the names of your inputs by running: swaymsg -t get_inputs
# Read `man 5 sway-input` for more information about this section.

### Key bindings
#
# Basics:
#
# Start a terminal
bindsym $mod+Return exec $term

# Kill focused window
bindsym $mod+Shift+q kill

# Start your launcher
bindsym $mod+d exec $menu

# Drag floating windows by holding down $mod and left mouse button.
# Resize them with right mouse button + $mod.
# Despite the name, also works for non-floating windows.
# Change normal to inverse to use left mouse button for resizing and right
# mouse button for dragging.
floating_modifier $mod normal

# Reload the configuration file
bindsym $mod+Shift+c reload

# Exit sway (logs you out of your Wayland session)
bindsym $mod+Shift+e exec swaynag -t warning -m 'You pressed the exit shortcut. Do you really want to exit sway? This will end your Wayland session.' -b 'Yes, exit sway' 'swaymsg exit'
#
# Moving around:
#
# Move your focus around
bindsym $mod+$left focus left
bindsym $mod+$down focus down
bindsym $mod+$up focus up
bindsym $mod+$right focus right
# Or use $mod+[up|down|left|right]
bindsym $mod+Left focus left
bindsym $mod+Down focus down
bindsym $mod+Up focus up
bindsym $mod+Right focus right

# Move the focused window with the same, but add Shift
bindsym $mod+Shift+$left move left
bindsym $mod+Shift+$down move down
bindsym $mod+Shift+$up move up
bindsym $mod+Shift+$right move right
# Ditto, with arrow keys
bindsym $mod+Shift+Left move left
bindsym $mod+Shift+Down move down
bindsym $mod+Shift+Up move up
bindsym $mod+Shift+Right move right
#
# Workspaces:
#
# Switch to workspace
bindsym $mod+1 workspace number 1
bindsym $mod+2 workspace number 2
bindsym $mod+3 workspace number 3
bindsym $mod+4 workspace number 4
bindsym $mod+5 workspace number 5
bindsym $mod+6 workspace number 6
bindsym $mod+7 workspace number 7
bindsym $mod+8 workspace number 8
bindsym $mod+9 workspace number 9
bindsym $mod+0 workspace number 10
# Move focused container to workspace
bindsym $mod+Shift+1 move container to workspace number 1
bindsym $mod+Shift+2 move container to workspace number 2
bindsym $mod+Shift+3 move container to workspace number 3
bindsym $mod+Shift+4 move container to workspace number 4
bindsym $mod+Shift+5 move container to workspace number 5
bindsym $mod+Shift+6 move container to workspace number 6
bindsym $mod+Shift+7 move container to workspace number 7
bindsym $mod+Shift+8 move container to workspace number 8
bindsym $mod+Shift+9 move container to workspace number 9
bindsym $mod+Shift+0 move container to workspace number 10
# Note: workspaces can have any name you want, not just numbers.
# We just use 1-10 as the default.
#
# Layout stuff:
#
# You can "split" the current object of your focus with
# $mod+b or $mod+v, for horizontal and vertical splits
# respectively.
bindsym $mod+b splith
bindsym $mod+v splitv

# Switch the current container between different layout styles
bindsym $mod+s layout stacking
bindsym $mod+w layout tabbed
bindsym $mod+e layout toggle split

# Make the current focus fullscreen
bindsym $mod+f fullscreen

# Toggle the current focus between tiling and floating mode
bindsym $mod+Shift+space floating toggle

# Swap focus between the tiling area and the floating area
bindsym $mod+space focus mode_toggle

# Move focus to the parent container
bindsym $mod+a focus parent
#
# Scratchpad:
#
# Sway has a "scratchpad", which is a bag of holding for windows.
# You can send windows there and get them back later.

# Move the currently focused window to the scratchpad
bindsym $mod+Shift+minus move scratchpad

# Show the next scratchpad window or hide the focused scratchpad window.
# If there are multiple scratchpad windows, this command cycles through them.
bindsym $mod+minus scratchpad show
#
# Resizing containers:
#
mode "resize" {
# left will shrink the containers width
# right will grow the containers width
# up will shrink the containers height
# down will grow the containers height
bindsym $left resize shrink width 10px
bindsym $down resize grow height 10px
bindsym $up resize shrink height 10px
bindsym $right resize grow width 10px

# Ditto, with arrow keys
bindsym Left resize shrink width 10px
bindsym Down resize grow height 10px
bindsym Up resize shrink height 10px
bindsym Right resize grow width 10px

# Return to default mode
bindsym Return mode "default"
bindsym Escape mode "default"
}
bindsym $mod+r mode "resize"

#
# Status Bar:
#
# Read `man 5 sway-bar` for more information about this section.
bar {
position bottom

# When the status_command prints a new line to stdout, swaybar updates.
# The default just shows the current date and time.
#status_command while date +'%Y-%m-%d %l:%M:%S %p'; do sleep 1; done
status_command while echo B: $(cat /sys/class/power_supply/sbs-*/capacity)\%, $(date --date="@$(cat /sys/class/power_supply/sbs-*/time_to_empty_avg)" +"%H:%m") \| T: $(date +'%d-%m-%Y %k:%M:%S'); do sleep 1; done

colors {
statusline #ffffff
background #323232
inactive_workspace #32323200 #32323200 #5c5c5c
}
}

include /etc/sway/config.d/*
47 changes: 47 additions & 0 deletions board/jacuzzi-juniper/xorg.conf
Original file line number Diff line number Diff line change
@@ -0,0 +1,47 @@
Section "Device"
Identifier "device"
Driver "modesetting"
Option "kmsdev" "/dev/dri/card1"
EndSection

Section "Monitor"
Identifier "monitor"
# Option "PreferredMode" "1024x768"
# Option "PreferredMode" "1280x1024"
# Option "PreferredMode" "1920x1080"
Option "DPMS" "false"
Option "Rotate" "left"
EndSection

Section "Screen"
Identifier "screen"
Device "device"
Monitor "monitor"
DefaultDepth 24
EndSection

Section "ServerLayout"
Identifier "serverlayout"
Option "StandbyTime" "0"
Option "SuspendTime" "0"
Option "OffTime" "0"
Option "BlankTime" "0"
EndSection

Section "ServerFlags"
Option "AutoAddGPU" "off"
Option "Debug" "dmabuf_capable"
EndSection

#Section "OutputClass"
# Identifier "panfrost"
# MatchDriver "mediatek"
# Driver "modesetting"
# Option "PrimaryGPU" "true"
#EndSection

#Section "OutputClass"
# Identifier "accel"
# MatchDriver "modesetting"
# Option "AccelMethod" "glamor"
#EndSection
5 changes: 3 additions & 2 deletions config
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,10 @@

# Target device
# It is sorta using codenames, but "krane" sounds stupid so i won't use it
# One of: bob, duet, kevin, minnie, speedy, lazor
# One of: bob, duet, kevin, minnie, speedy, lazor, jacuzzi-juniper

if [ "$RELEASE" = "" ]; then
TARGET=duet
TARGET=jacuzzi-juniper
else
TARGET=$RELEASE
fi
Expand Down
2 changes: 1 addition & 1 deletion kernel/build
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ cd $CADMIUMROOT/tmp/linux-$BASEBOARD

# TODO:
# make cadmium defconfig from: common-defconfig, soc-defconfig and board-defconfig
[ -f .config ] || cp $CADMIUMROOT/baseboard/$BASEBOARD/kernel-config .config
[ -f .config ] || cp $CADMIUMROOT/baseboard/$BASEBOARD/kernel-jacuzzi-config .config

if [ $KERNEL = libre ]; then
# it looks better this way
Expand Down