Updated to 20200322HEADmaster

3 files changed, 38 insertions, 21 deletions

diff --git a/PKGBUILD b/PKGBUILD
index b258398..5dda6ea 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -8,15 +8,16 @@ pkgname=pinebookpro-post-install
 pkgver=20200213
 pkgrel=1
 pkgdesc="Manjaro ARM's Pinebook Pro install files"
-arch=('any')
+arch=('aarch64')
 url="https://www.manjaro.org"
 conflicts=('pinebook-post-install')
 license=('GPL')
+depends=('pinebookpro-audio')
 source=("10-usb-kbd.hwdb"
         "asound.state")
 install=${pkgname}.install
 b2sums=('c321247196a8194e944ac311ec2f0d8186c8d5eaf0af409f36ac2cc7d0c5a9869e1bb87aa69e06d1412a4e2ed4b6821fe2320c499b35c1000678b1ff8df7a996'
-        'ae363d3f5e3222a7e3574920e5d340f439a5394f7f3bf2ddf5be74c43b6faa9e8ec5f296d2ac57718e8bda7b7ddbc3583115247de1719ed8ea6ab598d6eaedf3')
+        'efb11a43aaf68c8860aae71be4bbe614ea977ad010da2e438c993173aaf66a1fbc41c28ef99f6412d6f6f1263666848ba64522a94447b2a586a303aac5910dff')
 
 package() {
     install -Dm644 "${srcdir}/10-usb-kbd.hwdb" -t "${pkgdir}/etc/udev/hwdb.d/"
diff --git a/asound.state b/asound.state
index 690c0f1..c719b8a 100644
--- a/asound.state
+++ b/asound.state
@@ -28,8 +28,8 @@ state.rockchipes8316c {
 	control.3 {
 		iface MIXER
 		name 'Headphone Mixer Volume'
-		value.0 0
-		value.1 0
+		value.0 11
+		value.1 11
 		comment {
 			access 'read write'
 			type INTEGER
@@ -37,8 +37,8 @@ state.rockchipes8316c {
 			range '0 - 11'
 			dbmin -1200
 			dbmax 0
-			dbvalue.0 -1200
-			dbvalue.1 -1200
+			dbvalue.0 0
+			dbvalue.1 0
 		}
 	}
 	control.4 {
@@ -319,6 +319,16 @@ state.rockchipes8316c {
 		}
 	}
 	control.28 {
+        iface MIXER
+        name 'Speaker Switch'
+        value true
+        comment {
+            access 'read write'
+            type BOOLEAN
+            count 1
+        }
+		}
+    control.29 {
 		iface MIXER
 		name 'Differential Mux'
 		value lin1-rin1
@@ -332,7 +342,7 @@ state.rockchipes8316c {
 			item.3 'lin2-rin2 with 20db Boost'
 		}
 	}
-	control.29 {
+	control.30 {
 		iface MIXER
 		name 'Digital Mic Mux'
 		value 'dmic disable'
@@ -345,7 +355,7 @@ state.rockchipes8316c {
 			item.2 'dmic data at low level'
 		}
 	}
-	control.30 {
+	control.31 {
 		iface MIXER
 		name 'DAC Source Mux'
 		value 'LDATA TO LDAC, RDATA TO RDAC'
@@ -359,7 +369,7 @@ state.rockchipes8316c {
 			item.3 'RDATA TO LDAC, LDATA TO RDAC'
 		}
 	}
-	control.31 {
+	control.32 {
 		iface MIXER
 		name 'Left Headphone Mux'
 		value lin1-rin1
@@ -373,7 +383,7 @@ state.rockchipes8316c {
 			item.3 'lin-rin with Boost and PGA'
 		}
 	}
-	control.32 {
+	control.33 {
 		iface MIXER
 		name 'Right Headphone Mux'
 		value lin1-rin1
@@ -387,7 +397,7 @@ state.rockchipes8316c {
 			item.3 'lin-rin with Boost and PGA'
 		}
 	}
-	control.33 {
+	control.34 {
 		iface MIXER
 		name 'Left Headphone Mixer LLIN Switch'
 		value false
@@ -397,7 +407,7 @@ state.rockchipes8316c {
 			count 1
 		}
 	}
-	control.34 {
+	control.35 {
 		iface MIXER
 		name 'Left Headphone Mixer Left DAC Switch'
 		value true
@@ -407,7 +417,7 @@ state.rockchipes8316c {
 			count 1
 		}
 	}
-	control.35 {
+	control.36 {
 		iface MIXER
 		name 'Right Headphone Mixer RLIN Switch'
 		value false
@@ -417,7 +427,7 @@ state.rockchipes8316c {
 			count 1
 		}
 	}
-	control.36 {
+	control.37 {
 		iface MIXER
 		name 'Right Headphone Mixer Right DAC Switch'
 		value true
diff --git a/pinebookpro-post-install.install b/pinebookpro-post-install.install
index 5d1f394..6e3a4c4 100644
--- a/pinebookpro-post-install.install
+++ b/pinebookpro-post-install.install
@@ -1,8 +1,14 @@
- post_install() {
-  # Edit the sleep.conf file
-  sed -i s/"#SuspendState=mem standby freeze"/SuspendState=freeze/g /etc/systemd/sleep.conf
-}
- 
- post_upgrade() {
-  post_install
+  post_install() {
+    #  Enable suspend2idle
+    sed -i s/"#SuspendState=mem standby freeze"/"SuspendState=freeze"/g /etc/systemd/sleep.conf
+
+    # Edit fstab
+    echo "LABEL=BOOT  /boot   vfat    defaults        0       0" >> /etc/fstab
+
+    # Enable services
+    systemctl enable acpid.service
+
+  post_upgrade() {
+    # Enable acpid
+    systemctl enable acpid.service
 }