Skip to content

Commit

Permalink
Merge branch 'master' into e1.37-2
Browse files Browse the repository at this point in the history
  • Loading branch information
peternewman authored Feb 3, 2025
2 parents 4554e35 + b90866c commit 4428e40
Show file tree
Hide file tree
Showing 359 changed files with 22,771 additions and 1,651 deletions.
53 changes: 47 additions & 6 deletions .codespellignorelines
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@
/(?:([0-9]{1,3})(?:\s+THRU\s+([0-9]{0,3}))?)(?:\s+@\s+([0-9]{0,3}))?$/);
str = str.replace('>', 'THRU');
' THRU ' + ola.common.DmxConstants.MAX_CHANNEL_NUMBER);
' THRU ' + ola.common.DmxConstants.MAX_CHANNEL_NUMBER);
// If it's the T or > keys, autocomplete 'THRU'
case 'U': // THRU
var values = ['7', '8', '9', ' THRU ', '4', '5', '6', ' @ ', '1', '2', '3',
Expand Down Expand Up @@ -66,6 +65,7 @@ const uint8_t BaseRobeWidget::SOM;
manufacturer_name: "Guangzhou Litewise Lighting Equipments Co., Ltd. dba \"EK Lights\""
manufacturer_name: "Guangzhou VAS Lighting Co., Ltd."
manufacturer_name: "ARRI -- Arnold & Richter Cine Technik GmbH & Co. Betriebs KG"
manufacturer_name: "MEDIAM Ltd. (Modus brand)"
manufacturer_name: "SRM Technik GmbH"
manufacturer_name: "medien technik cords"
manufacturer_name: "TBE Srl"
Expand Down Expand Up @@ -105,9 +105,6 @@ const uint8_t BaseRobeWidget::SOM;
OLA_ASSERT_EQ(expected, JsonWriter::AsString(uint_value));
* Test the uint item
" \"type\": \"uint\",\n"
" \"type\": \"uint\",\n"
" \"type\": \"uint\",\n"
" \"type\": \"uint\",\n"
std::map<std::string, UIntMap*> m_uint_map_variables;
if (message.uint_offset < MAX_UINT_FIELDS) {
message.uint16_fields[message.uint_offset++] = field->Value();
Expand All @@ -118,10 +115,8 @@ const uint8_t BaseRobeWidget::SOM;
status_message() : uint_offset(0), int_offset(0), status_type(0),
std::string Type() const { return "uint"; }
if (items[i]['type'] == 'uint') {
if (items[i]['type'] == 'uint') {
if (type == 'string' || type == 'uint' || type == 'hidden') {
const char RDMHTTPModule::GENERIC_UINT_FIELD[] = "int";
section.AddItem(new HiddenItem("1", GENERIC_UINT_FIELD));
section.AddItem(new HiddenItem("1", GENERIC_UINT_FIELD));
SelectItem *item = new SelectItem("Personality", GENERIC_UINT_FIELD);
string personality_str = request->GetParameter(GENERIC_UINT_FIELD);
Expand Down Expand Up @@ -177,3 +172,49 @@ import java.nio.ByteOrder;
byte[] header = ByteBuffer.allocate(4).order(ByteOrder.nativeOrder()).putInt(headerContent).array();
int headerValue = ByteBuffer.wrap(header).order(ByteOrder.nativeOrder()).getInt();
# This is a very bodgy workaround to the fact that the pip install of the archive doesn't seem to work properly now on Travis
"uest\032\036.ola.rpc.STREAMING_NO_RESPONSEB\006\200\001"
s1 = "one\"two\\three/four\bfive\fsix\nseven\reight\tnine";
string("one\\\"two\\\\three\\/four\\bfive\\fsix\\nseven\\reight\\tnine"),
s1 = "one\"two\\three/four\bfive\fsix\nseven\reight\tnine";
string("one\\\"two\\\\three\\/four\\bfive\\fsix\\nseven\\reight\\tnine"),
self.assertEqual(ResponderTestFixture._EscapeData(u'caf\xe9'), "caf\\xe9")
self.assertEqual('%s' % ResponderTestFixture._EscapeData(u'caf\xe9'),
"caf\\xe9")
self.assertEqual('%s' % ResponderTestFixture._EscapeData(['caf\xe9']),
"['caf\\\\xe9']")
self.assertEqual('%s' % ResponderTestFixture._EscapeData({"a": "caf\xe9"}),
"{'a': 'caf\\\\xe9'}")
# {"caf\xe9": "bar"}),
# "{'caf\\xe9': 'bar'}")
self.assertEqual('caf\\xe9', StringEscape(u'caf\xe9'))
self.assertEqual('caf\\xe9', ("%s" % StringEscape(u'caf\xe9')))
"forin": true,
manufacturer_name: "ags - Wissenschaftliche Arbeitsgemeinschaft fur Studio- und Senderfragen"
manufacturer_name: "Beyond Lighting WLL"
manufacturer_name: "Ambion GmbH (Ambrain)"
manufacturer_name: "Bion Technologies GmbH"
manufacturer_name: "Covert Science GmbH"
manufacturer_name: "Cristal Controles"
manufacturer_name: "DJSI Schinstad ANS (Northern Light)"
manufacturer_name: "GuangZhou Huanshi Lighting Equipment Co., Limited"
manufacturer_name: "Guangzhou Nanshi Light Equipment Co., Ltd."
manufacturer_name: "Ingenieurbuero fuer Nachrichtentechnik in der Studio und Veranstaltungstechnik"
manufacturer_name: "MEB Veranstaltungstechnik GmbH"
manufacturer_name: "Serva Transport Systems GmbH"
manufacturer_name: "Shanghai Sansi Electronic Engineering Co.,Ltd"
manufacturer_name: "expanseElectronics"
manufacturer_name: "Guangzhou Baiyun District Sanjie Eletronic Stage Lighting Audio Equipment Factory"
manufacturer_name: "UP-LUX Eletronica Ltda."
manufacturer_name: "WebKat Eletronic's"
manufacturer_name: "Inster Co, Ltd"
manufacturer_name: "Cristal Controles"
manufacturer_name: "L.E.C. Societe Lyonnaise D' Equipement Et De Controle"
manufacturer_name: "AUTOLUX Handels- und ProduktionsgmbH"
manufacturer_name: "LC Handels GmbH"
manufacturer_name: "LKE Lasershowtechnik GmbH"
manufacturer_name: "Shenzhen AOTO Electronics Co., Ltd."
manufacturer_name: "Shenzhen showho technolgy co.,ltd"
manufacturer_name: "Interesting Products, Inc."
manufacturer_name: "Sting Alleman"
dcmd mv ../*ges built/
run: autopkgtest --output-dir=test-output built/*ges -- null
4 changes: 3 additions & 1 deletion .codespellignorewords
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
thead
acn
ACN
inflight
thead
wronly
10 changes: 10 additions & 0 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
# See: https://docs.github.com/code-security/dependabot/dependabot-version-updates/configuration-options-for-the-dependabot.yml-file#about-the-dependabotyml-file
version: 2

updates:
# Configure check for outdated GitHub Actions actions in workflows.
# See: https://docs.github.com/code-security/dependabot/working-with-dependabot/keeping-your-actions-up-to-date-with-dependabot
- package-ecosystem: github-actions
directory: / # Check the repository's workflows under /.github/workflows/
schedule:
interval: daily
15 changes: 15 additions & 0 deletions .github/problem-matcher-build-verify-trees.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
{
"problemMatcher": [
{
"owner": "build-verify-trees",
"severity": "error",
"pattern": [
{
"regexp": "^(Missing from tarball)(\\s+)(.+)$",
"message": 1,
"file": 3
}
]
}
]
}
16 changes: 16 additions & 0 deletions .github/problem-matcher-lint-check-licences.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
{
"problemMatcher": [
{
"owner": "lint-check-licences",
"pattern": [
{
"regexp": "^(notice|error)(:(file|dir):([^:]+)(:lines? (\\d+)(-(\\d+))?)?)?: (.+)$",
"severity": 1,
"file": 4,
"line": 6,
"message": 9
}
]
}
]
}
17 changes: 17 additions & 0 deletions .github/problem-matcher-lint-cpplint.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
{
"problemMatcher": [
{
"owner": "lint-cpplint",
"severity": "error",
"pattern": [
{
"regexp": "^(.+):(\\d+):\\s+((.+)\\s+\\[(.*)\\]\\s\\[(.*)\\])$",
"file": 1,
"line": 2,
"message": 3,
"code": 5
}
]
}
]
}
16 changes: 16 additions & 0 deletions .github/problem-matcher-lint-generic-nolints.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
{
"problemMatcher": [
{
"owner": "lint-generic-nolints",
"pattern": [
{
"regexp": "^(notice|error)(:(file|dir):([^:]+)(:lines? (\\d+)(-(\\d+))?)?)?: (.+)$",
"severity": 1,
"file": 4,
"line": 6,
"message": 9
}
]
}
]
}
15 changes: 15 additions & 0 deletions .github/problem-matcher-lint-spellintian.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
{
"problemMatcher": [
{
"owner": "lint-spellintian",
"severity": "warning",
"pattern": [
{
"regexp": "^([^:]+):(\\s+)(.+)$",
"file": 1,
"message": 3
}
]
}
]
}
24 changes: 0 additions & 24 deletions .github/workflows/annotation.yml

This file was deleted.

Loading

0 comments on commit 4428e40

Please sign in to comment.