mawei/StarPilot
1
0
Fork 0
mirror of https://github.com/firestar5683/StarPilot.git synced 2026-07-17 15:22:10 +08:00
Code Issues Packages Projects Releases Wiki Activity
6,574 Commits 65 Branches 85 Tags
388ae5e59e1bb052d5d171332aebbcd36059385e
Commit Graph

65 Commits

Author SHA1 Message Date
Adeeb Shihadeh 63bbcd7279 better steer fault names (#23890) 
* better steer fault names

* bump cereal
old-commit-hash: 87849f93b165507ad980dbefdcf9c376d5165a18
 2022-03-01 22:53:55 -08:00
suryad b8e87efae6 Mazda: add 2017 CX-9 firmware (#23742) 
old-commit-hash: 12e79761e12c79d933aaa8a7f50a60f3d0b0736d
 2022-02-10 16:30:00 -08:00
Jafar Al-Gharaibeh 5b2973b308 Mazda CX-5 2022 Car port (#23704) 
* Mazda CX5 2022 FW

Signed-off-by: Jafar Al-Gharaibeh <to.jafar@gmail.com>

* CX-5 2022: No lockout and steer down to zero

Signed-off-by: Jafar Al-Gharaibeh <to.jafar@gmail.com>

* CX-5 2022: No dashcam!

Signed-off-by: Jafar Al-Gharaibeh <to.jafar@gmail.com>

* CX-5 2022: add to supported cars

Signed-off-by: Jafar Al-Gharaibeh <to.jafar@gmail.com>

* Mazda: stick with 800 max torque for now

Signed-off-by: Jafar Al-Gharaibeh <to.jafar@gmail.com>

* Update docs/CARS.md

* Apply suggestions from code review

* Mazda: set car models where needed

Signed-off-by: Jafar Al-Gharaibeh <to.jafar@gmail.com>

* Mazda: set minSteerSpeed per car

Signed-off-by: Jafar Al-Gharaibeh <to.jafar@gmail.com>

* unused

Signed-off-by: Jafar Al-Gharaibeh <to.jafar@gmail.com>

* cleanup

* Update selfdrive/car/mazda/interface.py

Co-authored-by: Adeeb Shihadeh <adeebshihadeh@gmail.com>
old-commit-hash: 341f5a4ae01445049f7bb8a51f9e2781bbdfa124
 2022-02-04 23:34:37 -08:00
Shane Smiskol 4864a65f5e CANParser: remove rest of default values (#23676) 
* forgot honda somehow!

* forgot some more signal defaults
old-commit-hash: 61de3788ff3b49485e8ef6546fb2362d43ba373c
 2022-01-31 17:29:55 -08:00
Jafar Al-Gharaibeh 055b8b06e6 Mazda: alert when LKAS is disabled (#23288) 
* Mazda: alert when LKAS is disabled

Signed-off-by: Jafar Al-Gharaibeh <to.jafar@gmail.com>

* update refs

* revert that

Co-authored-by: Adeeb Shihadeh <adeebshihadeh@gmail.com>
old-commit-hash: 1c31c9b7a3b0ee72b9dca443067deab793e19187
 2022-01-30 21:04:07 -08:00
Adeeb Shihadeh 71da8d1250 No actuation while in pre-enabled state (#23658) 
* No actuation while in pre-enabled state

* update refs
old-commit-hash: 72e00a07686fa112dde7928fa48ab4a56ed7a7f5
 2022-01-28 16:03:44 -08:00
Shane Smiskol fadba4b34d CANParser: remove default values (#23642) 
* draft

* remove rest

* bump

* update radar interfaces

* do rest and formatting

* bump

* fix mising check

* try this

* Revert "try this"

This reverts commit 0d26d9a072f87dbc897ed525b70fb1db9cb04a06.

* update refs

Co-authored-by: Adeeb Shihadeh <adeebshihadeh@gmail.com>
old-commit-hash: 3645186d7cfcbe8889fed14caf5c51a0a84f14bb
 2022-01-27 17:06:18 -08:00
Adeeb Shihadeh 597535c014 linter: don't allow implicitly concatenated strings (#23513) 
* linter: don't allow implicitly concatenated strings

* fix hyundai
old-commit-hash: 2c94f155840b49639b8bf1ec996d99e268fa9a52
 2022-01-13 14:19:38 -08:00
Dean Lee 98de810849 check in tuple instead of list (#23477) 
* check in tuple instead of list

* Update selfdrive/car/toyota/carcontroller.py

Co-authored-by: Willem Melching <willem.melching@gmail.com>

* Update selfdrive/car/mazda/interface.py

Co-authored-by: Willem Melching <willem.melching@gmail.com>

Co-authored-by: Willem Melching <willem.melching@gmail.com>
old-commit-hash: a653461dec18b1313148905172ba54bac9f5fdfd
 2022-01-10 16:36:51 +01:00
Ewout ter Hoeven f206ebd054 Pyupgrade 3.6: Update syntax with Python 3.6+ features (#23305) 
Updated Python code with Python 3.6+ features:
- utf-8 encoding is now the default (PEP 3120)
- Replace list comprehensions by Generator Expressions (PEP 289)
- Replace yield loop by yield from (PEP 380)
- Remove the (object) subclass when defining a class
- Replace the IOError alias by OSError (PEP 3151)
- Define sets with curly braces {} instead of set()
- Remove "r" parameter from open function, which is default

Co-Authored-By: Adeeb Shihadeh <8762862+adeebshihadeh@users.noreply.github.com>
Co-Authored-By: GregorKikelj <96022003+GregorKikelj@users.noreply.github.com>

Co-authored-by: Adeeb Shihadeh <8762862+adeebshihadeh@users.noreply.github.com>
Co-authored-by: GregorKikelj <96022003+GregorKikelj@users.noreply.github.com>
old-commit-hash: 332f568a8241fba9459cb70c76840b9670e6993a
 2021-12-24 11:18:39 -08:00
Adeeb Shihadeh 55d6972d08 Revert "Mazda: alert when LKAS is disabled (#23273)" 
This reverts commit e67713edb1f62957974f20a0f7eceb2fc9efb1f4.

old-commit-hash: c92199ab1a94d2ea565e68e513bf4f9e3e81d489
 2021-12-20 23:02:02 -08:00
Jafar Al-Gharaibeh 9b7dd754c4 Mazda: alert when LKAS is disabled (#23273) 
* Mazda: alert when LKAS is disabled

Signed-off-by: Jafar Al-Gharaibeh <to.jafar@gmail.com>

* Update selfdrive/controls/lib/events.py

* Update selfdrive/car/mazda/interface.py

* bump cereal

Co-authored-by: Adeeb Shihadeh <adeebshihadeh@gmail.com>
old-commit-hash: f25121b7364a2babef5022e852cf97570bee6da2
 2021-12-20 14:58:46 -08:00
Jafar Al-Gharaibeh 5f92847cfa Mazda CX-5 2021 FW (#23270) 
dongle id: 661fdb17fa82339c

Signed-off-by: Jafar Al-Gharaibeh <to.jafar@gmail.com>
old-commit-hash: cd7db7f48e4ffd045531f42e0f47a6e2ea576523
 2021-12-20 14:30:54 -08:00
Jafar Al-Gharaibeh 241392b370 Mazda: CX-5 and 3 FW (#23267) 
* Mazda 3 2017 fw

dongle id: f7fec643f5178df8

Signed-off-by: Jafar Al-Gharaibeh <to.jafar@gmail.com>

* Mazda CX-5 2020 FW

dongle id: f4b488f06d3b7711

Signed-off-by: Jafar Al-Gharaibeh <to.jafar@gmail.com>
old-commit-hash: fc7d152dcafe3274aeb35d9c2f7599300ec8489e
 2021-12-18 14:47:04 -08:00
Willem Melching 7b3e330def Log actuators after applying rate limits in CarController (#23230) 
* return actuators from carcontroller

* log it

* pass to latcontrol

* chrysler

* gm

* honda

* more brands

* rest of the brands

* gm cleanup

* hyundai cleanup

* update ref

* rename field

* fix subaru

* add types

* more subaru fixes #23240

* consistent whitespace

* bump cereal
old-commit-hash: 4f1eb4278a83a3abebebef67a081961e27594d90
 2021-12-16 13:08:20 +01:00
Willem Melching b8ab21bd64 add CarParams.wheelSpeedFactor (#23079) 
* add CarParams.wheelSpeedFactor

* Fudge speed for Lexus RX

* should have been the TSS2 model

* bump cereal

* refactor into function

* update refs
old-commit-hash: e6180738fdc4c55ba913905e6591de5435966eb1
 2021-12-03 14:57:53 +01:00
Adeeb Shihadeh ed75e6600d mazda: capitalize CX9 like all others cars 
old-commit-hash: f0f7359f6a7b38613d2ffc11c900add7631f46a4
 2021-11-24 11:53:10 -08:00
Jafar Al-Gharaibeh da895353a0 Mazda: fix typo in CX-5 fw (#22957) 
old-commit-hash: 787dde003ed3996a6258f636ae7e327da135570a
 2021-11-17 13:49:10 -08:00
Jafar Al-Gharaibeh e8717f23de Mazda: add three new FW FP (#22939) 
old-commit-hash: 2492a116613a4758b6e926a88019351f2793099b
 2021-11-16 21:10:16 -08:00
Jafar Al-Gharaibeh 29528bdcb0 Mazda: fix occasional main cruise disable (#22807) 
Signed-off-by: Jafar Al-Gharaibeh <to.jafar@gmail.com>
old-commit-hash: b18661a3a66979d2c12a8bbde109cb7e50f00e1a
 2021-11-10 21:25:41 -08:00
Jafar Al-Gharaibeh 6c74dc1366 Mazda: disable hud alerts until we find a way to silence audible alerts (#22808) 
* Mazda: disable hud alerts for now until we find a way to silence audible warnings

Signed-off-by: Jafar Al-Gharaibeh <to.jafar@gmail.com>

* Mazda: add hud alert for steer lockout

Signed-off-by: Jafar Al-Gharaibeh <to.jafar@gmail.com>

* show when above min steer speed

* update refs

Co-authored-by: Adeeb Shihadeh <adeebshihadeh@gmail.com>
old-commit-hash: 2621e5301da0e10a70a68672db5052ea5037db9b
 2021-11-09 15:24:18 -08:00
Jafar Al-Gharaibeh 24d1105a2a Mazda: fix occasional steer fault at initial lkas enable (#22806) 
* Mazda: fix occasional steer fault at initial lkas enable

Signed-off-by: Jafar Al-Gharaibeh <to.jafar@gmail.com>

* update refs

Co-authored-by: Adeeb Shihadeh <adeebshihadeh@gmail.com>
old-commit-hash: 8c38e9c49e23d6e1030d9c302ae2cc404e5cc6b7
 2021-11-08 14:40:26 -08:00
Adeeb Shihadeh e0456c4989 Mazda: move CX-9 out of dashcam mode (#22717) 
* move cx9 out of dashcam

* no alc below 28

* process replay route
old-commit-hash: 2252c6bba76c15916dcc91aa4da95fa77be65302
 2021-10-31 22:02:36 -07:00
Adeeb Shihadeh 3f94d894a1 Mazda: fix up cruise cancellation (#22750) 
* also cancel on cruiseControl.cancel

* set counter in button msg
old-commit-hash: 40b7962b93834dd2bc624ecb6d2508fc7251d442
 2021-10-30 13:37:52 -07:00
Adeeb Shihadeh 7a777b2b49 Mazda: send dash alerts (#22730) 
* Mazda: send dash alerts

* no actuators

* ldw

* send alerts

* test

* use cam parser

* add generic toggle

* wip

* revert some stuff

* try that

* steer required works

* cleanup

* bump panda

* little more cleanup

* no lane lines

Co-authored-by: Comma Device <device@comma.ai>
old-commit-hash: 1848fed6e2a586f10f5d59a1472477b474ebda70
 2021-10-30 10:56:30 -07:00
Adeeb Shihadeh 57e92b9284 Mazda: car state cleanup + comments 
old-commit-hash: f9b6b03f5dd78ebe50b6c8639c586d3d69eed3a8
 2021-10-29 14:40:58 -07:00
Adeeb Shihadeh 14ede5d6cd Mazda: allow engaging below min LKAS speed (#22737) 
* Mazda: allow engagement below minimum LKAS speed

* bump panda

* bump panda
old-commit-hash: 4bbeb27f9b56676483776920a62ecb135a2880ed
 2021-10-29 13:07:52 -07:00
Adeeb Shihadeh 67b42fc1a8 Mazda: fix blinker states (#22718) 
* Mazda: fix blinker states

* not lamp

* back to lamp to fix convenience blinkers
old-commit-hash: 2b4a655f36ffb94aa87d07e65c1f88f37dd33636
 2021-10-28 14:05:12 -07:00
Jafar Al-Gharaibeh febe8bf636 Mazda: Fix OP steer warning in cars with lockout (#22612) 
Signed-off-by: Jafar Al-Gharaibeh <to.jafar@gmail.com>
old-commit-hash: ca1f96ac725f0cbacfad41c6f277cd86acbee9a1
 2021-10-20 21:36:22 -07:00
Jafar Al-Gharaibeh b17b840093 Mazda: fix disabling cruise main on after cancelling cruise (#22193) 
On some disengagement events (brake/gas/etc) OP may occasionally
ends up disabling the main cruise control where the driver has
to press the main cruise button before they can engage ACC again.
Try to detect this situation and automatically turn on cruise
when that happens.

Signed-off-by: Jafar Al-Gharaibeh <to.jafar@gmail.com>
old-commit-hash: c89893942374c207cc2b2473984e0700a7de7ec4
 2021-10-10 14:24:57 -07:00
Jafar Al-Gharaibeh db1ffcb8a6 Mazda: Fix steer lockout issue in CX-9 2021 (#22506) 
Signed-off-by: Jafar Al-Gharaibeh <to.jafar@gmail.com>
old-commit-hash: d19ac7e49bd48ceb30ccf9688b6b03bc798cd222
 2021-10-10 14:19:43 -07:00
Jafar Al-Gharaibeh d6a4bbc2f6 Mazda: Add CX-9 2021 GT firmware (#22509) 
Signed-off-by: Jafar Al-Gharaibeh <to.jafar@gmail.com>
old-commit-hash: 2dff0597b76f290be3fcd598f032913e188020b9
 2021-10-10 10:08:18 -07:00
Robbe Derks 58c99158a1 Make pandaState and safetyMode a list (#22454) 
* wip: move to pandaStates

* bump cereal

* wip: SafetyMode struct

* move to safetyMode

* fix typo

* this can be None

* fix potential empty pandaStates list

* fix thermald

* fix controlsd

* rename safetyModes to safetyConfigs

* update process_replay

* fix test_models

* bump cereal
old-commit-hash: 91987f38d425e2a5dc61d09571933cffb9536113
 2021-10-08 17:54:34 +02:00
Jafar Al-Gharaibeh 0ccdb8e68b Mazda: use cruise speed signal from PCM (#22345) 
Signed-off-by: Jafar Al-Gharaibeh <to.jafar@gmail.com>

Co-authored-by: Adeeb Shihadeh <adeebshihadeh@gmail.com>
old-commit-hash: b170c1f4e14cc4cf5370fd7d6028a766833efa3c
 2021-09-24 16:58:32 -07:00
Adeeb Shihadeh 821f1f6cb6 remove community supported cars from community features (#22330) 
* remove community supported cars from community features

* remove bosch and hkg long

* remove test case

* update refs
old-commit-hash: 649af76fd4ade524df8eb6c56cc8bb09b3772e7c
 2021-09-23 17:34:52 -07:00
Jafar Al-Gharaibeh e6f91750cd Mazda 3/CX-5 FW (#22087) 
* Mazda 3 2017 FW

dongle-id: 2f26dfe847d7c138

Signed-off-by: Jafar Al-Gharaibeh <to.jafar@gmail.com>

* CX-5 fw

dongle id: 769d87694463b543

Signed-off-by: Jafar Al-Gharaibeh <to.jafar@gmail.com>
old-commit-hash: cb63a89dd026414b224ba204cd1378f46d638c9b
 2021-08-30 22:14:49 -07:00
Jafar Al-Gharaibeh 3e093adc60 Batch of Mazda FW (#22037) 
* Mazda CX-9 2021 fw

dongle-id: 09190764dd71c810

Signed-off-by: Jafar Al-Gharaibeh <to.jafar@gmail.com>

* Mazda CX-5 2017 FW

dongle-id: ec9d14ccafd6a5bd

Signed-off-by: Jafar Al-Gharaibeh <to.jafar@gmail.com>

* Mazda 6 2021 FW

dongle-id: afdcf7eee0222886

* Mazda CX-5 2019 Diesel FW

dongle-id: a90d564521cb048e

Co-authored-by: Shubham Arora <shubhama1903@gmail.com>
Co-authored-by: srbaumruk205 <72043516+srbaumruk205@users.noreply.github.com>
old-commit-hash: a949a49d5efaaf2d881143d23e9fb5ff9e28e88c
 2021-08-25 11:16:26 -07:00
Jafar Al-Gharaibeh 26990b19b9 Car Port: Mazda CX-9 2021 (#20864) 
* Mazda CX-9 no steer lockout, and newer cars can use more torque

Signed-off-by: Jafar Al-Gharaibeh <to.jafar@gmail.com>

* Mazda CX-9 2021 test route

Signed-off-by: Jafar Al-Gharaibeh <to.jafar@gmail.com>

* cleanup

* more cleanup

* don't show community features alert if dashcam only

Co-authored-by: Adeeb Shihadeh <adeebshihadeh@gmail.com>
old-commit-hash: ff704e18b7797d093191950825e8c76623b9f5a6
 2021-07-10 23:50:03 -07:00
Jafar Al-Gharaibeh b7a9a4fb83 Mazda: Latest FP2 FW roundup (#21529) 
* Mazda CX-5 2020 FW

dongle-id: 7158b1c81c34b73a

Signed-off-by: Jafar Al-Gharaibeh <to.jafar@gmail.com>

* Mazda CX-9 2018 fw

dongle-id: b7ac84ce9191f3cb

Signed-off-by: Jafar Al-Gharaibeh <to.jafar@gmail.com>

* Mazda CX-9 2019 fw

dongle id: 30453440af4c0a5a

Signed-off-by: Jafar Al-Gharaibeh <to.jafar@gmail.com>

* Mazda CX-5  2019 FW

dongle-id: a9a9badda9265c17

Signed-off-by: Jafar Al-Gharaibeh <to.jafar@gmail.com>
old-commit-hash: e0ed92c03fdfe27ab6706738945f0ad999c8c8e8
 2021-07-10 13:16:14 -07:00
Adeeb Shihadeh 691ea8553f deprecate CP.enableCamera (#21509) 
* deprecate CP.enableCamera

* more removal

* one more

* update refs
old-commit-hash: c72d163e142d90edac5086892c0cd297bdc636fe
 2021-07-07 14:59:18 -07:00
Jafar Al-Gharaibeh e89adbdf7f Add Mazda CX-5 2018 fw (#21403) 
Signed-off-by: Jafar Al-Gharaibeh <to.jafar@gmail.com>
old-commit-hash: 43ead46a46ee5c834a18ab5201f7880252cc9b09
 2021-06-29 15:43:00 -07:00
Jafar Al-Gharaibeh 67f6bb5c9b Add Mazda 6 and new FW for other models (#21167) 
* Add support for Mazda6

Signed-off-by: Jafar Al-Gharaibeh <to.jafar@gmail.com>

* New FWs and Mazda 6 test route

Change Mazda to MAZDA
Mazda6 test route
CX-5 2018 FW
CX-5 2019 Australia FW
CX-9 2016 FW
Mazda3 2014 FW

Signed-off-by: Jafar Al-Gharaibeh <to.jafar@gmail.com>
old-commit-hash: 56fbf66c20d71ec53301f2297d88850964dfbf8b
 2021-06-06 14:40:57 -07:00
Jason Young 51db9216f2 Cleanup carstate quoting styles (#21109) 
* carstate quoting style: VW

* carstate quoting style: Chrysler

* carstate quoting style: Ford

* carstate quoting style: GM

* carstate quoting style: Honda

* carstate quoting style: Hyundai

* carstate quoting style: Mazda

* carstate quoting style: Nissan

* carstate quoting style: Subaru

* carstate quoting style: Soulless Appliances

* Sorry Honda!
old-commit-hash: 83ca5a0d29a5befa210f60a60e25029cadf30930
 2021-06-02 15:51:54 +02:00
Willem Melching 921aa1f0a4 Mazda: remove CAN fingerprints (#21067) 
old-commit-hash: 0f13a80e0bcad505c7ba4aadf8c3cd36449f505f
 2021-05-28 16:53:12 +02:00
Jafar Al-Gharaibeh f108d93bc0 Mazda FP 2.0 support (#20879) 
* Mazda FP 2.0 support

ECU FW for CX-5 2017 and Mazda3 2017

Signed-off-by: Jafar Al-Gharaibeh <to.jafar@gmail.com>

* Use standard UDS request/reponse, fix missing arg.

Signed-off-by: Jafar Al-Gharaibeh <to.jafar@gmail.com>

* Add CX-5 FW test

Signed-off-by: Jafar Al-Gharaibeh <to.jafar@gmail.com>

* update/add FW FP

Current suported models:
  CX-5 2017/2021
  CX-9 2019/2020
  Mazda3 2017/2018

Signed-off-by: Jafar Al-Gharaibeh <to.jafar@gmail.com>

* Add Cx-9 2019 FW FP

Signed-off-by: Jafar Al-Gharaibeh <to.jafar@gmail.com>

* Remove comments, remove TESTER_PRESENT_REQUEST from Mazda

Signed-off-by: Jafar Al-Gharaibeh <to.jafar@gmail.com>

* add transmission ecu to startup test

Signed-off-by: Jafar Al-Gharaibeh <to.jafar@gmail.com>
old-commit-hash: 824f93303d95695a761d10a00b0e9547274db6a9
 2021-05-28 15:50:58 +02:00
ShaneSmiskol 0d45e6885a Deprecate brakeLights field (#20954) 
* remove all references to CS.brakeLights

* unused red

* update refs

Co-authored-by: Adeeb Shihadeh <adeebshihadeh@gmail.com>
old-commit-hash: 551091bcfa46e50ef60dac3f3bdff299dba95f35
 2021-05-18 17:48:02 -07:00
Jafar Al-Gharaibeh c5484e5f6f Mazda 3 2014 Fingerprint (#20735) 
* mazda: don't passthrough unused signals

Some older models do have these, newer models don't.
Either way, they all work just fine if set to zero.

Signed-off-by: Jafar Al-Gharaibeh <to.jafar@gmail.com>

* mazda: improve auto resume after full stop. Thanks number1pete

Auto resume doesn't always work after a full stop.
sending RES presses at a higher rate fixes the issue.

Signed-off-by: Jafar Al-Gharaibeh <to.jafar@gmail.com>

* Add Mazda 3 2014 fingerprint

Signed-off-by: Jafar Al-Gharaibeh <to.jafar@gmail.com>

* Merge mazda 3 fingerprints

Signed-off-by: Jafar Al-Gharaibeh <to.jafar@gmail.com>
old-commit-hash: 426faa02f02a6b778035fada27242dbf4594272c
 2021-04-23 17:25:58 -07:00
Adeeb Shihadeh 05eb44115e cereal cleanup part 2 (#20092) 
* car stuff

* thermal

* Revert "car stuff"

This reverts commit 77fd1c65ebd01abfa8493ae12c9e6b14f7ada976.

* panda state

* camera stuff

* start deg

* most is building

* builds

* planner + controls run

* fix up paramsd

* cleanup

* process replay passes

* fix webcam build

* camerad

* no more frame

* thermald

* ui

* paramsd

* camera replay

* fix long tests

* fix camerad tests

* maxSteeringAngle

* bump cereal

* more frame

* cereal master
old-commit-hash: 312b681a46b8153314a8420611b6479dd6f70dfc
 2021-02-16 21:39:32 -08:00
Willem Melching 4daa6f05cf Move all CarControllerParams into values.py (#19663) 
* toyota

* use scale from values.py

* nissan

* subaru

* honda

* gm

* toyota combine into CarControllerParams

* nissan refactor

* chrysler refactor

* mazda refactor

* hyundai refactor

* subaru refactor
old-commit-hash: e4cf43c6fcc2f442318df815fdc38fb26a74bdb7
 2021-01-06 11:20:44 +01:00
Igor 95bb79c51c Parametrize MIN_CAN_SPEED in car interfaces (#2684) 
* Parametrize MIN_CAN_SPEED in car interfaces

* fixed instance in planner.py

* fix typo

* var name change

* changed var name to minSpeedCan for consistency with other uses of CAN in the capnproto files

* added default value to get_std_params, removed unneeded instances from car interface files

* Revert PEP8 autoformat corrections

* update refs

Co-authored-by: Adeeb Shihadeh <adeebshihadeh@gmail.com>
old-commit-hash: 093456cc40f2bafac6a36491cac8e57db42ee9e5
 2020-12-04 11:09:34 +01:00