Skip to content

Commit 3165fd3

Browse files
committed
Merge remote-tracking branch 'upstream/master'
2 parents 67c68eb + 1604ca5 commit 3165fd3

170 files changed

Lines changed: 209407 additions & 206766 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.ci/install-libusb.sh

Lines changed: 18 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,25 @@
22
# ABOUT
33
# CI install shell script for Artisan Linux builds
44
#
5+
# COPYRIGHT (C) 2010-2026 The Artisan team represented by
6+
# Marko Luther <marko.luther@gmx.net> (maintainer) and all contributors
7+
#
58
# LICENSE
6-
# This program or module is free software: you can redistribute it and/or
7-
# modify it under the terms of the GNU General Public License as published
8-
# by the Free Software Foundation, either version 2 of the License, or
9-
# version 3 of the License, or (at your option) any later versison. It is
10-
# provided for educational purposes and is distributed in the hope that
11-
# it will be useful, but WITHOUT ANY WARRANTY; without even the implied
12-
# warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See
13-
# the GNU General Public License for more details.
9+
# This program or module is free software: you can redistribute it and/or modify
10+
# it under the terms of the GNU Affero General Public License as
11+
# published by the Free Software Foundation, either version 3 of the
12+
# License, or (at your option) any later version.
13+
#
14+
# This program is distributed in the hope that it will be useful,
15+
# but WITHOUT ANY WARRANTY; without even the implied warranty of
16+
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
17+
# GNU Affero General Public License for more details.
18+
#
19+
# You should have received a copy of the GNU Affero General Public License
20+
# along with this program. If not, see <https://www.gnu.org/licenses/>.
21+
#
22+
# MAINTAINER
23+
# Marko Luther, 2026
1424
#
1525
# AUTHOR
1626
# Marko Luther 2023

.ci/install-linux.sh

Lines changed: 18 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,25 @@
22
# ABOUT
33
# CI install shell script for Artisan Linux builds
44
#
5+
# COPYRIGHT (C) 2010-2026 The Artisan team represented by
6+
# Marko Luther <marko.luther@gmx.net> (maintainer) and all contributors
7+
#
58
# LICENSE
6-
# This program or module is free software: you can redistribute it and/or
7-
# modify it under the terms of the GNU General Public License as published
8-
# by the Free Software Foundation, either version 2 of the License, or
9-
# version 3 of the License, or (at your option) any later versison. It is
10-
# provided for educational purposes and is distributed in the hope that
11-
# it will be useful, but WITHOUT ANY WARRANTY; without even the implied
12-
# warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See
13-
# the GNU General Public License for more details.
9+
# This program or module is free software: you can redistribute it and/or modify
10+
# it under the terms of the GNU Affero General Public License as
11+
# published by the Free Software Foundation, either version 3 of the
12+
# License, or (at your option) any later version.
13+
#
14+
# This program is distributed in the hope that it will be useful,
15+
# but WITHOUT ANY WARRANTY; without even the implied warranty of
16+
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
17+
# GNU Affero General Public License for more details.
18+
#
19+
# You should have received a copy of the GNU Affero General Public License
20+
# along with this program. If not, see <https://www.gnu.org/licenses/>.
21+
#
22+
# MAINTAINER
23+
# Marko Luther, 2026
1424
#
1525
# AUTHOR
1626
# Dave Baxter, Marko Luther 2023

.ci/install-macos.sh

Lines changed: 17 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,16 +2,25 @@
22
# ABOUT
33
# CI install shell script for Artisan macOS builds
44
#
5+
# COPYRIGHT (C) 2010-2026 The Artisan team represented by
6+
# Marko Luther <marko.luther@gmx.net> (maintainer) and all contributors
7+
#
58
# LICENSE
6-
# This program or module is free software: you can redistribute it and/or
7-
# modify it under the terms of the GNU General Public License as published
8-
# by the Free Software Foundation, either version 2 of the License, or
9-
# version 3 of the License, or (at your option) any later versison. It is
10-
# provided for educational purposes and is distributed in the hope that
11-
# it will be useful, but WITHOUT ANY WARRANTY; without even the implied
12-
# warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See
13-
# the GNU General Public License for more details.
9+
# This program or module is free software: you can redistribute it and/or modify
10+
# it under the terms of the GNU Affero General Public License as
11+
# published by the Free Software Foundation, either version 3 of the
12+
# License, or (at your option) any later version.
13+
#
14+
# This program is distributed in the hope that it will be useful,
15+
# but WITHOUT ANY WARRANTY; without even the implied warranty of
16+
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
17+
# GNU Affero General Public License for more details.
18+
#
19+
# You should have received a copy of the GNU Affero General Public License
20+
# along with this program. If not, see <https://www.gnu.org/licenses/>.
1421
#
22+
# MAINTAINER
23+
# Marko Luther, 2026
1524
# AUTHOR
1625
# Dave Baxter, Marko Luther 2025
1726

.ci/install-win.bat

Lines changed: 18 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,25 @@
22
:: ABOUT
33
:: Install script for Artisan Windows CI builds
44
::
5+
:: COPYRIGHT (C) 2010-2026 The Artisan team represented by
6+
:: Marko Luther <marko.luther@gmx.net> (maintainer) and all contributors
7+
::
58
:: LICENSE
6-
:: This program or module is free software: you can redistribute it and/or
7-
:: modify it under the terms of the GNU General Public License as published
8-
:: by the Free Software Foundation, either version 2 of the License, or
9-
:: version 3 of the License, or (at your option) any later versison. It is
10-
:: provided for educational purposes and is distributed in the hope that
11-
:: it will be useful, but WITHOUT ANY WARRANTY; without even the implied
12-
:: warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See
13-
:: the GNU General Public License for more details.
9+
:: This program or module is free software: you can redistribute it and/or modify
10+
:: it under the terms of the GNU Affero General Public License as
11+
:: published by the Free Software Foundation, either version 3 of the
12+
:: License, or (at your option) any later version.
13+
::
14+
:: This program is distributed in the hope that it will be useful,
15+
:: but WITHOUT ANY WARRANTY; without even the implied warranty of
16+
:: MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
17+
:: GNU Affero General Public License for more details.
18+
::
19+
:: You should have received a copy of the GNU Affero General Public License
20+
:: along with this program. If not, see <https://www.gnu.org/licenses/>.
21+
::
22+
:: MAINTAINER
23+
:: Marko Luther, 2026
1424
::
1525
:: AUTHOR
1626
:: Dave Baxter, Marko Luther 2023

.ci/upgrade-py-win.bat

Lines changed: 22 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -2,23 +2,33 @@
22
:: ABOUT
33
:: Script to upgrade Python for Artisan Windows CI builds
44
::
5+
:: COPYRIGHT (C) 2010-2026 The Artisan team represented by
6+
:: Marko Luther <marko.luther@gmx.net> (maintainer) and all contributors
7+
::
58
:: LICENSE
6-
:: This program or module is free software: you can redistribute it and/or
7-
:: modify it under the terms of the GNU General Public License as published
8-
:: by the Free Software Foundation, either version 2 of the License, or
9-
:: version 3 of the License, or (at your option) any later versison. It is
10-
:: provided for educational purposes and is distributed in the hope that
11-
:: it will be useful, but WITHOUT ANY WARRANTY; without even the implied
12-
:: warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See
13-
:: the GNU General Public License for more details.
9+
:: This program or module is free software: you can redistribute it and/or modify
10+
:: it under the terms of the GNU Affero General Public License as
11+
:: published by the Free Software Foundation, either version 3 of the
12+
:: License, or (at your option) any later version.
13+
::
14+
:: This program is distributed in the hope that it will be useful,
15+
:: but WITHOUT ANY WARRANTY; without even the implied warranty of
16+
:: MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
17+
:: GNU Affero General Public License for more details.
18+
::
19+
:: You should have received a copy of the GNU Affero General Public License
20+
:: along with this program. If not, see <https://www.gnu.org/licenses/>.
21+
::
22+
:: MAINTAINER
23+
:: Marko Luther, 2026
1424
::
1525
:: AUTHOR
1626
:: Dave Baxter 2025
1727
::
1828
:: Upgrade the Python version to PYUPGRADE_WIN_VER whenever the environment variable exists
19-
:: and the upgrade version is greater than current Python version.
29+
:: and the upgrade version is greater than current Python version.
2030
::
21-
:: Requires environment variables set in .appveyor.yml:
31+
:: Requires environment variables set in .appveyor.yml:
2232
:: PYUPGRADE_WIN_VER set to the full version number for target upgrade, or blank, or non-existent.
2333
:: PREV_PYTHON_PATH set to the python.exe path corresponding to the original environment: PYTHON_V variable.
2434
:: Creates local scope environment variables: PREV_PYTHON_VER, INSTALLED_PYTHON_VER not available outside this script.
@@ -41,7 +51,7 @@ if exist "%PREV_PYTHON_PATH%\python.exe" (
4151
:: Log an informational message
4252
echo *** Current Python Version: !PREV_PYTHON_VER! Upgrade to: !PYUPGRADE_WIN_VER! requested
4353

44-
:: Check if both current and upgrade full versions match
54+
:: Check if both current and upgrade full versions match
4555
if "!PREV_PYTHON_VER!"=="!PYUPGRADE_WIN_VER!" (
4656
echo *** Versions are the same. No need to upgrade.
4757
goto End
@@ -67,7 +77,7 @@ if !major_py! lss !major_up! (
6777
goto NoUpgrade
6878
)
6979
if !minor_py! lss !minor_up! (
70-
echo PYTHON_PATH !PYTHON_PATH!
80+
echo PYTHON_PATH !PYTHON_PATH!
7181
if exist "!PYTHON_PATH!\python.exe" (
7282
echo !PYTHON_PATH!\python.exe EXISTS
7383
for /f "tokens=2 delims= " %%a in ('!PYTHON_PATH!\python -V 2^>^&1') do (

.ci/upload.sh

Lines changed: 19 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -5,16 +5,26 @@
55
# Attribution
66
# This script was rewriten, simplified and adapted for Artisan Appveyor CI based on https://github.com/probonopd/uploadtool
77
# uploadtool.sh is published under the MIT license, Copyright (c) 2016 Simon Peter
8-
#
8+
#
9+
# COPYRIGHT (C) 2010-2026 The Artisan team represented by
10+
# Marko Luther <marko.luther@gmx.net> (maintainer) and all contributors
11+
#
912
# LICENSE
10-
# This program or module is free software: you can redistribute it and/or
11-
# modify it under the terms of the GNU General Public License as published
12-
# by the Free Software Foundation, either version 2 of the License, or
13-
# version 3 of the License, or (at your option) any later versison. It is
14-
# provided for educational purposes and is distributed in the hope that
15-
# it will be useful, but WITHOUT ANY WARRANTY; without even the implied
16-
# warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See
17-
# the GNU General Public License for more details.
13+
# This program or module is free software: you can redistribute it and/or modify
14+
# it under the terms of the GNU Affero General Public License as
15+
# published by the Free Software Foundation, either version 3 of the
16+
# License, or (at your option) any later version.
17+
#
18+
# This program is distributed in the hope that it will be useful,
19+
# but WITHOUT ANY WARRANTY; without even the implied warranty of
20+
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
21+
# GNU Affero General Public License for more details.
22+
#
23+
# You should have received a copy of the GNU Affero General Public License
24+
# along with this program. If not, see <https://www.gnu.org/licenses/>.
25+
#
26+
# MAINTAINER
27+
# Marko Luther, 2026
1828
#
1929
# AUTHOR
2030
# Dave Baxter, Rui Paulo, Marko Luther 2023

README.md

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -127,5 +127,4 @@ Version History
127127
----
128128
License
129129
-------
130-
131-
[![](http://www.gnu.org/graphics/gplv3-88x31.png)](http://www.gnu.org/copyleft/gpl.html)
130+
[![](http://www.gnu.org/graphics/agplv3-88x31.png)](https://www.gnu.org/licenses/agpl-3.0.html)
43 Bytes
Binary file not shown.
47 Bytes
Binary file not shown.

doc/help_dialogs/Output_html/eventbuttons_help.html

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -952,6 +952,11 @@
952952
<td>showBackgroundEvents(&lt;bool&gt;)</td>
953953
<td>shows/hides the events of the background profile</td>
954954
</tr>
955+
<tr>
956+
<td>&#160;</td>
957+
<td>upload2RoastHubs</td>
958+
<td>upload current loaded profile to RoastHubs</td>
959+
</tr>
955960
<tr>
956961
<td>RC Command</td>
957962
<td>pulse(ch,min,max[,sn])</td>

0 commit comments

Comments
 (0)