Skip to content

Commit a4d9598

Browse files
committed
Add version specific patches
1 parent fc8d73a commit a4d9598

File tree

6 files changed

+42
-15
lines changed

6 files changed

+42
-15
lines changed

patches/disable_new_firmware_popup.patch

Lines changed: 0 additions & 13 deletions
This file was deleted.

patches/generic_ports.patch

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@ index b7314ef9..2a084e16 100644
33
--- a/src/connect/planner.cpp
44
+++ b/src/connect/planner.cpp
55
@@ -142,10 +142,12 @@ namespace {
6-
6+
77
tuple<const char *, uint16_t> host_and_port(const Printer::Config &config, optional<uint16_t> port_override) {
88
uint16_t port = config.port;
99
- if (port == 443 && config.tls) {
10-
+
10+
+
1111
+ if (config.tls) {
1212
// Go from encrypted to the unencrypted port automatically.
1313
- port = 80;
Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
diff --git a/src/common/gcode/gcode_info.cpp b/src/common/gcode/gcode_info.cpp
2+
index 456626b80..bea06739c 100644
3+
--- a/src/common/gcode/gcode_info.cpp
4+
+++ b/src/common/gcode/gcode_info.cpp
5+
@@ -412,10 +412,10 @@ void GCodeInfo::parse_gcode(GCodeInfo::Buffer::String cmd, uint32_t &gcode_count
6+
*cmd.end = '\0';
7+
}
8+
9+
- if (!is_up_to_date(cmd.c_str())) {
10+
+ /*if (!is_up_to_date(cmd.c_str())) {
11+
valid_printer_settings.outdated_firmware.fail();
12+
strncpy(valid_printer_settings.latest_fw_version, cmd.c_str(), min(sizeof(valid_printer_settings.latest_fw_version), cmd.len()));
13+
- }
14+
+ }*/
15+
}
16+
}
17+
}

patches/v5.1.0-alpha1/.gitkeep

Whitespace-only changes.
Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
diff --git a/src/common/gcode/gcode_info.cpp b/src/common/gcode/gcode_info.cpp
2+
index f82921ded..40e8d17d8 100644
3+
--- a/src/common/gcode/gcode_info.cpp
4+
+++ b/src/common/gcode/gcode_info.cpp
5+
@@ -406,10 +406,10 @@ void GCodeInfo::parse_gcode(GcodeBuffer::String cmd, uint32_t &gcode_counter) {
6+
*cmd.end = '\0';
7+
}
8+
9+
- if (!is_up_to_date(cmd.c_str())) {
10+
+ /*if (!is_up_to_date(cmd.c_str())) {
11+
valid_printer_settings.outdated_firmware.fail();
12+
strncpy(valid_printer_settings.latest_fw_version, cmd.c_str(), min(sizeof(valid_printer_settings.latest_fw_version), cmd.len()));
13+
- }
14+
+ }*/
15+
}
16+
}
17+

scripts/build.sh

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,12 @@ for patch in "${ROOTDIR}/patches/"*.patch; do
3131
git apply -p1 < "${patch}"
3232
done
3333

34+
# Apply version specific patches
35+
for patch in "${ROOTDIR}/patches/$version/"*.patch; do
36+
echo "Applying patch: ${patch}"
37+
git apply -p1 < "${patch}"
38+
done
39+
3440
# Create new pipenv environment with pip 22.0
3541
pipenv --python 3.11 install pip==22.0
3642
export BUDDY_NO_VIRTUALENV=1

0 commit comments

Comments
 (0)