aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)AuthorFilesLines
2019-05-01Update avirt kernel module and libavirt userspace libraryMark Farrugia4-24/+32
Update the avirt core kernel module and the accompanying libavirt userspace library to the latest releases. The key new feature is a completed and finalized audio path routing system, enabling audio routing at the kernel level. Change-Id: I69eaa578390f4ba67ad71506c359276bee252b19 Signed-off-by: Mark Farrugia <mark.farrugia@fiberdyne.com.au>
2019-04-26chromium68, wam: bump revisionAntia Puentes2-5/+5
Bug-AGL: SPEC-2353 Change-Id: I2a62e76422a35b5a9c95fa310677199b8ca79146 Signed-off-by: Antia Puentes <apuentes@igalia.com>
2019-04-08Meta AGL Devel: Added files for meta-agl-devel overviewguppy_7.0.1guppy/7.0.17.0.1Scott Rifenbark2-3/+142
Change-Id: Iff35ee5277cbb3d15ea789b0c6488ac505c90327 Signed-off-by: Scott Rifenbark <srifenbark@gmail.com>
2019-02-18Bump the revision of agl-service-windowmanagerKazumasa Mitsunari1-4/+1
This commit bump revision of agl-service-windowmanager, and includes the followings 923df38 Add gitreview file for guppy branch a33cbe3 Add configuration file over-ride mechanism 1d09662 Fix misinterpreted return value 05b4c23 Make it easier to see journal log for debug ed7ed1f docs: add yaml book Change-Id: I57f7ff7f2590ffd02b666bfcd83c8e76482a1a70 Signed-off-by: Kazumasa Mitsunari <knimitz@witz-inc.co.jp>
2019-02-10Add recipe for libavirtMark Farrugia1-0/+19
The libavirt library is used to interface with the ALSA Virtual sound driver (AVIRT) from user-space. Users can dynamically create audio streams and PCMs from user-space using this utility. Change-Id: Ib294911722c8fd1a064022bafd2c1123c0869b92 Signed-off-by: Mark Farrugia <mark.farrugia@fiberdyne.com.au>
2019-02-08agl-service-windowmanager: add weston-ready systemd dependencyguppy_7.0.0guppy/7.0.07.0.0Scott Murray2-1/+19
Add installation of systemd over-ride configuration that adds a dependency on weston-ready to ensure that the windowmanager and its dependencies start after weston is actually initialized. In testing, this seems to resolve the issue of homescreen and launcher failing to start in situations such as when using MOST audio and/or the gst-record feature in Weston. Bug-AGL: SPEC-2115 Change-Id: Id15045357f30d3f447037026d0ab960ae2569d69 Signed-off-by: Scott Murray <scott.murray@konsulko.com> (cherry picked from commit 7650fff17bd502e80feb28dc9bf5927bc5ecf52c) Signed-off-by: Jan-Simon Möller <jsmoeller@linuxfoundation.org>
2019-02-07libwindowmanager: bump revisionguppy_6.99.5guppy/6.99.56.99.5Stephane Desneux1-1/+1
Included changes: * 42dbcc0 Improve integration of callsync * bab3af6 Add gitreview file for guppy branch Bug-AGL: SPEC-2130 Change-Id: Ib6f93a728dafe2dbaca6324ade3e69f9cd33b339 Signed-off-by: Stephane Desneux <stephane.desneux@iot.bzh>
2019-02-074a-softmixer: bump to latest versionThierry Bultel1-1/+1
This brings the following commits: 67299f9: bluetooth sco: fixed the softvol open error e28d321: Prevents setting of ALSA controls out-of-range 739ff0e: Correct sent back stream volume Change-Id: I5d22f3b76693810c0327e404dc7898e23bebe7b9 Signed-off-by: Thierry Bultel <thierry.bultel@iot.bzh> (cherry picked from commit 634b20a2448d103c991844919cb0a094d2d990b3)
2019-02-074a-hal-generic: bump to latest revision (+ add missing deps)Stephane Desneux1-2/+2
Included changes: * 27e0c1b bluealsa plugin: monitor the state of service via dbus * 01a186a Add gitreview file for guppy branch * 2b558bb Migrate to newer application framework calls * 20a22fa Migrate app-controller from submodule to library * 9f6a13d Migrate afb-helpers from submodule to library * 756f8d0 Move from controller functions to afb functions * 524ad81 Create 'halmap' ALSA controls events earlier * 9ea8f82 Add event to indicate hal stream changes * 5f5c1a6 Improve stream creation/deletion functions * e3f74a9 Use linked-list to handle hal stream list * 4f44ee8 Turn '4a-hal-utilities' into an internal library * a93c356 Use latest version of app-controller submodule. This also adds the missing dependencies to afb-helper and libappcontroller Bug-AGL: SPEC-2126 Change-Id: Ifa67610bc908d3fbdd9862f2d0b6466260271d56 Signed-off-by: Stephane Desneux <stephane.desneux@iot.bzh>
2019-02-05bluez-alsa: updated patches due to latest bumpThierry Bultel6-269/+211
This updates the needed patches for 4a. The latest bump (version of 2019-01-17) has make one of the previous patch obsolete (SIGSEGV when closing the PCM), thus the patch has simply been removed. Also add a patch for having bluez-alsa request a name on dbus. BUG-AGL: SPEC-2126 Change-Id: I351b55e0d440f8f271ccb14a0d51111570659026 Signed-off-by: Thierry Bultel <thierry.bultel@iot.bzh>
2019-02-04Add gitreview file for guppy branchJan-Simon Möller1-0/+1
Change-Id: Ib9f4c6cc3475d8e15108d73ac993c799d8ef7a3b Signed-off-by: Jan-Simon Möller <jsmoeller@linuxfoundation.org>
2019-01-244a-hal-device-config: bump to latest revisionguppy_6.99.4guppy/6.99.46.99.4Stephane Desneux1-1/+1
The following changes are added: * 23bc19d hal-4a-intel-minnow: fix incorrect master volume control Bug-AGL: SPEC-2138 Change-Id: I7fa31913413e482bb6a428fa006f7ee74188345b Signed-off-by: Stephane Desneux <stephane.desneux@iot.bzh>
2019-01-17Bump the revision of agl-service-windowmanagerKazumasa Mitsunari1-1/+1
This patch includes the followings fb861c2 Emit events to application not subscriber 7ca956b Fix app surface is set to position (0, 0) a96fae7 Fix timing issue of surface creation 2b1bf85 Merge "Migrates bindings v3" d118874 Merge "doc: fix invalid image reference" d9dc8ef Migrates bindings v3 c5b6772 Remove unnecessary function 56cefbb doc: fix invalid image reference 671b366 Clean: Remove conversion table from old role d6ead3b Rename the image file name 9b4dec5 Fix the file names 010ca3f Attach application to ivi-layer not to surface c2110a3 Fix internal function name for consistency Change-Id: I29ad5ca818f1a88dcea23637ef4c0f60ad01bf76 Signed-off-by: Kazumasa Mitsunari <knimitz@witz-inc.co.jp>
2019-01-15Integrate Chromium and WAM recipes.Jacobo Aragunde Pérez9-0/+574
Create a new layer called meta-html5-framework. It contains the following recipes: * chromium68 to build the browser shared library and browser code. * chromium-browser-service for the browser widget. * wam for the web application manager. * wam-tinyproxy is a direct dependency of wam. Defines a new packagegroup, which is added to the agl-demo-platform image in case agl-html5-framework is configured as a feature. Bug-AGL: SPEC-1885 Change-Id: I39f01ab09e198cd139e95ff3c784af563b54329b Signed-off-by: Jacobo Aragunde Pérez <jaragunde@igalia.com> (cherry picked from commit 19e71462fc44093c6f9046e60c72adeedfca7858)
2019-01-064a-mixer: quiet debug messages in non-develScott Murray1-0/+2
Define QT_NO_DEBUG_OUTPUT when not building with agl-devel enabled to quiet the debug logging on volume changes. Change-Id: I4c4422ee0232530bba1e655887829a8ccc661a23 Signed-off-by: Scott Murray <scott.murray@konsulko.com>
2019-01-054a-hal-device-config: bump to latest revisionStephane Desneux1-1/+1
Changes included: * d651952 hal-4a-unicens: uses the renamed plugin Change-Id: I13bbf00dbdca792f385ca536f69ed127d8e1925f Signed-off-by: Stephane Desneux <stephane.desneux@iot.bzh>
2019-01-044a-softmixer: bump to latest revisionStephane Desneux1-1/+1
New changes: * 1103db2 bluetooth: fixes the cleanup at SCO hangup * c85fd2f Implemented the bug cleanup at application exit Change-Id: I9f0869e6f34f70816d20c9f8155ffd304687d51e Signed-off-by: Stephane Desneux <stephane.desneux@iot.bzh>
2018-12-26bluez-alsa: Added a patch to fix the crash at PCM closeThierry Bultel2-2/+181
This fixes the random crash at PCM close Change-Id: I373e4b7e55d6d7d4c3be4a4a7a9f460c00758215 Signed-off-by: Thierry Bultel <thierry.bultel@iot.bzh>
2018-12-204a-softmixer: add missing dependency on liburcuguppy_6.99.3guppy/6.99.36.99.3Stephane Desneux1-1/+1
Change-Id: If46cb938504f47456d106be4f3cd59c1407a9b6f Signed-off-by: Stephane Desneux <stephane.desneux@iot.bzh>
2018-12-204a-hal-generic: add missing dependencies on bluez-alsa and liburcuStephane Desneux1-2/+2
Change-Id: I4efd9ad4b4d4653706a2038cd9770578f81544fe Signed-off-by: Stephane Desneux <stephane.desneux@iot.bzh>
2018-12-204a-hal-generic: bump to latest revisionStephane Desneux1-1/+1
This includes the following changes: * 01d55ed Adds support for bluetooth audio through bluez-alsa * dbe555b Remove old comments not true anymore * ef3b6e3 Update version of app-controller submodule. * f278417 Add halmap controls events generation for all hal * ec6351b Add streams events generation for each hal * a480485 Rework calls to mixer streams * ecb0392 Add 'halmap' controls in hal 'info' verb response * f741fc8 Add setting values of a ALSA control using a +/- * cdbaaf3 Send back control previous and current values * 3aa9dec Send back control current values if no request json * 07c240d Add a function to get values of an alsa control * 03776c5 Improve ALSA controls volume values conversion * a34509b Update syntax of a request of an halmap verb * 86a1b87 Typo fix in halmap call response * cb1dfa9 Correct halmap calls request json syntax * be74611 Move hal configuration files into 4a-hal-configs repository * 265d86d Add master branch into .gitreview file * 4b299e6 Merge "Add autobuild to top tree" |\ | * 55561d8 Add autobuild to top tree * | 2a0c79f Move hal controls actions at the end of hal init |/ * 7db42de Add tests for 4a-hal-generic * d3c0253 Change .gitmodules following submodule migration * 3c2fbe2 hal-bt : Each plugin has its own data structure * 226aa0f Use new ctl functions to set/get ctl external data * 71a57c4 Update version of app-controller submodule. * 32b4b5c Force each hal to have its own ctl section data * be188c3 Use ctl defines to call afb functions * cabdc82 Add .gitreview to 4a-hal-generic * 50be438 Migrate app-templates to CMake module Change-Id: I94fca26ecfbad784500230b3183f1e2e187c62e9 Signed-off-by: Stephane Desneux <stephane.desneux@iot.bzh>
2018-12-204a-hal-device-config: bump to latest revisionStephane Desneux1-2/+2
The following changes are in: * d6d9822 bluetooth audio: uses the new bluealsa plugin * 6fdd9c5 Change the control name to be the same everywhere Change-Id: I9ecff909244d3b3ea751fcdc84da624bd68f83ba Signed-off-by: Stephane Desneux <stephane.desneux@iot.bzh>
2018-12-204a-alsa-core: bump to last revisionStephane Desneux1-1/+1
This includes the following changes: * 985df9f alsaSetGetCtls: fixed a memory leak * 25e4773 Move autobuild to top tree * 838192f Add test for 4a-alsa-core * 2a9a1b6 Change .gitmodules following submodule migration * 6a6963c Migrate app-templates to CMake module Change-Id: Id5344ff70e2c5d30c55be3f40ffaf6ad2b5ef880 Signed-off-by: Stephane Desneux <stephane.desneux@iot.bzh>
2018-12-204a-softmixer: bump to last revisionStephane Desneux1-1/+1
The following changes are now in: * e0f57e5 Add support for bluetooth telephony * 7df040a Move autobuild to top tree * bab2030 Add tests for 4a-softmixer * 44e34ee Update version of app-controller-submodule * 8135317 Change .gitmodules following submodule migration * 6f89839 Add gitreview file to 4a-softmixer repo Change-Id: I0674f2852f4d27c27ecd6e7086a9fc45ca9a11b0 Signed-off-by: Stephane Desneux <stephane.desneux@iot.bzh>
2018-12-204a-mixer: bump to laster versionStephane Desneux1-1/+1
This introduces the changes: * d32d36b Reworked the way qml create sliders * f8da591 Fix indent using tab instead of spaces * 1b8ad36 Handle the volume_changed event * 09f1cb7 Fix json format changed since v3 * 1406acd Modify graphic role * dc32441 Merge "delete application_name check in tap_shortcut event" |\ | * f2d1e14 delete application_name check in tap_shortcut event * 23736fb Migrate app-templates to CMake module Change-Id: I4238178d06cf7657d8bdfabd5cad56e4fd8082ce Signed-off-by: Stephane Desneux <stephane.desneux@iot.bzh>
2018-12-20bluez-alsa: removed the PCM hack, and build a shared libThierry Bultel6-1063/+924
This removes the deprecated PCM proxy hack, and brings mandatory features for the softmixer. This change applies on top of the latest bluez-alsa master of 2018-12-04 and brings 3 patches: 1) builds a shared library and links bluez-alsa and ioplug controls & pcm to it. 2) func log by default 3) increase the number of max connections from clients (pcm & ctrls) ----- Upstream status for the patches: 1) pending. Based on a submitted PR that is not clean enough and that the maintainer does not want to take before at least 6 months https://github.com/Arkq/bluez-alsa/pull/95 2) pending. Was submitted as part of the Ofono support in bluez-alsa, but was not retained. See the original PR for Ofono for that. 3) pending. The maintainer is OK with this but wants to refactor the client-server protocol in the coming months. In a private mail of 12/06/2018: "Yes, you can increase this hardcoded limit as a temporary workaround. I've put in there (and made it rather low) as a reminder, that clients are stored in the list, which might not be optimal for larger number of connected clients. In the future bluealsa will support audio mixing, so connecting many clients to a single transport will be a common case. So, I've thought about incorporating more efficient structure for storing (in particular searching) connected client - something with log(n) search complexity. Then, it might be worth to implement this container to be dynamic with an upper capacity limit (which might be high, like 200-300 clients)." Change-Id: Ia771613a7a83cc9ed6108399cdaacdeda603d39b Signed-off-by: Thierry Bultel <thierry.bultel@iot.bzh>
2018-12-20docs: add yaml bookFrederic Marec1-0/+13
Bug-AGL: SPEC-1988 Change-Id: Ic596e9903dea74334acdb90a1cdb9a9863a742c2 Signed-off-by: Frederic Marec <frederic.marec@iot.bzh>
2018-12-20weston: Add patch to improve gst-record robustnessScott Murray2-0/+52
Add a patch to do some retries with a delay when the gst-record feature is initializing and attempts to query the omx encoder plugin for its buffer pools. It is not clear why exactly the encoder is not consistently ready at this point, but in my testing this change greatly improved the robustness of weston startup with gst-record enabled. Change-Id: Ibd26ad64be035e1f9d40cc3cd9337e9efeabfad4 Signed-off-by: Scott Murray <scott.murray@konsulko.com>
2018-12-20Update agl-gstrecorder featureScott Murray2-2/+1
The agl-gstrecorder feature was not setting a DISTRO_FEATURE, add an include file that does so and a reference to it in the feature's local.conf.inc file. The "gst-record" DISTRO_FEATURE is already referred to meta-agl/meta-agl-bsp, so this fixes that usage. Change-Id: I2140d75a44f128226ea901ed9edfd1bce5526c53 Signed-off-by: Scott Murray <scott.murray@konsulko.com>
2018-12-19move 4a-hal-unicens (plugin) to gerritTobias Jahnke1-4/+4
Bug-AGL: SPEC-1505 Change-Id: Ia9e2098ecaede966a49e9926a915c31dc7470813 Signed-off-by: Tobias Jahnke <tobias.jahnke@microchip.com>
2018-12-14Bump snd-avirt revisionMark Farrugia1-1/+1
Crucial fixes, including cure for potential kernel panic crash Change-Id: I3d163e1a5a1c387d09481d162f748e3b63c288d2 Signed-off-by: Mark Farrugia <mark.farrugia@fiberdyne.com.au>
2018-12-14Bump qlibwindowmanager revisionKazumasa Mitsunari1-1/+1
This patch includes the followings 3ff0715 Inherit LibWindowmanager d186c2c Use simple API of libwindowmanager 93b1927 Fix memory leak when application dead Change-Id: I75b29152c7ea6cb75ccdff06baa7049603ed5191 Signed-off-by: Kazumasa Mitsunari <knimitz@witz-inc.co.jp>
2018-12-07Move hal configuration files into own repositoryJan-Simon Möller10-33/+182
... and own recipe This allows to manage the various types of configuration files independently of the source code as these might not always fit into the git repo context-wise. Initial recipe is 4a-hal-device-config.bb . This is re-using the same mechanism as previously used. Samples for alternative implementations and vendor hals are included as well to explore improved ways of handling the multipe configuration files possible. Bug-AGL: SPEC-2011 Change-Id: Ib04b5c4e7b764bed85dbceb50a62a8c6fd031c5a Signed-off-by: Jan-Simon Möller <jsmoeller@linuxfoundation.org>
2018-11-30Change 4a-softmixer SRC_URI to gerritguppy_6.99.2guppy/6.99.26.99.2Jan-Simon Möller1-1/+1
Change the softmixer SRC_URI to gerrit. Change-Id: I54e78d80a83e9ff7e8726ecd803ec10eb8dbdc70 Bug-AGL: SPEC-1731 Signed-off-by: Jan-Simon Möller <jsmoeller@linuxfoundation.org>
2018-11-30speech-framework: Add initial speech-framework featureShotaro Uchida4-0/+33
Change-Id: I458161fea56928e338c1fe208e643e9a33141f6e Signed-off-by: Shotaro Uchida <shotaru@amazon.com>
2018-11-294a: adjust 4a_wait_bt.sh due to changes in bluetooth-manager APIStéphane Desneux1-2/+2
The verb 'power' is now replaced by 'adapter_state'. The response object is also different (no compatibility with older API). Bug-AGL: SPEC-1630 Change-Id: I2e08c33e2936d93cfdec0c498570c77177a4b81e Signed-off-by: Stéphane Desneux <stephane.desneux@iot.bzh>
2018-11-28hal-unicens: bump unicens hal to newest versionTobias Jahnke1-1/+1
Bug-AGL: SPEC-1505 - enables audio to unicens sound card - cleanup of plugin implementation - removed legacy stream, pcm playback volume - ensure init success to allow loading the plugin Change-Id: I0d7afd1c76d2b913e3684bbbcbc599f315061d85 Signed-off-by: Tobias Jahnke <tobias.jahnke@microchip.com>
2018-11-234a-hal-unicens: add HAL for unicensguppy_6.99.1guppy/6.99.16.99.1Tobias Jahnke2-6/+18
Bug-AGL: SPEC-1505 - enabled 4a-hal-unicens recipe again - updated srcrev of github repo - modified project name to match install folder Change-Id: I9afa86afa602845bf783a41b09f590344f26c095 Signed-off-by: Tobias Jahnke <tobias.jahnke@microchip.com>
2018-11-22bump softmixer to latest version (bug fixes)Thierry Bultel1-1/+1
This bring these commits: b678f3 config.cmake: bump the needed version of alsalib to 1.1.6 a84a93 Remove an unfilled response json object a07c4c removed the dependency to alsalib-1.1.6 for host 70fb34 Lower the verbosity when not in debug level b34cd9 Migrate app-templates to CMake module 58d666 Merge pull request #2 from iotbzh/app-templates-migration 03aa71 config.cmake: fixed a typo ca6383 alsa-core-pcm: fixed the mute logic 0e37ab Tweaking debug prints 92e038 Handle too small card PCM buffer when writing a17d52 Fix the error string of attach actions 118377 remove dead code and renamed unobvious variables Change-Id: Ie3e922f423ec9d6ba38c35263183d0e9143e5958 Signed-off-by: Thierry Bultel <thierry.bultel@iot.bzh>
2018-11-20Add initial recipes for snd-avirt driverMark Farrugia5-0/+132
The snd-avirt driver will provide an enhanced, dynamic ALSA loopback interface for 4a-softmixer, and provides the audio framework for low-latency audio hardmixers such as the Fiberdyne DSP onboard the Xtensa HiFi2, and the UNICENs Fiberdyne smart amplifier. Included are backport patches for kernels 4.12 and 4.9. Change-Id: I8b23507d7179d10dfa70b7f2f899db4534690392 Signed-off-by: Mark Farrugia <mark.farrugia@fiberdyne.com.au>
2018-11-15Add cmake-apps-module dependencyRomain Forlot1-1/+1
This fix bindings installation when they don't use the aglwgt main class Change-Id: I0868e0c6df757c5025fc4f9d21e46f8441646506 Signed-off-by: Romain Forlot <romain.forlot@iot.bzh>
2018-11-09meta-audio-4a: remove UNICENS legacy halTobias Jahnke2-2/+1
Bug-AGL: SPEC-1505 - Remove UNICENS legacy hal from build until the new hal plugin is available - Remove ldpath which was required to load the legacy hal (avoids binder startup error since the path is no longer available) Change-Id: If25094d4f944e887fed0ed10c5cae8049ce6db82 Signed-off-by: Tobias Jahnke <tobias.jahnke@microchip.com>
2018-10-30agl-service-windowmanager_git.bb: Remove LICENSE.MITLeon Anavi1-2/+1
Following the refactor from SPEC-1817, file LICENSE.MIT was removed from the source code therefore the recipe also has to be adjusted accordingly. Bug-AGL: SPEC-1868, SPEC-1817 Change-Id: Ib671c37f53ed0f50e9e9232e15871eeee054c37d Signed-off-by: Leon Anavi <leon.anavi@konsulko.com>
2018-10-26Bump agl-service-windowmanager revisionKazumasa Mitsunari1-1/+1
This commit includes the followings 8342c42 Fix the conversion table 5414b71 Delete verbs no longer used b1f7a75 Merge "Refactor : Hide wayland operations from Window Manager" 5a2494b Merge "Improve ApplicationGuide" 6819f40 Refactor : Hide wayland operations from Window Manager 3338ef2 Improve ApplicationGuide Change-Id: I10a9078d498389a40bd9f20037f77a5434cd9285 Signed-off-by: Kazumasa Mitsunari <knimitz@witz-inc.co.jp>
2018-10-24Merge "Bump agl-service-windowmanager revision"José Bollo1-1/+1
2018-10-20Merge "Add necessary DISTRO_FEATURES to gstrecorder template"Jan-Simon Moeller3-1/+18
2018-10-19Add necessary DISTRO_FEATURES to gstrecorder templateJan-Simon Möller3-1/+18
These are missing to enable the whole machinery on the sender side. CAVEAT: The network between sender and receiver needs to be up (192.168.20.x/24) or weston will not start! Change-Id: Ib478f0840dd3e6d28f9ca14540302c872c5bcd7b Signed-off-by: Jan-Simon Möller <jsmoeller@linuxfoundation.org>
2018-10-18Bump agl-service-windowmanager revisionKazumasa Mitsunari1-1/+1
This commit includes 9fabd65 Fix memory leak 7526846 Include WMClient into WMRequest 3621896 Omit std:: b87827d Fix verbs 2fd5d33 Rename file names 5b1cf56 Migrate hmi-debug into util 152d6e0 Merge "Drop 2017 suffix" e7ba7ca Drop 2017 suffix 2dfacac Use feature 'required-binding' f0d9414 Clean: Remove split_layout structure f98c0d9 Add .gitignore 88d27f7 Modify .gitreview Change-Id: Ic2c741b020c0609983edc6a8c11ae1289b8913b9 Signed-off-by: Kazumasa Mitsunari <knimitz@witz-inc.co.jp>
2018-10-13Bump 4a-hal-unicens to latest revisionJan-Simon Möller1-1/+1
Include the update from Tobias Change-Id: Id60efedc0b65dba8d5caf8c1a2455378e6c4435b Signed-off-by: Jan-Simon Möller <jsmoeller@linuxfoundation.org>
2018-10-11Merge "4a: Use '4a-hal-generic' gerrit repository"Jan-Simon Moeller1-3/+3