Skip to content

Commit 6aeeb29

Browse files
pifopipifopi
committed
a
1 parent 0e03ab0 commit 6aeeb29

File tree

3 files changed

+115
-114
lines changed

3 files changed

+115
-114
lines changed

‎README.md‎

Lines changed: 30 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -1,30 +1,30 @@
1-
# Arduino-Source
2-
3-
This is the source code for all the main Arduino programs.
4-
5-
[<img src="https://canary.discordapp.com/api/guilds/695809740428673034/widget.png?style=banner2">](https://discord.gg/cQ4gWxN)
6-
7-
8-
# Licensing:
9-
- Unless otherwise specified, all source code in this repository is under the MIT license.
10-
- Some files may be under other (compatible) licenses.
11-
- All precompiled binaries and object files are free for non-commercial use only. For all other uses, please contact the Pokémon Automation server admins.
12-
13-
# Dependencies:
14-
15-
| **Dependency** | **License** |
16-
| --- | --- |
17-
| Qt5 and Qt6 | LGPLv3 |
18-
| [QDarkStyleSheet](https://github.com/ColinDuquesnoy/QDarkStyleSheet) | MIT |
19-
| [Qt Wav Reader](https://code.qt.io/cgit/qt/qtmultimedia.git/tree/examples/multimedia/spectrum/app/wavfile.cpp?h=5.15) | BSD |
20-
| [nlohmann json](https://github.com/nlohmann/json) | MIT |
21-
| [D++](https://github.com/brainboxdotcc/DPP) | Apache 2.0 |
22-
| [LUFA](https://github.com/abcminiuser/lufa) | MIT |
23-
| [Tesseract](https://github.com/tesseract-ocr/tesseract) | Apache 2.0 |
24-
| [Tesseract for Windows](https://github.com/peirick/Tesseract-OCR_for_Windows) | Apache 2.0 |
25-
| [OpenCV](https://github.com/opencv/opencv) | Apache 2.0 |
26-
| [ONNX](https://github.com/microsoft/onnxruntime) | MIT |
27-
28-
Vanilla GPL is disallowed, though LGPL is allowed. This is for the following reasons:
29-
1. A tiny portion of the project is not open-sourced. (mostly related to telemetry and internal research experiments)
30-
2. We reserve right to re-license the project in ways that do not abide by the copy-left requirement of GPL.
1+
# Arduino-Source
2+
3+
This is the source code for all the main Arduino programs.
4+
5+
[<img src="https://canary.discordapp.com/api/guilds/695809740428673034/widget.png?style=banner2">](https://discord.gg/cQ4gWxN)
6+
7+
8+
# Licensing:
9+
- Unless otherwise specified, all source code in this repository is under the MIT license.
10+
- Some files may be under other (compatible) licenses.
11+
- All precompiled binaries and object files are free for non-commercial use only. For all other uses, please contact the Pokémon Automation server admins.
12+
13+
# Dependencies:
14+
15+
| **Dependency** | **License** |
16+
| --- | --- |
17+
| Qt5 and Qt6 | LGPLv3 |
18+
| [QDarkStyleSheet](https://github.com/ColinDuquesnoy/QDarkStyleSheet) | MIT |
19+
| [Qt Wav Reader](https://code.qt.io/cgit/qt/qtmultimedia.git/tree/examples/multimedia/spectrum/app/wavfile.cpp?h=5.15) | BSD |
20+
| [nlohmann json](https://github.com/nlohmann/json) | MIT |
21+
| [D++](https://github.com/brainboxdotcc/DPP) | Apache 2.0 |
22+
| [LUFA](https://github.com/abcminiuser/lufa) | MIT |
23+
| [Tesseract](https://github.com/tesseract-ocr/tesseract) | Apache 2.0 |
24+
| [Tesseract for Windows](https://github.com/peirick/Tesseract-OCR_for_Windows) | Apache 2.0 |
25+
| [OpenCV](https://github.com/opencv/opencv) | Apache 2.0 |
26+
| [ONNX](https://github.com/microsoft/onnxruntime) | MIT |
27+
28+
Vanilla GPL is disallowed, though LGPL is allowed. This is for the following reasons:
29+
1. A tiny portion of the project is not open-sourced. (mostly related to telemetry and internal research experiments)
30+
2. We reserve right to re-license the project in ways that do not abide by the copy-left requirement of GPL.

‎SerialPrograms/Source/Integrations/DiscordSettingsOption.cpp‎

Lines changed: 84 additions & 84 deletions
Original file line numberDiff line numberDiff line change
@@ -1,84 +1,84 @@
1-
/* Discord Settings
2-
*
3-
* From: https://github.com/PokemonAutomation/
4-
*
5-
*/
6-
7-
#include "Common/Qt/Options/BatchWidget.h"
8-
#include "CommonFramework/GlobalSettingsPanel.h"
9-
#include "DiscordSettingsOption.h"
10-
11-
//#include <iostream>
12-
//using std::cout;
13-
//using std::endl;
14-
15-
namespace PokemonAutomation{
16-
namespace Integration{
17-
18-
19-
20-
21-
22-
DiscordMessageSettingsOption::DiscordMessageSettingsOption()
23-
: BatchOption(LockMode::LOCK_WHILE_RUNNING)
24-
, instance_name(
25-
false,
26-
"<b>Instance Name:</b><br>If you are running multiple instances of this program, give it a name to distinguish them in notifications.",
27-
LockMode::LOCK_WHILE_RUNNING,
28-
"",
29-
"(e.g. Living Room Switch)"
30-
)
31-
, user_id(
32-
false,
33-
"<b>Discord User ID:</b><br>Set this to your discord user ID to receive pings. Your ID is a number.",
34-
LockMode::LOCK_WHILE_RUNNING,
35-
"",
36-
"123456789012345678"
37-
)
38-
, message(
39-
false,
40-
"<b>Discord Message:</b><br>Message to put on every discord notification.",
41-
LockMode::LOCK_WHILE_RUNNING,
42-
"",
43-
"(e.g. Kim's Shiny Hunt)"
44-
)
45-
{
46-
PA_ADD_OPTION(instance_name);
47-
PA_ADD_OPTION(user_id);
48-
// if (PreloadSettings::instance().DEVELOPER_MODE){
49-
// PA_ADD_OPTION(message);
50-
// }
51-
}
52-
class DiscordMessageSettingsOptionUI : public BatchWidget{
53-
public:
54-
DiscordMessageSettingsOptionUI(QWidget& parent, DiscordMessageSettingsOption& value);
55-
};
56-
DiscordMessageSettingsOptionUI::DiscordMessageSettingsOptionUI(QWidget& parent, DiscordMessageSettingsOption& value)
57-
: BatchWidget(parent, value)
58-
{}
59-
ConfigWidget* DiscordMessageSettingsOption::make_QtWidget(QWidget& parent){
60-
return new DiscordMessageSettingsOptionUI(parent, *this);
61-
}
62-
63-
64-
65-
66-
67-
68-
DiscordSettingsOption::DiscordSettingsOption()
69-
: BatchOption(LockMode::LOCK_WHILE_RUNNING)
70-
{
71-
PA_ADD_OPTION(message);
72-
PA_ADD_OPTION(webhooks);
73-
#ifdef PA_DPP
74-
PA_ADD_OPTION(integration);
75-
#endif
76-
}
77-
78-
79-
80-
81-
82-
}
83-
}
84-
1+
/* Discord Settings
2+
*
3+
* From: https://github.com/PokemonAutomation/
4+
*
5+
*/
6+
7+
#include "Common/Qt/Options/BatchWidget.h"
8+
#include "CommonFramework/GlobalSettingsPanel.h"
9+
#include "DiscordSettingsOption.h"
10+
11+
//#include <iostream>
12+
//using std::cout;
13+
//using std::endl;
14+
15+
namespace PokemonAutomation{
16+
namespace Integration{
17+
18+
19+
20+
21+
22+
DiscordMessageSettingsOption::DiscordMessageSettingsOption()
23+
: BatchOption(LockMode::LOCK_WHILE_RUNNING)
24+
, instance_name(
25+
false,
26+
"<b>Instance Name:</b><br>If you are running multiple instances of this program, give it a name to distinguish them in notifications.",
27+
LockMode::LOCK_WHILE_RUNNING,
28+
"",
29+
"(e.g. Living Room Switch)"
30+
)
31+
, user_id(
32+
false,
33+
"<b>Discord User ID:</b><br>Set this to your discord user ID to receive pings. Your ID is a number.",
34+
LockMode::LOCK_WHILE_RUNNING,
35+
"",
36+
"123456789012345678"
37+
)
38+
, message(
39+
false,
40+
"<b>Discord Message:</b><br>Message to put on every discord notification.",
41+
LockMode::LOCK_WHILE_RUNNING,
42+
"",
43+
"(e.g. Kim's Shiny Hunt)"
44+
)
45+
{
46+
PA_ADD_OPTION(instance_name);
47+
PA_ADD_OPTION(user_id);
48+
// if (PreloadSettings::instance().DEVELOPER_MODE){
49+
// PA_ADD_OPTION(message);
50+
// }
51+
}
52+
class DiscordMessageSettingsOptionUI : public BatchWidget{
53+
public:
54+
DiscordMessageSettingsOptionUI(QWidget& parent, DiscordMessageSettingsOption& value);
55+
};
56+
DiscordMessageSettingsOptionUI::DiscordMessageSettingsOptionUI(QWidget& parent, DiscordMessageSettingsOption& value)
57+
: BatchWidget(parent, value)
58+
{}
59+
ConfigWidget* DiscordMessageSettingsOption::make_QtWidget(QWidget& parent){
60+
return new DiscordMessageSettingsOptionUI(parent, *this);
61+
}
62+
63+
64+
65+
66+
67+
68+
DiscordSettingsOption::DiscordSettingsOption()
69+
: BatchOption(LockMode::LOCK_WHILE_RUNNING)
70+
{
71+
PA_ADD_OPTION(message);
72+
PA_ADD_OPTION(webhooks);
73+
#ifdef PA_DPP
74+
PA_ADD_OPTION(integration);
75+
#endif
76+
}
77+
78+
79+
80+
81+
82+
}
83+
}
84+

‎vcpkg‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Subproject commit 9e8416f15d93fa9347e3291bd8c128dd44200ba5

0 commit comments

Comments
 (0)