|
[-]
[+]
|
Changed |
_service:tar_git:jolla-hw-adaptation-cheeseburger.spec
|
|
|
|
[-]
[+]
|
Changed |
_service
^
|
| @@ -2,7 +2,7 @@
<service name="tar_git">
<param name="url">https://github.com/sailfishos-oneplus5/droid-config-cheeseburger.git</param>
<param name="branch">master</param>
- <param name="revision">b35bf78c76b9666903f8d7f30ee313a8e901cf62</param>
+ <param name="revision">91f721ed8036d38e07d54aa06ef18d33a450e8d3</param>
<param name="token"/>
<param name="debian">N</param>
<param name="dumb">N</param>
|
|
[-]
[+]
|
Deleted |
_service:tar_git:jolla-hw-adaptation-cheeseburger-1.1.0.4+master.20191207000135.2.gb35bf78.tar.gz/sparse/usr/lib/qt5/plugins/feedback/qtfeedback-memless.ini
^
|
| @@ -1,18 +0,0 @@
-ACTUATOR_SPIN_UP=2
-ACTUATOR_SPIN_DOWN=4
-ACTUATOR_RUMBLE_MIN=8191
-ACTUATOR_RUMBLE_MAX=32767
-ACTUATOR_MAGNITUDE_MAX=16000
-ACTUATOR_MAGNITUDE_MEAN=12000
-LONG_PRESS_DURATION=250
-LONG_PRESS_DELAY=4
-LONG_PRESS_MAX=16384
-LONG_PRESS_MIN=8191
-BUTTON_PRESS_DURATION=35
-BUTTON_PRESS_DELAY=4
-BUTTON_PRESS_MAX=24576
-BUTTON_PRESS_MIN=20478
-KEYPAD_PRESS_DURATION=23
-KEYPAD_PRESS_DELAY=4
-KEYPAD_PRESS_MAX=32767
-KEYPAD_PRESS_MIN=32767
|
|
[-]
[+]
|
Deleted |
_service:tar_git:jolla-hw-adaptation-cheeseburger-1.1.0.4+master.20191207000135.2.gb35bf78.tar.gz/sparse/usr/share/ngfd/plugins.d/ngf-vibra-memless.ini
^
|
| @@ -1,133 +0,0 @@
-[ffmemless]
-
-# System wide effect settings file evironment variable.
-# The if there are parameters for any effects in the system settings file
-# pointed by the given environment variable, they will override the effect
-# settings for those effects. Other effects remain unchanged.
-system_effects_env = NGF_FFMEMLESS_SETTINGS
-
-# EXAMPLE: re-define NGF_SHORT in system settings file
-# export NGF_FFMEMLESS_SETTINGS=/path/to/my/feedback.ini
-# contents of "feedback.ini" would look like this
-#[ffmemless]
-#NGF_SHORT_TYPE = rumble
-#NGF_SHORT_DURATION = 110
-#NGF_SHORT_DELAY = 1
-#NGF_SHORT_MAGNITUDE = 56000
-#
-# Please note that the [ffmemless] tag is needed for glib to find the effects.
-# Now this will change the NGF_SHORT settings to what they are above.
-
-
-# All effect names must be listed here, otherwise they don't get created
-supported_effects = NGF_SHORT;NGF_LONG;NGF_STRONG;NGF_BATTERYLOW;NGF_RINGTONE;NGF_CLOCK;NGF_SMS
-
-# Setting up the effect parameters.
-# - The only mandatory parameter is _TYPE, if it's missing effect is not created
-# - Full list of valid parameter value ranges below
-#
-# - Generic parameters for all effect types
-#
-# _TYPE = [rumble|periodic], no default, mandatory parameter
-# _DIRECTION = [forward|reverse], defaults to forward
-# _DURATION = [0,65535], milliseconds, defaults to NGF_DEFAULT_DURATION
-# _DELAY = [0,65535], milliseconds before starting playback, defaults to 0
-#
-# _REPEAT = [1,4294967295], how many times to repeat effect, defaults to 1
-# Please note that if the event has "sound.repeat" enabled,
-# the effect is repeated until stop signal regardless of _REPEAT
-# value.
-#
-# - Type specific parameters for rumble effects:
-#
-# _MAGNITUDE = [0,65535], defaults to NGF_DEFAULT_RMAGNITUDE
-#
-# -Type specific parameters for periodic effects
-#
-# _WAVEFORM = [sine|triangle|square], defaults to sine
-# _PERIOD = [0,65535], defaults to 0
-# _MAGNITUDE = [0,32767], defaults to NGF_DEFAULT_PMAGNITUDE
-# _OFFSET = [0,32767], defaults to 0
-# _PHASE = [0,65535], in milliseconds, defaults to 0
-# _ATTACK = [0,65535], in milliseconds, defaults to 0
-# _ALEVEL = [0,32767], defaults to 0
-# _FADE = [0,65535], in milliseconds, defaults to 0
-# _FLEVEL = [0,32767], defaults to 0
-
-NGF_SHORT_TYPE = rumble
-NGF_SHORT_DURATION = 240
-NGF_SHORT_DELAY = 0
-NGF_SHORT_MAGNITUDE = 27000
-
-NGF_LONG_TYPE = periodic
-NGF_LONG_WAVEFORM = sine
-NGF_LONG_DURATION = 850
-NGF_LONG_PERIOD = 150
-NGF_LONG_MAGNITUDE = 15383
-NGF_LONG_ATTACK = 0
-NGF_LONG_ALEVEL = 0
-NGF_LONG_FADE = 180
-NGF_LONG_FLEVEL = 0
-
-NGF_STRONG_TYPE = rumble
-NGF_STRONG_DURATION = 320
-NGF_STRONG_DELAY = 0
-NGF_STRONG_MAGNITUDE = 65535
-
-NGF_BATTERYLOW_TYPE = periodic
-NGF_BATTERYLOW_WAVEFORM = sine
-NGF_BATTERYLOW_DURATION = 120
-NGF_BATTERYLOW_REPEAT = 2
-NGF_BATTERYLOW_DELAY = 40
-NGF_BATTERYLOW_PERIOD = 150
-NGF_BATTERYLOW_MAGNITUDE = 19383
-NGF_BATTERYLOW_OFFSET = 0
-NGF_BATTERYLOW_PHASE = 0
-NGF_BATTERYLOW_DIRECTION = forward
-NGF_BATTERYLOW_ATTACK = 0
-NGF_BATTERYLOW_ALEVEL = 0
-NGF_BATTERYLOW_FADE = 180
-NGF_BATTERYLOW_FLEVEL = 0
-
-NGF_SMS_TYPE = periodic
-NGF_SMS_WAVEFORM = sine
-NGF_SMS_DURATION = 240
-NGF_SMS_REPEAT = 2
-NGF_SMS_DELAY = 140
-NGF_SMS_PERIOD = 50
-NGF_SMS_MAGNITUDE = 27000
-NGF_SMS_OFFSET = 0
-NGF_SMS_PHASE = 0
-NGF_SMS_DIRECTION = forward
-NGF_SMS_ATTACK = 0
-NGF_SMS_ALEVEL = 0
-NGF_SMS_FADE = 80
-NGF_SMS_FLEVEL = 0
-
-NGF_RINGTONE_TYPE = periodic
-NGF_RINGTONE_WAVEFORM = sine
-NGF_RINGTONE_DURATION = 2400
-NGF_RINGTONE_DELAY = 400
-NGF_RINGTONE_PERIOD = 100
-NGF_RINGTONE_MAGNITUDE = 16383
-NGF_RINGTONE_OFFSET = 0
-NGF_RINGTONE_PHASE = 0
-NGF_RINGTONE_DIRECTION = forward
-NGF_RINGTONE_ATTACK = 500
-NGF_RINGTONE_ALEVEL = 2560
-NGF_RINGTONE_FADE = 300
-NGF_RINGTONE_FLEVEL = 4096
-
-NGF_CLOCK_TYPE = periodic
-NGF_CLOCK_WAVEFORM = sine
-NGF_CLOCK_DURATION = 4000
-NGF_CLOCK_DELAY = 500
-NGF_CLOCK_PERIOD = 100
-NGF_CLOCK_MAGNITUDE = 8000
-NGF_CLOCK_OFFSET = 0
-NGF_CLOCK_PHASE = 0
-NGF_CLOCK_DIRECTION = forward
-NGF_CLOCK_ATTACK = 1000
-NGF_CLOCK_ALEVEL = 0
-NGF_CLOCK_FADE = 400
-NGF_CLOCK_FLEVEL = 0
|
|
[-]
[+]
|
Deleted |
_service:tar_git:jolla-hw-adaptation-cheeseburger-1.1.0.4+master.20191207000135.2.gb35bf78.tar.gz/sparse/var/lib/environment/nemo/60-vibra-memless.conf
^
|
| @@ -1,2 +0,0 @@
-FF_MEMLESS_SETTINGS=/usr/lib/qt5/plugins/feedback/qtfeedback-onyx.ini
-NGF_FFMEMLESS_SETTINGS=/usr/share/ngfd/plugins.d/ngf-vibra-onyx.ini
|
|
[-]
[+]
|
Changed |
_service:tar_git:jolla-hw-adaptation-cheeseburger-1.1.1.tar.gz/kickstart/pack_package-droid-updater
^
|
| @@ -16,6 +16,9 @@
exit 1
fi
+# Make sure we have 'bc' to estimate rootfs size
+zypper --non-interactive in bc &> /dev/null
+
# Roughly estimate the final rootfs size when installed
IMAGE_SIZE=`echo "scale=2; 2.25 * $(du -h $GEN_IMG_BASE.tar.bz2 | cut -d'M' -f1)" | bc`
echo "[hybris-installer] Estimated rootfs size when installed: ${IMAGE_SIZE}M"
@@ -24,6 +27,11 @@
DST_IMG=sfos-rootfs.tar.bz2
DST_PKG=$ID-$VERSION_ID-$DATE-$DEVICE$EXTRA_NAME # sailfishos-3.2.0.12-20191101-$DEVICE
+# Clone hybris-installer if not preset (e.g. porters-ci build env)
+if [ ! -d ../hybris/hybris-installer/ ]; then
+ git clone --depth 1 https://github.com/sailfishos-oneplus5/hybris-installer ../hybris/hybris-installer > /dev/null
+fi
+
# Copy rootfs & hybris-installer scripts into updater .zip tree
mkdir updater/
mv $GEN_IMG_BASE.tar.bz2 updater/$DST_IMG
|
|
[-]
[+]
|
Added |
_service:tar_git:jolla-hw-adaptation-cheeseburger-1.1.1.tar.gz/sparse/etc/systemd/user/ngfd.service
^
|
| @@ -0,0 +1,13 @@
+[Unit]
+Description=Non-Graphic Feedback Daemon
+Requires=dbus.socket
+After=pre-user-session.target
+
+[Service]
+EnvironmentFile=-/etc/sysconfig/ngfd
+ExecStartPre=/bin/sleep 1
+ExecStart=/usr/bin/ngfd $NGFD_ARGS
+Restart=always
+
+[Install]
+WantedBy=user-session.target
|
|
[-]
[+]
|
Added |
_service:tar_git:jolla-hw-adaptation-cheeseburger-1.1.1.tar.gz/sparse/etc/systemd/user/user-session.target.wants/ngfd.service
^
|
| +(symlink to ../ngfd.service)
|
|
[-]
[+]
|
Changed |
_service:tar_git:jolla-hw-adaptation-cheeseburger.inc
^
|
| @@ -30,7 +30,8 @@
Requires: hybris-libsensorfw-qt5
# Vibra
-Requires: qt5-feedback-haptics-ffmemless
+Requires: ngfd-plugin-native-vibrator
+Requires: qt5-feedback-haptics-native-vibrator
# Needed for /dev/touchscreen symlink
Requires: qt5-plugin-generic-evdev
|
