12 Commits

Author SHA1 Message Date
thysson2701
d8b5f22fc9 fix(branding): KX-Logo in allen UI-Dialogen korrekt anzeigen
- Splash: SVG durch direktes PNG-Laden ersetzt (nanosvg rendert kein
  eingebettetes Raster-PNG)
- About-Dialog: Logo auf 125px skaliert statt unkontrolliert 192px
- TroubleshootDialog, UpdateDialogs, ReleaseNote, MsgDialog:
  OrcaSlicer.svg → OrcaSlicer_192px.png (bereits KX-Logo)
2026-06-30 10:05:07 +02:00
thysson2701
7ed0173b75 feat(updater): Versionsprüfung auf Gitea OrcaSlicer-KX Releases umleiten
Ersetzt die orcaslicer.com/latest URL durch die Gitea API:
  https://gitea.it-drui.de/api/v1/repos/viewit/OrcaSlicer-KX/releases/latest

Das Gitea-JSON hat dasselbe Format wie GitHub (tag_name, html_url,
prerelease) — der bestehende Parser in check_new_version_sf() funktioniert
ohne weitere Änderungen. Telemetrie-Query-Parameter und Upstream-Signaturen
werden nicht mehr angehängt.
2026-06-29 23:42:09 +02:00
thysson2701
be5cd1cba5 fix(branding): About-Dialog lädt KX-Logo als PNG statt SVG
nanosvg unterstützt keine eingebetteten Rasterbilder (data:image/png).
Direkt OrcaSlicer_192px.png laden — bereits durch das KX-Logo ersetzt.
2026-06-29 23:38:31 +02:00
thysson2701
842b871577 feat(branding): OrcaKX-Logo als App-Icon und About/Splash-Logo einsetzen
Ersetzt alle OrcaSlicer-Logos durch das Orca-KX Fork-Logo (Kobra + Orca).
Betrifft: PNG-Icons (32/64/128/154/192px), Windows .ico, macOS .icns,
About-Dialog SVGs (light + dark) und Splash-Screen SVGs.
2026-06-29 14:34:37 +02:00
thysson2701
072732a6ee docs: README auf 2.4.1-kx1 aktualisieren 2026-06-29 10:03:39 +02:00
thysson2701
bb3d1c7562 fix(ams): exclude empty placeholder slots from AMS filament mapping
Empty AMS slots (is_tray_info_ready()==false) were included in
tray_filaments with id=0. The distance-map then stored tray_id=0 for
those slots, causing the greedy mapper to assign real project filaments
to the placeholder entry instead of their actual physical slot. On a
6-slot ACS/ACE with Slot 1 empty this shifted all mapped filaments by
one position.

Fix: skip any tray that is not ready (no color/type) before calling
_parse_tray_info() so only loaded slots enter the mapping pool.

Also keep index-alignment in get_ams_cobox_infos(): empty AMS entries
(filament_id empty) now push placeholder strings instead of being
silently skipped. This prevents the Overwriting-mode tab from accessing
m_ams_combo_info.ams_filament_colors at a shifted index, which caused
an out-of-bounds read and subsequent crash when switching sync modes
while a placeholder slot was present.

Fixes KX-Bridge-Release issue #67 comment #480 (slot-index shift +
Overwriting crash).
2026-06-29 10:03:28 +02:00
thysson2701
87f6e62f26 fix(moonraker): re-resolve host on user→user preset switch for AMS sync
Two Moonraker user presets on different ports (:7125, :7126) share the
same printer agent type. switch_printer_agent() only called select_machine()
when the agent *type* changed — not when the host changed within the same
agent. A user→user preset switch therefore left the MachineObject pointing
at the first connected printer, causing AMS sync to always query the wrong
host.

Fix: when the agent type stays the same (and is not the BBL agent),
also call select_machine() so the host is re-resolved from the current
preset and set_selected_machine() reconnects to the correct Moonraker
instance.

Fixes: AMS Sync locked to first printer in multi-printer sessions (SirPeroples)
2026-06-29 10:03:25 +02:00
thysson2701
31c667443e fix(compat): add aliases for wall_filament → outer_wall_filament_id; fix verify_build.sh
Adds .aliases = { "wall_filament", "wall_filament_id", "outer_wall_filament",
"perimeter_extruder" } to outer_wall_filament_id and .aliases = { "inner_wall_filament" }
to inner_wall_filament_id in PrintConfig.cpp so that old .3mf files using these legacy
keys do not throw UnknownOptionException on load.

Also corrects verify_build.sh CHECKS to search for "tray_sub_brands" (the actual binary
string) instead of the stale "filament_sub_brands".
2026-06-29 10:03:22 +02:00
thysson2701
709caca9b8 chore: alle Upstream-Workflows deaktivieren (on: {}) 2026-06-29 10:03:18 +02:00
a0894702c6 docs: README auf 2.4.0-kx1 aktualisieren 2026-06-29 10:02:59 +02:00
thysson2701
bd652afd8c fix(preset): Legacy-Aliases durch korrekte _id-Keys in s_Preset_print_options ersetzen
wall_filament, sparse_infill_filament, solid_infill_filament waren
unregistrierte Legacy-Aliases die beim Start UnknownOptionException
in apply_only() verursachten. Durch die korrekten registrierten Keys
(outer/inner_wall_filament_id, sparse/internal_solid/top/bottom_surface
_filament_id) ersetzt. Ausserdem fehlende Upstream-2.4.0-Keys ergaenzt:
lightning_*, bridge_line_width, relative_bridge_angle,
support_parallel_printheads, parallel_printheads_*, flashforge_serial_number.
2026-06-29 10:02:56 +02:00
thysson2701
6cba576fe4 feat(v2.4): KX-Linie auf Upstream 2.4.0 konsolidieren (2.4.0-kx1)
Neue 2.4-stable-Linie auf frischem orca-upstream/release/v2.4 (2.4.0):
- KX-Moonraker-Bridge (MoonrakerPrinterAgent.cpp/.hpp) übernommen
- Preset.cpp: KX-filament_id-Patches per 3way auf neuen Upstream appliziert
  (Upstream-Fixes 10.-21.06. erhalten)
- Issue #52: Vendor-Filter bei User-Presets überspringen
- AMS-Leerslot-Fix (DevFilaSystem.cpp + AMSItem.cpp): leerer Slot zeigt
  kein altes Filament mehr
- About-Hinweis, verify_build.sh, Filament-Bridge-Doku, README
- Version 2.4.0-kx1
2026-06-29 10:02:52 +02:00
1160 changed files with 5518 additions and 601346 deletions

View File

@@ -1,9 +0,0 @@
{
"features": {
"ghcr.io/devcontainers/features/desktop-lite:1": {
"version": "1.2.9",
"resolved": "ghcr.io/devcontainers/features/desktop-lite@sha256:d8649bc8ca8e50a52fbee29d281739ea05dc1022905b185434d6bbe9afc8f221",
"integrity": "sha256:d8649bc8ca8e50a52fbee29d281739ea05dc1022905b185434d6bbe9afc8f221"
}
}
}

View File

@@ -28,7 +28,7 @@ jobs:
curl -L -o OrcaSlicer_profile_validator https://github.com/OrcaSlicer/OrcaSlicer/releases/download/nightly-builds/OrcaSlicer_profile_validator_Linux_Ubuntu2404_nightly
chmod +x ./OrcaSlicer_profile_validator
# Validate all system profiles.
# validate profiles
- name: validate system profiles
id: validate_system
continue-on-error: true
@@ -50,101 +50,11 @@ jobs:
continue-on-error: true
working-directory: ${{ github.workspace }}
run: |
fixtures_dir="${{ runner.temp }}/profile-fixtures"
output_dir="${{ runner.temp }}/custom-preset-validation"
combined_log="${{ runner.temp }}/validate_custom.log"
summary="${output_dir}/summary.md"
release_url="https://github.com/OrcaSlicer/OrcaSlicer-profile-validator/releases/download/fixture-archive"
rm -rf "${fixtures_dir}" "${output_dir}"
mkdir -p "${fixtures_dir}" "${output_dir}"
curl -fsSL -o "${fixtures_dir}/manifest.json" "${release_url}/manifest.json"
MANIFEST_PATH="${fixtures_dir}/manifest.json" python3 <<'PY' > "${fixtures_dir}/fixtures.tsv"
import json
import os
with open(os.environ["MANIFEST_PATH"], encoding="utf-8") as fh:
manifest = json.load(fh)
if isinstance(manifest, dict):
entries = manifest.get("fixtures", [])
else:
entries = manifest
for entry in entries:
version = entry.get("version", "")
asset = entry.get("asset", "")
sha256 = entry.get("asset_sha256", "")
if not version or not asset:
continue
print(f"{version}\t{asset}\t{sha256}")
PY
if [ ! -s "${fixtures_dir}/fixtures.tsv" ]; then
echo "No custom preset fixtures found in ${release_url}/manifest.json" | tee "${combined_log}"
exit 1
fi
{
echo "## Custom Preset Fixture Validation"
echo ""
echo "| Version | Status | Log |"
echo "| --- | --- | --- |"
} > "${summary}"
status=0
failed_logs=()
while IFS=$'\t' read -r version asset expected_sha256; do
fixture_zip="${fixtures_dir}/${asset}"
asset_url_name="$(python3 -c 'import sys, urllib.parse; print(urllib.parse.quote(sys.argv[1], safe=""))' "${asset}")"
profile_tree="${output_dir}/profiles-${version}"
log_path="${output_dir}/${version}.log"
curl -fsSL -o "${fixture_zip}" "${release_url}/${asset_url_name}"
if [ -n "${expected_sha256}" ] && [ "${expected_sha256}" != "<sha256>" ]; then
echo "${expected_sha256} ${fixture_zip}" | sha256sum -c -
fi
rm -rf "${profile_tree}"
mkdir -p "${profile_tree}"
cp -a "${{ github.workspace }}/resources/profiles/." "${profile_tree}/"
rm -rf "${profile_tree}/user"
unzip -q "${fixture_zip}" -d "${profile_tree}"
set +e
./OrcaSlicer_profile_validator -p "${profile_tree}" -l 2 > "${log_path}" 2>&1
result=$?
set -e
if [ "${result}" -eq 0 ]; then
echo "| ${version} | PASS | ${version}.log |" >> "${summary}"
else
echo "| ${version} | FAIL | ${version}.log |" >> "${summary}"
failed_logs+=("${log_path}")
status=1
fi
done < "${fixtures_dir}/fixtures.tsv"
{
cat "${summary}"
if [ "${#failed_logs[@]}" -gt 0 ]; then
echo ""
echo "## Failed Fixture Logs"
for log_path in "${failed_logs[@]}"; do
echo ""
echo "### $(basename "${log_path}" .log)"
echo '```'
head -c 12000 "${log_path}" || echo "No output captured"
echo '```'
done
fi
} | tee "${combined_log}"
exit "${status}"
set +e
curl -LJO https://github.com/OrcaSlicer/OrcaSlicer/releases/download/nightly-builds/orca_custom_preset_tests.zip
unzip -q ./orca_custom_preset_tests.zip -d ${{ github.workspace }}/resources/profiles
./OrcaSlicer_profile_validator -p ${{ github.workspace }}/resources/profiles -l 2 2>&1 | tee ${{ runner.temp }}/validate_custom.log
exit ${PIPESTATUS[0]}
- name: Prepare PR number for comment workflow
if: ${{ always() && github.event_name == 'pull_request' }}

2
.gitignore vendored
View File

@@ -49,5 +49,3 @@ internal_docs/
# Python bytecode
__pycache__/
*.pyc
*.3mf
*.gcode

View File

@@ -85,7 +85,6 @@ else ()
endif ()
find_package(Git)
set(GIT_COMMIT_HASH "0000000")
if(DEFINED ENV{git_commit_hash} AND NOT "$ENV{git_commit_hash}" STREQUAL "")
message(STATUS "Specified git commit hash: $ENV{git_commit_hash}")
if(GIT_FOUND AND EXISTS "${CMAKE_SOURCE_DIR}/.git")
@@ -100,6 +99,7 @@ if(DEFINED ENV{git_commit_hash} AND NOT "$ENV{git_commit_hash}" STREQUAL "")
# No .git directory (e.g., Flatpak sandbox) — truncate directly
string(SUBSTRING "$ENV{git_commit_hash}" 0 7 GIT_COMMIT_HASH)
endif()
add_definitions("-DGIT_COMMIT_HASH=\"${GIT_COMMIT_HASH}\"")
elseif(GIT_FOUND AND EXISTS "${CMAKE_SOURCE_DIR}/.git")
# Check current Git commit hash
execute_process(
@@ -108,6 +108,7 @@ elseif(GIT_FOUND AND EXISTS "${CMAKE_SOURCE_DIR}/.git")
OUTPUT_VARIABLE GIT_COMMIT_HASH
OUTPUT_STRIP_TRAILING_WHITESPACE
)
add_definitions("-DGIT_COMMIT_HASH=\"${GIT_COMMIT_HASH}\"")
endif()
if(DEFINED ENV{SLIC3R_STATIC})
@@ -433,8 +434,8 @@ if (NOT MSVC AND ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU" OR "${CMAKE_CXX_COMP
if((${CMAKE_CXX_COMPILER_ID} STREQUAL "Clang" OR ${CMAKE_CXX_COMPILER_ID} STREQUAL "AppleClang") AND ${CMAKE_CXX_COMPILER_VERSION} VERSION_GREATER 15)
include(CheckCXXCompilerFlag)
check_cxx_compiler_flag("-Werror=unknown-warning-option -Wno-error=enum-constexpr-conversion" HAS_WNO_ERROR_ENUM_CONSTEXPR_CONV_STRICT)
if(HAS_WNO_ERROR_ENUM_CONSTEXPR_CONV_STRICT)
check_cxx_compiler_flag(-Wno-error=enum-constexpr-conversion HAS_WNO_ERROR_ENUM_CONSTEXPR_CONV)
if(HAS_WNO_ERROR_ENUM_CONSTEXPR_CONV)
add_compile_options(-Wno-error=enum-constexpr-conversion)
endif()
endif()
@@ -509,10 +510,10 @@ include_directories(SYSTEM ${LIBDIR_BIN}/dev-utils/platform)
include_directories(SYSTEM ${LIBDIR}/libigl)
if(WIN32)
add_definitions(-D_USE_MATH_DEFINES -D_WIN32 -D_CRT_SECURE_NO_WARNINGS -D_SCL_SECURE_NO_WARNINGS -DNOMINMAX)
add_definitions(-D_USE_MATH_DEFINES -D_WIN32 -D_CRT_SECURE_NO_WARNINGS -D_SCL_SECURE_NO_WARNINGS)
if(MSVC)
# BOOST_ALL_NO_LIB: Avoid the automatic linking of Boost libraries on Windows. Rather rely on explicit linking.
add_definitions(-DBOOST_ALL_NO_LIB -DBOOST_USE_WINAPI_VERSION=0x602 -DBOOST_SYSTEM_USE_UTF8 -DBOOST_REGEX_NO_WIN32_LOCALE)
add_definitions(-DBOOST_ALL_NO_LIB -DBOOST_USE_WINAPI_VERSION=0x602 -DBOOST_SYSTEM_USE_UTF8 )
# Force the source code encoding to UTF-8. See OrcaSlicer GH pull request #5583
add_compile_options("$<$<C_COMPILER_ID:MSVC>:/utf-8>")
add_compile_options("$<$<CXX_COMPILER_ID:MSVC>:/utf-8>")
@@ -577,7 +578,7 @@ endif()
# boost::process was introduced first in version 1.64.0,
# boost::beast::detail::base64 was introduced first in version 1.66.0
if(POLICY CMP0167)
cmake_policy(SET CMP0167 OLD)
cmake_policy(SET CMP0167 NEW)
endif()
set(Boost_NO_SYSTEM_PATHS TRUE)
find_package(Boost 1.83.0 REQUIRED COMPONENTS system filesystem thread log log_setup locale regex chrono atomic date_time iostreams program_options nowide)
@@ -955,7 +956,7 @@ set (CPACK_PACKAGE_INSTALL_REGISTRY_KEY "OrcaSlicer")
set (CPACK_NSIS_ENABLE_UNINSTALL_BEFORE_INSTALL ON)
set (CPACK_NSIS_EXECUTABLES_DIRECTORY ".")
# set (CPACK_NSIS_MODIFY_PATH "ON")
set(CPACK_PACKAGE_EXECUTABLES "orca-slicer;OrcaSlicer-ImageMap")
set(CPACK_PACKAGE_EXECUTABLES "orca-slicer;OrcaSlicer")
set(CPACK_CREATE_DESKTOP_LINKS "orca-slicer")
set (CPACK_RESOURCE_FILE_LICENSE ${CMAKE_SOURCE_DIR}/LICENSE.txt) # must also include in install command

View File

@@ -10,7 +10,7 @@ Fertige Binaries von [OrcaSlicer](https://github.com/SoftFever/OrcaSlicer) mit i
## Download
Aktuelle Version: **2.4.2-kx1** (Basis: OrcaSlicer 2.4.2 stable)
Aktuelle Version: **2.4.1-kx1** (Basis: OrcaSlicer 2.4.1 stable)
| Plattform | Datei | Hinweis |
|-----------|-------|---------|
@@ -27,7 +27,6 @@ macOS wird nicht bereitgestellt — bitte aus dem Upstream selbst bauen.
- **AMS-Leerslot-Fix:** leere AMS-Slots werden korrekt grau dargestellt (kein Absturz / falsches Filament)
- **Filament-ID:** eindeutige `filament_id` für abgeleitete User-Presets (korrekte Bridge-Synchronisation)
- **Kobra X Profile:** Drucker- und G-Code-Profile für den Anycubic Kobra X
- **Kobra X Bett-Temp-Fix:** `bed_temperature_formula` auf `by_first_filament` gesetzt — G9111-Makro heizt jetzt auf die korrekte Temperatur des gedruckten Filaments statt auf den Höchstwert aller Projekt-Filamente
---

View File

@@ -237,7 +237,6 @@ function build_slicer() {
resources_path=$(readlink ./OrcaSlicer.app/Contents/Resources)
rm ./OrcaSlicer.app/Contents/Resources
cp -R "$resources_path" ./OrcaSlicer.app/Contents/Resources
plutil -replace CFBundleIconFile -string "images/OrcaSlicer.icns" ./OrcaSlicer.app/Contents/Info.plist
# delete .DS_Store file
find ./OrcaSlicer.app/ -name '.DS_Store' -delete

View File

@@ -1,34 +0,0 @@
if(NOT DEFINED INPUT)
message(FATAL_ERROR "INPUT is required")
endif()
if(NOT DEFINED OUTPUT)
message(FATAL_ERROR "OUTPUT is required")
endif()
if(NOT DEFINED GIT_COMMIT_HASH)
set(GIT_COMMIT_HASH "0000000")
endif()
file(STRINGS "${INPUT}" SOFTFEVER_VERSION LIMIT_COUNT 1)
string(STRIP "${SOFTFEVER_VERSION}" SOFTFEVER_VERSION)
set(CONTENT [=[
#include "libslic3r_version.h"
namespace Slic3r {
const char* softfever_version()
{
return "@SOFTFEVER_VERSION@";
}
const char* git_commit_hash()
{
return "@GIT_COMMIT_HASH@";
}
} // namespace Slic3r
]=])
string(CONFIGURE "${CONTENT}" CONTENT @ONLY)
file(WRITE "${OUTPUT}" "${CONTENT}")

View File

@@ -30,10 +30,6 @@ add_subdirectory(md4c)
add_subdirectory(mdns)
add_subdirectory(miniz)
add_subdirectory(minilzo)
add_subdirectory(pigment-painter)
add_subdirectory(prusa-fdm-mixer)
add_subdirectory(colorsolver)
add_subdirectory(qhull)
add_subdirectory(qoi)
add_subdirectory(semver) # Semver static library
add_subdirectory(tinygltf)

View File

@@ -1,5 +1,5 @@
cmake_minimum_required(VERSION 3.10)
project(Clipper2 VERSION 2.0.1 LANGUAGES C CXX)
project(Clipper2 VERSION 1.5.2 LANGUAGES C CXX)
set(CMAKE_POSITION_INDEPENDENT_CODE ON)
set(CMAKE_CXX_STANDARD 17)
@@ -19,7 +19,6 @@ set(CLIPPER2_INC
Clipper2Lib/include/clipper2/clipper.minkowski.h
Clipper2Lib/include/clipper2/clipper.offset.h
Clipper2Lib/include/clipper2/clipper.rectclip.h
Clipper2Lib/include/clipper2/clipper.triangulation.h
Clipper2Lib/include/clipper2/clipper2_z.hpp
)
@@ -27,7 +26,6 @@ set(CLIPPER2_SRC
Clipper2Lib/src/clipper.engine.cpp
Clipper2Lib/src/clipper.offset.cpp
Clipper2Lib/src/clipper.rectclip.cpp
Clipper2Lib/src/clipper.triangulation.cpp
Clipper2Lib/src/clipper2_z.cpp
)
@@ -53,3 +51,4 @@ set_target_properties(Clipper2 PROPERTIES FOLDER Libraries
SOVERSION ${PROJECT_VERSION_MAJOR}
PUBLIC_HEADER "${CLIPPER2_INC}"
)

View File

@@ -1,8 +1,8 @@
/*******************************************************************************
* Author : Angus Johnson *
* Date : 12 October 2025 *
* Date : 12 May 2024 *
* Website : https://www.angusj.com *
* Copyright : Angus Johnson 2010-2025 *
* Copyright : Angus Johnson 2010-2024 *
* Purpose : Core Clipper Library structures and functions *
* License : https://www.boost.org/LICENSE_1_0.txt *
*******************************************************************************/
@@ -141,7 +141,7 @@ namespace Clipper2Lib {
}
}
explicit Point() : x(0), y(0), z(0) {}
explicit Point() : x(0), y(0), z(0) {};
template <typename T2>
Point(const T2 x_, const T2 y_, const z_type z_ = 0)
@@ -193,7 +193,7 @@ namespace Clipper2Lib {
}
}
explicit Point() : x(0), y(0) {}
explicit Point() : x(0), y(0) {};
template <typename T2>
Point(const T2 x_, const T2 y_) { Init(x_, y_); }
@@ -251,20 +251,6 @@ namespace Clipper2Lib {
template <typename T>
using Paths = std::vector<Path<T>>;
template <typename T, typename T2=T>
Path<T>& operator<<(Path<T>& poly, const Point<T2>& p)
{
poly.emplace_back(p);
return poly;
}
template <typename T>
Paths<T>& operator<<(Paths<T>& polys, const Path<T>& p)
{
polys.emplace_back(p);
return polys;
}
using Path64 = Path<int64_t>;
using PathD = Path<double>;
using Paths64 = std::vector< Path64>;
@@ -370,13 +356,13 @@ namespace Clipper2Lib {
bottom *= scale;
}
bool IsEmpty() const { return bottom <= top || right <= left; }
bool IsEmpty() const { return bottom <= top || right <= left; };
bool Intersects(const Rect<T>& rec) const
{
return ((std::max)(left, rec.left) <= (std::min)(right, rec.right)) &&
((std::max)(top, rec.top) <= (std::min)(bottom, rec.bottom));
}
};
bool operator==(const Rect<T>& other) const {
return left == other.left && right == other.right &&
@@ -702,28 +688,29 @@ namespace Clipper2Lib {
return (x > 0) - (x < 0);
}
struct UInt128Struct
struct MultiplyUInt64Result
{
const uint64_t lo = 0;
const uint64_t hi = 0;
const uint64_t result = 0;
const uint64_t carry = 0;
bool operator==(const UInt128Struct& other) const
bool operator==(const MultiplyUInt64Result& other) const
{
return lo == other.lo && hi == other.hi;
}
return result == other.result && carry == other.carry;
};
};
inline UInt128Struct MultiplyUInt64(uint64_t a, uint64_t b) // #834, #835
inline MultiplyUInt64Result Multiply(uint64_t a, uint64_t b) // #834, #835
{
// note to self - lamba expressions follow
const auto lo = [](uint64_t x) { return x & 0xFFFFFFFF; };
const auto hi = [](uint64_t x) { return x >> 32; };
const uint64_t x1 = lo(a) * lo(b);
const uint64_t x2 = hi(a) * lo(b) + hi(x1);
const uint64_t x3 = lo(a) * hi(b) + lo(x2);
return { uint64_t(lo(x3) << 32 | lo(x1)), uint64_t(hi(a) * hi(b) + hi(x2) + hi(x3)) };
const uint64_t result = lo(x3) << 32 | lo(x1);
const uint64_t carry = hi(a) * hi(b) + hi(x2) + hi(x3);
return { result, carry };
}
// returns true if (and only if) a * b == c * d
@@ -740,50 +727,14 @@ namespace Clipper2Lib {
const auto abs_c = static_cast<uint64_t>(std::abs(c));
const auto abs_d = static_cast<uint64_t>(std::abs(d));
const auto ab = MultiplyUInt64(abs_a, abs_b);
const auto cd = MultiplyUInt64(abs_c, abs_d);
const auto abs_ab = Multiply(abs_a, abs_b);
const auto abs_cd = Multiply(abs_c, abs_d);
// nb: it's important to differentiate 0 values here from other values
const auto sign_ab = TriSign(a) * TriSign(b);
const auto sign_cd = TriSign(c) * TriSign(d);
return ab == cd && sign_ab == sign_cd;
#endif
}
template <typename T>
inline int CrossProductSign(const Point<T>& pt1, const Point<T>& pt2, const Point<T>& pt3)
{
const auto a = pt2.x - pt1.x;
const auto b = pt3.y - pt2.y;
const auto c = pt2.y - pt1.y;
const auto d = pt3.x - pt2.x;
#if (defined(__clang__) || defined(__GNUC__)) && UINTPTR_MAX >= UINT64_MAX
const auto ab = static_cast<__int128_t>(a) * static_cast<__int128_t>(b);
const auto cd = static_cast<__int128_t>(c) * static_cast<__int128_t>(d);
if (ab > cd) return 1;
else if (ab < cd) return -1;
else return 0;
#else
const auto ab = MultiplyUInt64(std::abs(a), std::abs(b));
const auto cd = MultiplyUInt64(std::abs(c), std::abs(d));
const auto sign_ab = TriSign(a) * TriSign(b);
const auto sign_cd = TriSign(c) * TriSign(d);
if (sign_ab == sign_cd)
{
int result;
if (ab.hi == cd.hi)
{
if (ab.lo == cd.lo) return 0;
result = (ab.lo > cd.lo) ? 1 : -1;
}
else result = (ab.hi > cd.hi) ? 1 : -1;
return (sign_ab > 0) ? result : -result;
}
return (sign_ab > sign_cd) ? 1 : -1;
return abs_ab == abs_cd && sign_ab == sign_cd;
#endif
}
@@ -887,18 +838,14 @@ namespace Clipper2Lib {
return Area<T>(poly) >= 0;
}
// GetLineIntersectPt - a 'true' result is non-parallel. The 'ip' will also
// be constrained to seg1. However, it's possible that 'ip' won't be inside
// seg2, even when 'ip' hasn't been constrained (ie 'ip' is inside seg1).
#if defined(CLIPPER2_HI_PRECISION) && CLIPPER2_HI_PRECISION
#if CLIPPER2_HI_PRECISION
// caution: this will compromise performance
// https://github.com/AngusJohnson/Clipper2/issues/317#issuecomment-1314023253
// See also CPP/BenchMark/GetIntersectPtBenchmark.cpp
#define CC_MIN(x,y) ((x)>(y)?(y):(x))
#define CC_MAX(x,y) ((x)<(y)?(y):(x))
template<typename T>
inline bool GetLineIntersectPt(const Point<T>& ln1a, const Point<T>& ln1b,
inline bool GetSegmentIntersectPt(const Point<T>& ln1a, const Point<T>& ln1b,
const Point<T>& ln2a, const Point<T>& ln2b, Point<T>& ip)
{
double ln1dy = static_cast<double>(ln1b.y - ln1a.y);
@@ -944,14 +891,11 @@ namespace Clipper2Lib {
ip.x = originx + static_cast<T>(hitx);
ip.y = originy + static_cast<T>(hity);
}
#ifdef USINGZ
ip.z = 0;
#endif
return true;
}
#else
template<typename T>
inline bool GetLineIntersectPt(const Point<T>& ln1a, const Point<T>& ln1b,
inline bool GetSegmentIntersectPt(const Point<T>& ln1a, const Point<T>& ln1b,
const Point<T>& ln2a, const Point<T>& ln2b, Point<T>& ip)
{
// https://en.wikipedia.org/wiki/Line%E2%80%93line_intersection
@@ -969,10 +913,7 @@ namespace Clipper2Lib {
{
ip.x = static_cast<T>(ln1a.x + t * dx1);
ip.y = static_cast<T>(ln1a.y + t * dy1);
#ifdef USINGZ
ip.z = 0;
#endif
}
}
return true;
}
#endif
@@ -1008,44 +949,21 @@ namespace Clipper2Lib {
inline bool SegmentsIntersect(const Point64& seg1a, const Point64& seg1b,
const Point64& seg2a, const Point64& seg2b, bool inclusive = false)
{
double dy1 = static_cast<double>(seg1b.y - seg1a.y);
double dx1 = static_cast<double>(seg1b.x - seg1a.x);
double dy2 = static_cast<double>(seg2b.y - seg2a.y);
double dx2 = static_cast<double>(seg2b.x - seg2a.x);
double cp = dy1 * dx2 - dy2 * dx1;
if (cp == 0) return false; // ie parallel segments
if (inclusive)
{
//result **includes** segments that touch at an end point
double t = ((seg1a.x - seg2a.x) * dy2 - (seg1a.y - seg2a.y) * dx2);
if (t == 0) return true;
if (t > 0)
{
if (cp < 0 || t > cp) return false;
}
else if (cp > 0 || t < cp) return false; // false when t more neg. than cp
t = ((seg1a.x - seg2a.x) * dy1 - (seg1a.y - seg2a.y) * dx1);
if (t == 0) return true;
if (t > 0) return (cp > 0 && t <= cp);
else return (cp < 0 && t >= cp); // true when t less neg. than cp
double res1 = CrossProduct(seg1a, seg2a, seg2b);
double res2 = CrossProduct(seg1b, seg2a, seg2b);
if (res1 * res2 > 0) return false;
double res3 = CrossProduct(seg2a, seg1a, seg1b);
double res4 = CrossProduct(seg2b, seg1a, seg1b);
if (res3 * res4 > 0) return false;
return (res1 || res2 || res3 || res4); // ensures not collinear
}
else
{
//result **excludes** segments that touch at an end point
double t = ((seg1a.x - seg2a.x) * dy2 - (seg1a.y - seg2a.y) * dx2);
if (t == 0) return false;
if (t > 0)
{
if (cp < 0 || t >= cp) return false;
}
else if (cp > 0 || t <= cp ) return false; // false when t more neg. than cp
t = ((seg1a.x - seg2a.x) * dy1 - (seg1a.y - seg2a.y) * dx1);
if (t == 0) return false;
if (t > 0) return (cp > 0 && t < cp);
else return (cp < 0 && t > cp); // true when t less neg. than cp
else {
return (GetSign(CrossProduct(seg1a, seg2a, seg2b)) *
GetSign(CrossProduct(seg1b, seg2a, seg2b)) < 0) &&
(GetSign(CrossProduct(seg2a, seg1a, seg1b)) *
GetSign(CrossProduct(seg2b, seg1a, seg1b)) < 0);
}
}
@@ -1133,7 +1051,7 @@ namespace Clipper2Lib {
val = 1 - val; // toggle val
else
{
int d = CrossProductSign(*prev, *curr, pt);
double d = CrossProduct(*prev, *curr, pt);
if (d == 0) return PointInPolygonResult::IsOn;
if ((d < 0) == is_above) val = 1 - val;
}
@@ -1147,7 +1065,7 @@ namespace Clipper2Lib {
if (curr == cend) curr = cbegin;
if (curr == cbegin) prev = cend - 1;
else prev = curr - 1;
int d = CrossProductSign(*prev, *curr, pt);
double d = CrossProduct(*prev, *curr, pt);
if (d == 0) return PointInPolygonResult::IsOn;
if ((d < 0) == is_above) val = 1 - val;
}

View File

@@ -97,7 +97,7 @@ namespace Clipper2Lib {
if (splits) delete splits;
// nb: don't delete the split pointers
// as these are owned by ClipperBase's outrec_list_
}
};
};
///////////////////////////////////////////////////////////////////
@@ -160,7 +160,7 @@ namespace Clipper2Lib {
struct HorzJoin {
OutPt* op1 = nullptr;
OutPt* op2 = nullptr;
HorzJoin() {}
HorzJoin() {};
explicit HorzJoin(OutPt* ltr, OutPt* rtl) : op1(ltr), op2(rtl) { }
};
@@ -280,11 +280,11 @@ namespace Clipper2Lib {
void AddPaths(const Paths64& paths, PathType polytype, bool is_open);
public:
virtual ~ClipperBase();
int ErrorCode() const { return error_code_; }
void PreserveCollinear(bool val) { preserve_collinear_ = val; }
bool PreserveCollinear() const { return preserve_collinear_;}
void ReverseSolution(bool val) { reverse_solution_ = val; }
bool ReverseSolution() const { return reverse_solution_; }
int ErrorCode() const { return error_code_; };
void PreserveCollinear(bool val) { preserve_collinear_ = val; };
bool PreserveCollinear() const { return preserve_collinear_;};
void ReverseSolution(bool val) { reverse_solution_ = val; };
bool ReverseSolution() const { return reverse_solution_; };
void Clear();
void AddReuseableData(const ReuseableDataContainer64& reuseable_data);
#ifdef USINGZ
@@ -304,7 +304,7 @@ namespace Clipper2Lib {
PolyPath* parent_;
public:
PolyPath(PolyPath* parent = nullptr): parent_(parent){}
virtual ~PolyPath() {}
virtual ~PolyPath() {};
//https://en.cppreference.com/w/cpp/language/rule_of_three
PolyPath(const PolyPath&) = delete;
PolyPath& operator=(const PolyPath&) = delete;
@@ -352,7 +352,7 @@ namespace Clipper2Lib {
explicit PolyPath64(PolyPath64* parent = nullptr) : PolyPath(parent) {}
explicit PolyPath64(PolyPath64* parent, const Path64& path) : PolyPath(parent) { polygon_ = path; }
~PolyPath64() override {
~PolyPath64() {
childs_.resize(0);
}
@@ -384,7 +384,7 @@ namespace Clipper2Lib {
return childs_.size();
}
const Path64& Polygon() const { return polygon_; }
const Path64& Polygon() const { return polygon_; };
double Area() const
{
@@ -418,7 +418,7 @@ namespace Clipper2Lib {
polygon_ = path;
}
~PolyPathD() override {
~PolyPathD() {
childs_.resize(0);
}
@@ -458,7 +458,7 @@ namespace Clipper2Lib {
return childs_.size();
}
const PathD& Polygon() const { return polygon_; }
const PathD& Polygon() const { return polygon_; };
double Area() const
{
@@ -548,7 +548,7 @@ namespace Clipper2Lib {
}
#ifdef USINGZ
void SetZCallback(ZCallbackD cb) { zCallbackD_ = cb; }
void SetZCallback(ZCallbackD cb) { zCallbackD_ = cb; };
void ZCB(const Point64& e1bot, const Point64& e1top,
const Point64& e2bot, const Point64& e2top, Point64& pt)
@@ -564,7 +564,7 @@ namespace Clipper2Lib {
PointD e2t = PointD(e2top) * invScale_;
zCallbackD_(e1b,e1t, e2b, e2t, tmp);
pt.z = tmp.z; // only update 'z'
}
};
void CheckCallback()
{

View File

@@ -116,7 +116,6 @@ the four vertices that define the two segments that are intersecting.
#include "clipper2/clipper.engine.h"
#include "clipper2/clipper.offset.h"
#include "clipper2/clipper.rectclip.h"
#include "clipper2/clipper.triangulation.h"
#include <cstdlib>
#ifdef USINGZ
@@ -817,24 +816,6 @@ EXTERN_DLL_EXPORT CPaths64 MinkowskiDiff64(const CPath64& cpattern, const CPath6
return CreateCPathsFromPathsT(solution);
}
EXTERN_DLL_EXPORT CPaths64 Triangulate64(const CPaths64 paths, bool use_delaunay)
{
Paths64 pp = ConvertCPathsToPathsT(paths);
Paths64 sol;
if (Triangulate(pp, sol, use_delaunay) != TriangulateResult::success) return nullptr;
return CreateCPathsFromPathsT(sol);
}
EXTERN_DLL_EXPORT CPathsD TriangulateD(const CPathsD paths, int decimal_precison, bool use_delaunay)
{
if (decimal_precison < -8 || decimal_precison > 8) return nullptr;
const double scale = std::pow(10, decimal_precison);
Paths64 pp = ConvertCPathsDToPaths64(paths, scale);
Paths64 sol;
if (Triangulate(pp, sol, use_delaunay) != TriangulateResult::success) return nullptr;
return CreateCPathsDFromPaths64(sol, 1 / scale);
}
#ifdef USINGZ
typedef void (*DLLZCallback64)(const Point64& e1bot, const Point64& e1top, const Point64& e2bot, const Point64& e2top, Point64& pt);
typedef void (*DLLZCallbackD)(const PointD& e1bot, const PointD& e1top, const PointD& e2bot, const PointD& e2top, PointD& pt);

View File

@@ -1,8 +1,8 @@
/*******************************************************************************
* Author : Angus Johnson *
* Date : 5 March 2025 *
* Date : 27 April 2024 *
* Website : https://www.angusj.com *
* Copyright : Angus Johnson 2010-2025 *
* Copyright : Angus Johnson 2010-2024 *
* Purpose : This module provides a simple interface to the Clipper Library *
* License : https://www.boost.org/LICENSE_1_0.txt *
*******************************************************************************/
@@ -13,9 +13,8 @@
#include "clipper2/clipper.core.h"
#include "clipper2/clipper.engine.h"
#include "clipper2/clipper.offset.h"
#include "clipper2/clipper.rectclip.h"
#include "clipper2/clipper.minkowski.h"
#include "clipper2/clipper.triangulation.h"
#include "clipper2/clipper.rectclip.h"
#include <type_traits>
#ifdef USINGZ
@@ -138,7 +137,7 @@
JoinType jt, EndType et, double miter_limit = 2.0,
double arc_tolerance = 0.0)
{
if (delta==0.0) return paths;
if (!delta) return paths;
ClipperOffset clip_offset(miter_limit, arc_tolerance);
clip_offset.AddPaths(paths, jt, et);
Paths64 solution;
@@ -152,10 +151,10 @@
{
int error_code = 0;
CheckPrecisionRange(precision, error_code);
if (delta==0.0) return paths;
if (!delta) return paths;
if (error_code) return PathsD();
const double scale = std::pow(10, precision);
ClipperOffset clip_offset(miter_limit, arc_tolerance * scale);
ClipperOffset clip_offset(miter_limit, arc_tolerance);
clip_offset.AddPaths(ScalePaths<int64_t,double>(paths, scale, error_code), jt, et);
if (error_code) return PathsD();
Paths64 solution;
@@ -356,29 +355,6 @@
#endif
}
inline size_t GetNext(size_t current, size_t high,
const std::vector<bool>& flags)
{
++current;
while (current <= high && flags[current]) ++current;
if (current <= high) return current;
current = 0;
while (flags[current]) ++current;
return current;
}
inline size_t GetPrior(size_t current, size_t high,
const std::vector<bool>& flags)
{
if (current == 0) current = high;
else --current;
while (current > 0 && flags[current]) --current;
if (!flags[current]) return current;
current = high;
while (flags[current]) --current;
return current;
}
} // end details namespace
inline std::ostream& operator<< (std::ostream& os, const PolyTree64& pp)
@@ -639,6 +615,29 @@
return result;
}
inline size_t GetNext(size_t current, size_t high,
const std::vector<bool>& flags)
{
++current;
while (current <= high && flags[current]) ++current;
if (current <= high) return current;
current = 0;
while (flags[current]) ++current;
return current;
}
inline size_t GetPrior(size_t current, size_t high,
const std::vector<bool>& flags)
{
if (current == 0) current = high;
else --current;
while (current > 0 && flags[current]) --current;
if (!flags[current]) return current;
current = high;
while (flags[current]) --current;
return current;
}
template <typename T>
inline Path<T> SimplifyPath(const Path<T> &path,
double epsilon, bool isClosedPath = true)
@@ -670,13 +669,13 @@
start = curr;
do
{
curr = details::GetNext(curr, high, flags);
curr = GetNext(curr, high, flags);
} while (curr != start && distSqr[curr] > epsSqr);
if (curr == start) break;
}
prior = details::GetPrior(curr, high, flags);
next = details::GetNext(curr, high, flags);
prior = GetPrior(curr, high, flags);
next = GetNext(curr, high, flags);
if (next == prior) break;
// flag for removal the smaller of adjacent 'distances'
@@ -685,14 +684,14 @@
prior2 = prior;
prior = curr;
curr = next;
next = details::GetNext(next, high, flags);
next = GetNext(next, high, flags);
}
else
prior2 = details::GetPrior(prior, high, flags);
prior2 = GetPrior(prior, high, flags);
flags[curr] = true;
curr = next;
next = details::GetNext(next, high, flags);
next = GetNext(next, high, flags);
if (isClosedPath || ((curr != high) && (curr != 0)))
distSqr[curr] = PerpendicDistFromLineSqrd(path[curr], path[prior], path[next]);
@@ -717,35 +716,6 @@
return result;
}
template <typename T>
inline bool Path2ContainsPath1(const Path<T>& path1, const Path<T>& path2)
{
// precondition: paths must not intersect, except for
// transient (and presumed 'micro') path intersections
PointInPolygonResult pip = PointInPolygonResult::IsOn;
for (const Point<T>& pt : path1)
{
switch (PointInPolygon(pt, path2))
{
case PointInPolygonResult::IsOutside:
if (pip == PointInPolygonResult::IsOutside) return false;
pip = PointInPolygonResult::IsOutside;
break;
case PointInPolygonResult::IsInside:
if (pip == PointInPolygonResult::IsInside) return true;
pip = PointInPolygonResult::IsInside;
break;
default:
break;
}
}
if (pip != PointInPolygonResult::IsInside) return false;
// result is likely true but check midpoint
Point<T> mp1 = GetBounds(path1).MidPoint();
return PointInPolygon(mp1, path2) == PointInPolygonResult::IsInside;
}
template <typename T>
inline void RDP(const Path<T> path, std::size_t begin,
std::size_t end, double epsSqrd, std::vector<bool>& flags)

View File

@@ -63,7 +63,7 @@ namespace Clipper2Lib {
quad.emplace_back(tmp[i][h]);
quad.emplace_back(tmp[i][j]);
quad.emplace_back(tmp[g][j]);
}
};
if (!IsPositive(quad))
std::reverse(quad.begin(), quad.end());
result.emplace_back(std::move(quad));

View File

@@ -39,7 +39,7 @@ private:
class Group {
public:
Paths64 paths_in;
std::optional<size_t> lowest_path_idx{};
std::optional<size_t> lowest_path_idx{};
bool is_reversed = false;
JoinType join_type;
EndType end_type;
@@ -92,14 +92,14 @@ public:
bool reverse_solution = false) :
miter_limit_(miter_limit), arc_tolerance_(arc_tolerance),
preserve_collinear_(preserve_collinear),
reverse_solution_(reverse_solution) { }
reverse_solution_(reverse_solution) { };
~ClipperOffset() { Clear(); }
~ClipperOffset() { Clear(); };
int ErrorCode() const { return error_code_; }
int ErrorCode() const { return error_code_; };
void AddPath(const Path64& path, JoinType jt_, EndType et_);
void AddPaths(const Paths64& paths, JoinType jt_, EndType et_);
void Clear() { groups_.clear(); norms.clear(); }
void Clear() { groups_.clear(); norms.clear(); };
void Execute(double delta, Paths64& sols_64);
void Execute(double delta, PolyTree64& polytree);

View File

@@ -75,7 +75,7 @@ namespace Clipper2Lib {
void ExecuteInternal(const Path64& path);
Path64 GetPath(OutPt2*& op);
public:
explicit RectClipLines64(const Rect64& rect) : RectClip64(rect) {}
explicit RectClipLines64(const Rect64& rect) : RectClip64(rect) {};
Paths64 Execute(const Paths64& paths);
};

View File

@@ -1,30 +0,0 @@
/*******************************************************************************
* Author : Angus Johnson *
* Date : 6 December 2025 *
* Release : BETA RELEASE *
* Website : https://www.angusj.com *
* Copyright : Angus Johnson 2010-2025 *
* Purpose : Delaunay Triangulation *
* License : https://www.boost.org/LICENSE_1_0.txt *
*******************************************************************************/
#ifndef CLIPPER_TRIANGULATION_H
#define CLIPPER_TRIANGULATION_H
#include <stack>
#include "clipper2/clipper.core.h"
#ifdef USINGZ
namespace Clipper2Lib_Z {
#else
namespace Clipper2Lib {
#endif
enum class TriangulateResult { success, fail, no_polygons, paths_intersect };
// Triangulate - this function will not accept intesecting paths
TriangulateResult Triangulate(const Paths64& pp, Paths64& solution, bool useDelaunay = true);
TriangulateResult Triangulate(const PathsD& pp, int decPlaces, PathsD& solution, bool useDelaunay = true);
} // Clipper2Lib namespace
#endif // CLIPPER_TRIANGULATION_H

View File

@@ -1,6 +1,6 @@
#ifndef CLIPPER_VERSION_H
#define CLIPPER_VERSION_H
constexpr auto CLIPPER2_VERSION = "2.0.1";
constexpr auto CLIPPER2_VERSION = "1.5.2";
#endif // CLIPPER_VERSION_H

View File

@@ -1,8 +1,8 @@
/*******************************************************************************
* Author : Angus Johnson *
* Date : 21 February 2026 *
* Date : 17 September 2024 *
* Website : https://www.angusj.com *
* Copyright : Angus Johnson 2010-2026 *
* Copyright : Angus Johnson 2010-2024 *
* Purpose : This is the main polygon clipping module *
* License : https://www.boost.org/LICENSE_1_0.txt *
*******************************************************************************/
@@ -482,7 +482,8 @@ namespace Clipper2Lib {
inline void SetOwner(OutRec* outrec, OutRec* new_owner)
{
//precondition1: new_owner is never null
new_owner->owner = GetRealOutRec(new_owner->owner);
while (new_owner->owner && !new_owner->owner->pts)
new_owner->owner = new_owner->owner->owner;
OutRec* tmp = new_owner;
while (tmp && tmp != outrec) tmp = tmp->owner;
if (tmp) new_owner->owner = outrec->owner;
@@ -535,9 +536,9 @@ namespace Clipper2Lib {
val = 1 - val; // toggle val
else
{
int i = CrossProductSign(op2->prev->pt, op2->pt, pt);
if (i == 0) return PointInPolygonResult::IsOn;
if ((i < 0) == is_above) val = 1 - val;
double d = CrossProduct(op2->prev->pt, op2->pt, pt);
if (d == 0) return PointInPolygonResult::IsOn;
if ((d < 0) == is_above) val = 1 - val;
}
is_above = !is_above;
op2 = op2->next;
@@ -545,9 +546,9 @@ namespace Clipper2Lib {
if (is_above != starting_above)
{
int i = CrossProductSign(op2->prev->pt, op2->pt, pt);
if (i == 0) return PointInPolygonResult::IsOn;
if ((i < 0) == is_above) val = 1 - val;
double d = CrossProduct(op2->prev->pt, op2->pt, pt);
if (d == 0) return PointInPolygonResult::IsOn;
if ((d < 0) == is_above) val = 1 - val;
}
if (val == 0) return PointInPolygonResult::IsOutside;
@@ -577,31 +578,30 @@ namespace Clipper2Lib {
return result;
}
inline bool Path2ContainsPath1(OutPt* op1, OutPt* op2)
inline bool Path1InsidePath2(OutPt* op1, OutPt* op2)
{
// this function accommodates rounding errors that
// can cause path micro intersections
PointInPolygonResult pip = PointInPolygonResult::IsOn;
// we need to make some accommodation for rounding errors
// so we won't jump if the first vertex is found outside
PointInPolygonResult result;
int outside_cnt = 0;
OutPt* op = op1;
do {
switch (PointInOpPolygon(op->pt, op2))
{
case PointInPolygonResult::IsOutside:
if (pip == PointInPolygonResult::IsOutside) return false;
pip = PointInPolygonResult::IsOutside;
break;
case PointInPolygonResult::IsInside:
if (pip == PointInPolygonResult::IsInside) return true;
pip = PointInPolygonResult::IsInside;
break;
default: break;
}
do
{
result = PointInOpPolygon(op->pt, op2);
if (result == PointInPolygonResult::IsOutside) ++outside_cnt;
else if (result == PointInPolygonResult::IsInside) --outside_cnt;
op = op->next;
} while (op != op1);
// result unclear, so try again using cleaned paths
return Path2ContainsPath1(GetCleanPath(op1), GetCleanPath(op2)); // (#973)
} while (op != op1 && std::abs(outside_cnt) < 2);
if (std::abs(outside_cnt) > 1) return (outside_cnt < 0);
// since path1's location is still equivocal, check its midpoint
Point64 mp = GetBounds(GetCleanPath(op1)).MidPoint();
Path64 path2 = GetCleanPath(op2);
return PointInPolygon(mp, path2) != PointInPolygonResult::IsOutside;
}
//------------------------------------------------------------------------------
//------------------------------------------------------------------------------
void AddLocMin(LocalMinimaList& list,
Vertex& vert, PathType polytype, bool is_open)
{
@@ -621,7 +621,7 @@ namespace Clipper2Lib {
{return a + path.size(); });
if (total_vertex_count == 0) return;
Vertex* allVertices = new Vertex[total_vertex_count], * v = allVertices;
Vertex* vertices = new Vertex[total_vertex_count], * v = vertices;
for (const Path64& path : paths)
{
//for each path create a circular double linked list of vertices
@@ -713,7 +713,7 @@ namespace Clipper2Lib {
}
} // end processing current path
vertexLists.emplace_back(allVertices);
vertexLists.emplace_back(vertices);
}
//------------------------------------------------------------------------------
@@ -1126,19 +1126,21 @@ namespace Clipper2Lib {
return newcomer.curr_x > resident.curr_x;
//get the turning direction a1.top, a2.bot, a2.top
int i = CrossProductSign(resident.top, newcomer.bot, newcomer.top);
if (i != 0) return i < 0;
double d = CrossProduct(resident.top, newcomer.bot, newcomer.top);
if (d != 0) return d < 0;
//edges must be collinear to get here
//for starting open paths, place them according to
//the direction they're about to turn
if (!IsMaxima(resident) && (resident.top.y > newcomer.top.y))
{
return (CrossProductSign(newcomer.bot, resident.top, NextVertex(resident)->pt) <= 0);
return CrossProduct(newcomer.bot,
resident.top, NextVertex(resident)->pt) <= 0;
}
else if (!IsMaxima(newcomer) && (newcomer.top.y > resident.top.y))
{
return (CrossProductSign(newcomer.bot, newcomer.top, NextVertex(newcomer)->pt) >= 0);
return CrossProduct(newcomer.bot,
newcomer.top, NextVertex(newcomer)->pt) >= 0;
}
int64_t y = newcomer.bot.y;
@@ -1153,7 +1155,7 @@ namespace Clipper2Lib {
resident.bot, resident.top)) return true;
else
//compare turning direction of the alternate bound
return (CrossProductSign(PrevPrevVertex(resident)->pt,
return (CrossProduct(PrevPrevVertex(resident)->pt,
newcomer.bot, PrevPrevVertex(newcomer)->pt) > 0) == newcomerIsLeft;
}
@@ -1563,7 +1565,7 @@ namespace Clipper2Lib {
FixSelfIntersects(outrec);
}
void ClipperBase::DoSplitOp (OutRec* outrec, OutPt* splitOp)
void ClipperBase::DoSplitOp(OutRec* outrec, OutPt* splitOp)
{
// splitOp.prev -> splitOp &&
// splitOp.next -> splitOp.next.next are intersecting
@@ -1572,7 +1574,7 @@ namespace Clipper2Lib {
outrec->pts = prevOp;
Point64 ip;
GetLineIntersectPt(prevOp->pt, splitOp->pt,
GetSegmentIntersectPt(prevOp->pt, splitOp->pt,
splitOp->next->pt, nextNextOp->pt, ip);
#ifdef USINGZ
@@ -1628,7 +1630,7 @@ namespace Clipper2Lib {
if (using_polytree_)
{
if (Path2ContainsPath1(prevOp, newOp))
if (Path1InsidePath2(prevOp, newOp))
{
newOr->splits = new OutRecList();
newOr->splits->emplace_back(outrec);
@@ -1650,10 +1652,10 @@ namespace Clipper2Lib {
void ClipperBase::FixSelfIntersects(OutRec* outrec)
{
OutPt* op2 = outrec->pts;
if (op2->prev == op2->next->next)
return; // because triangles can't self-intersect
for (; ; )
{
// triangles can't self-intersect
if (op2->prev == op2->next->next) break;
if (SegmentsIntersect(op2->prev->pt,
op2->pt, op2->next->pt, op2->next->next->pt))
{
@@ -1662,8 +1664,6 @@ namespace Clipper2Lib {
DoSplitOp(outrec, op2);
if (!outrec->pts) break;
op2 = outrec->pts;
if (op2->prev == op2->next->next)
break; // again, because triangles can't self-intersect
continue;
}
else
@@ -2112,9 +2112,10 @@ namespace Clipper2Lib {
e->prev_in_sel = e->prev_in_ael;
e->next_in_sel = e->next_in_ael;
e->jump = e->next_in_sel;
// it is safe to ignore 'joined' edges here because
// if necessary they will be split in IntersectEdges()
e->curr_x = TopX(*e, top_y);
if (e->join_with == JoinWith::Left)
e->curr_x = e->prev_in_ael->curr_x; // also avoids complications
else
e->curr_x = TopX(*e, top_y);
e = e->next_in_ael;
}
}
@@ -2261,14 +2262,15 @@ namespace Clipper2Lib {
void MoveSplits(OutRec* fromOr, OutRec* toOr)
{
if (!fromOr->splits) return;
if (!toOr->splits) toOr->splits = new OutRecList();
OutRecList::iterator orIter = fromOr->splits->begin();
for (; orIter != fromOr->splits->end(); ++orIter)
if (toOr != *orIter) // #987
toOr->splits->emplace_back(*orIter);
toOr->splits->emplace_back(*orIter);
fromOr->splits->clear();
}
void ClipperBase::ProcessHorzJoins()
{
for (const HorzJoin& j : horz_join_list_)
@@ -2298,7 +2300,7 @@ namespace Clipper2Lib {
if (using_polytree_) //#498, #520, #584, D#576, #618
{
if (Path2ContainsPath1(or1->pts, or2->pts))
if (Path1InsidePath2(or1->pts, or2->pts))
{
//swap or1's & or2's pts
OutPt* tmp = or1->pts;
@@ -2309,7 +2311,7 @@ namespace Clipper2Lib {
//or2 is now inside or1
or2->owner = or1;
}
else if (Path2ContainsPath1(or2->pts, or1->pts))
else if (Path1InsidePath2(or2->pts, or1->pts))
{
or2->owner = or1;
}
@@ -2322,14 +2324,13 @@ namespace Clipper2Lib {
else
or2->owner = or1;
}
else // joining, not splitting
else
{
or2->pts = nullptr;
if (using_polytree_)
{
SetOwner(or2, or1);
if (or2->splits)
MoveSplits(or2, or1); //#618
MoveSplits(or2, or1); //#618
}
else
or2->owner = or1;
@@ -2349,7 +2350,7 @@ namespace Clipper2Lib {
void ClipperBase::AddNewIntersectNode(Active& e1, Active& e2, int64_t top_y)
{
Point64 ip;
if (!GetLineIntersectPt(e1.bot, e1.top, e2.bot, e2.top, ip))
if (!GetSegmentIntersectPt(e1.bot, e1.top, e2.bot, e2.top, ip))
ip = Point64(e1.curr_x, top_y); //parallel edges
//rounding errors can occasionally place the calculated intersection
@@ -2933,28 +2934,22 @@ namespace Clipper2Lib {
bool ClipperBase::CheckSplitOwner(OutRec* outrec, OutRecList* splits)
{
// nb: use indexing (not an iterator) in case 'splits' is modified inside this loop (#1029)
for (size_t idx = 0; idx < splits->size(); ++idx)
for (auto split : *splits)
{
OutRec* split = (*splits)[idx];
if (!split->pts && split->splits &&
CheckSplitOwner(outrec, split->splits)) return true; //#942
split = GetRealOutRec(split);
if (!split || split == outrec || split->recursive_split == outrec) continue;
if(!split || split == outrec || split->recursive_split == outrec) continue;
split->recursive_split = outrec; // prevent infinite loops
if (split->splits && CheckSplitOwner(outrec, split->splits))
return true;
else if (CheckBounds(split) &&
IsValidOwner(outrec, split) &&
split->bounds.Contains(outrec->bounds) &&
Path1InsidePath2(outrec->pts, split->pts))
{
outrec->owner = split; //found in split
return true;
if (!CheckBounds(split) || !split->bounds.Contains(outrec->bounds) ||
!Path2ContainsPath1(outrec->pts, split->pts)) continue;
if (!IsValidOwner(outrec, split)) // split is owned by outrec! (#957)
split->owner = outrec->owner;
outrec->owner = split;
return true;
}
}
return false;
}
@@ -2965,12 +2960,13 @@ namespace Clipper2Lib {
// post-condition: if a valid path, outrec will have a polypath
if (outrec->polypath || outrec->bounds.IsEmpty()) return;
while (outrec->owner)
{
if (outrec->owner->splits && CheckSplitOwner(outrec, outrec->owner->splits)) break;
if (outrec->owner->pts && CheckBounds(outrec->owner) &&
outrec->owner->bounds.Contains(outrec->bounds) &&
Path2ContainsPath1(outrec->pts, outrec->owner->pts)) break;
Path1InsidePath2(outrec->pts, outrec->owner->pts)) break;
outrec->owner = outrec->owner->owner;
}
@@ -3033,7 +3029,6 @@ namespace Clipper2Lib {
{
OutRec* outrec = outrec_list_[i];
if (!outrec || !outrec->pts) continue;
if (outrec->is_open)
{
Path64 path;

View File

@@ -1,6 +1,6 @@
/*******************************************************************************
* Author : Angus Johnson *
* Date : 11 October 2025 *
* Date : 22 January 2025 *
* Website : https://www.angusj.com *
* Copyright : Angus Johnson 2010-2025 *
* Purpose : Path Offset (Inflate/Shrink) *
@@ -37,28 +37,22 @@ const double arc_const = 0.002; // <-- 1/500
// Miscellaneous methods
//------------------------------------------------------------------------------
void GetLowestClosedPathInfo(const Paths64& paths, std::optional<size_t>& idx, bool& is_neg_area)
std::optional<size_t> GetLowestClosedPathIdx(const Paths64& paths)
{
idx.reset();
std::optional<size_t> result;
Point64 botPt = Point64(INT64_MAX, INT64_MIN);
for (size_t i = 0; i < paths.size(); ++i)
{
double a = MAX_DBL;
for (const Point64& pt : paths[i])
{
if ((pt.y < botPt.y) ||
((pt.y == botPt.y) && (pt.x >= botPt.x))) continue;
if (a == MAX_DBL)
{
a = Area(paths[i]);
if (a == 0) break; // invalid closed path, so break from inner loop
is_neg_area = a < 0;
}
idx = i;
result = i;
botPt.x = pt.x;
botPt.y = pt.y;
}
}
return result;
}
inline double Hypot(double x, double y)
@@ -151,16 +145,15 @@ ClipperOffset::Group::Group(const Paths64& _paths, JoinType _join_type, EndType
if (end_type == EndType::Polygon)
{
bool is_neg_area;
GetLowestClosedPathInfo(paths_in, lowest_path_idx, is_neg_area);
lowest_path_idx = GetLowestClosedPathIdx(paths_in);
// the lowermost path must be an outer path, so if its orientation is negative,
// then flag the whole group is 'reversed' (will negate delta etc.)
// as this is much more efficient than reversing every path.
is_reversed = lowest_path_idx.has_value() && is_neg_area;
is_reversed = (lowest_path_idx.has_value()) && Area(paths_in[lowest_path_idx.value()]) < 0;
}
else
{
lowest_path_idx.reset();
lowest_path_idx = std::nullopt;
is_reversed = false;
}
}
@@ -243,7 +236,7 @@ void ClipperOffset::DoSquare(const Path64& path, size_t j, size_t k)
{
PointD pt4 = PointD(pt3.x + vec.x * group_delta_, pt3.y + vec.y * group_delta_);
PointD pt = ptQ;
GetLineIntersectPt(pt1, pt2, pt3, pt4, pt);
GetSegmentIntersectPt(pt1, pt2, pt3, pt4, pt);
//get the second intersect point through reflecion
path_out.emplace_back(ReflectPoint(pt, ptQ));
path_out.emplace_back(pt);
@@ -252,7 +245,7 @@ void ClipperOffset::DoSquare(const Path64& path, size_t j, size_t k)
{
PointD pt4 = GetPerpendicD(path[j], norms[k], group_delta_);
PointD pt = ptQ;
GetLineIntersectPt(pt1, pt2, pt3, pt4, pt);
GetSegmentIntersectPt(pt1, pt2, pt3, pt4, pt);
path_out.emplace_back(pt);
//get the second intersect point through reflecion
path_out.emplace_back(ReflectPoint(pt, ptQ));
@@ -608,10 +601,10 @@ void ClipperOffset::ExecuteInternal(double delta)
if (!solution->size()) return;
bool paths_reversed = CheckReverseOrientation();
bool paths_reversed = CheckReverseOrientation();
//clean up self-intersections ...
Clipper64 c;
c.PreserveCollinear(preserve_collinear_);
c.PreserveCollinear(false);
//the solution should retain the orientation of the input
c.ReverseSolution(reverse_solution_ != paths_reversed);
#ifdef USINGZ

View File

@@ -1,8 +1,8 @@
/*******************************************************************************
* Author : Angus Johnson *
* Date : 11 October 2025 *
* Date : 5 July 2024 *
* Website : https://www.angusj.com *
* Copyright : Angus Johnson 2010-2025 *
* Copyright : Angus Johnson 2010-2024 *
* Purpose : FAST rectangular clipping *
* License : https://www.boost.org/LICENSE_1_0.txt *
*******************************************************************************/
@@ -77,8 +77,8 @@ namespace Clipper2Lib {
bool GetSegmentIntersection(const Point64& p1,
const Point64& p2, const Point64& p3, const Point64& p4, Point64& ip)
{
int res1 = CrossProductSign(p1, p3, p4);
int res2 = CrossProductSign(p2, p3, p4);
double res1 = CrossProduct(p1, p3, p4);
double res2 = CrossProduct(p2, p3, p4);
if (res1 == 0)
{
ip = p1;
@@ -97,8 +97,8 @@ namespace Clipper2Lib {
}
if ((res1 > 0) == (res2 > 0)) return false;
int res3 = CrossProductSign(p3, p1, p2);
int res4 = CrossProductSign(p4, p1, p2);
double res3 = CrossProduct(p3, p1, p2);
double res4 = CrossProduct(p4, p1, p2);
if (res3 == 0)
{
ip = p3;
@@ -116,7 +116,7 @@ namespace Clipper2Lib {
if ((res3 > 0) == (res4 > 0)) return false;
// segments must intersect to get here
return GetLineIntersectPt(p1, p2, p3, p4, ip);
return GetSegmentIntersectPt(p1, p2, p3, p4, ip);
}
inline bool GetIntersection(const Path64& rectPath,
@@ -227,7 +227,7 @@ namespace Clipper2Lib {
const Point64& prev_pt, const Point64& curr_pt, const Point64& rect_mp)
{
if (AreOpposites(prev, curr))
return CrossProductSign(prev_pt, rect_mp, curr_pt) < 0;
return CrossProduct(prev_pt, rect_mp, curr_pt) < 0;
else
return HeadingClockwise(prev, curr);
}

File diff suppressed because it is too large Load Diff

View File

@@ -6,4 +6,3 @@
#include "clipper.engine.cpp"
#include "clipper.offset.cpp"
#include "clipper.rectclip.cpp"
#include "clipper.triangulation.cpp"

View File

@@ -1,11 +0,0 @@
cmake_minimum_required(VERSION 3.13)
project(colorsolver)
add_library(colorsolver STATIC
ColorSolver.cpp
ColorSolver.hpp
)
target_include_directories(colorsolver PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
target_compile_features(colorsolver PUBLIC cxx_std_17)
target_link_libraries(colorsolver PUBLIC pigment_painter prusa_fdm_mixer)

File diff suppressed because it is too large Load Diff

View File

@@ -1,243 +0,0 @@
// ColorSolver
// Copyright (C) 2026 sentientstardust
// This program is free software: you can redistribute it and/or modify
// it under the terms of the GNU Affero General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
// This program is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU Affero General Public License for more details.
// You should have received a copy of the GNU Affero General Public License
// along with this program. If not, see <http://www.gnu.org/licenses/>.
#ifndef slic3r_ColorSolver_hpp_
#define slic3r_ColorSolver_hpp_
#include <array>
#include <cstddef>
#include <cstdint>
#include <map>
#include <string>
#include <vector>
namespace Slic3r {
enum class ColorSolverMixModel : int
{
PigmentPainter = 0,
PrusaFdmMixer = 1
};
enum class ColorSolverLookupMode : int
{
ClosestMix = 0,
BlendClosestTwo = 1
};
enum class ColorSolverMode : int
{
RGB = 0,
Oklab = 1,
OklabSoftCap4Dark4 = 2
};
enum class ColorSolverStackComponentRole : uint8_t
{
Generic = 0,
Cyan = 1,
Magenta = 2,
Yellow = 3,
Black = 4,
White = 5
};
enum class ColorSolverCalibratedStackModelKind : uint8_t
{
None = 0,
CurrentLinearAffine = 1,
AlphaEffective = 2,
DepthKernelLinear = 3,
NearestMeasuredSample = 4
};
struct ColorSolverCalibratedStackModel {
ColorSolverCalibratedStackModelKind kind { ColorSolverCalibratedStackModelKind::None };
size_t component_count { 0 };
int measured_stack_depth { 0 };
std::vector<float> measured_layer_heights_mm;
std::vector<float> alphas;
std::vector<float> taus;
std::vector<float> coefficients_linear_rgb;
std::vector<float> measured_sample_rgbs;
std::vector<uint16_t> measured_sample_stacks;
mutable std::string cached_key;
bool valid() const;
std::string cache_key() const;
};
struct ColorSolverCandidateSet {
struct KdNode {
uint32_t candidate_idx { 0 };
int left { -1 };
int right { -1 };
uint8_t axis { 0 };
};
size_t component_count { 0 };
std::vector<float> rgbs;
std::vector<float> perceptual_coords;
std::vector<float> weights;
std::vector<KdNode> kd_nodes;
std::vector<KdNode> perceptual_kd_nodes;
int kd_root { -1 };
int perceptual_kd_root { -1 };
bool empty() const
{
return component_count == 0 || rgbs.empty() || rgbs.size() % 3 != 0 ||
weights.size() != (rgbs.size() / 3) * component_count;
}
};
using ColorSolverCandidateCache = std::map<std::string, ColorSolverCandidateSet>;
struct ColorSolverOrderedStackCandidateSet {
using KdNode = ColorSolverCandidateSet::KdNode;
size_t component_count { 0 };
int stack_depth { 0 };
int simulated_stack_depth { 0 };
std::vector<float> rgbs;
std::vector<float> perceptual_coords;
std::vector<uint16_t> stacks;
std::vector<KdNode> kd_nodes;
std::vector<KdNode> perceptual_kd_nodes;
int kd_root { -1 };
int perceptual_kd_root { -1 };
bool empty() const
{
return component_count == 0 || stack_depth <= 0 || rgbs.empty() || rgbs.size() % 3 != 0 ||
stacks.size() != (rgbs.size() / 3) * size_t(stack_depth);
}
};
struct ColorSolverOrderedStackResult {
std::vector<uint16_t> surface_to_deep;
std::array<float, 3> rgb { { 0.f, 0.f, 0.f } };
bool has_rgb { false };
};
using ColorSolverOrderedStackCandidateCache = std::map<std::string, ColorSolverOrderedStackCandidateSet>;
ColorSolverMixModel color_solver_mix_model_from_index(int model);
ColorSolverLookupMode color_solver_lookup_mode_from_index(int mode);
ColorSolverMode color_solver_mode_from_index(int mode);
int color_solver_total_units_for_component_count(size_t component_count);
size_t color_solver_candidate_count(size_t component_count, int total_units);
std::array<float, 3> mix_color_solver_components(const std::vector<std::array<float, 3>> &component_colors,
const std::vector<int> &weights,
ColorSolverMixModel mix_model);
std::array<float, 3> mix_color_solver_components(const std::vector<std::array<float, 3>> &component_colors,
const std::vector<float> &weights,
ColorSolverMixModel mix_model);
std::array<float, 3> mix_color_solver_ordered_stack(const std::vector<std::array<float, 3>> &component_colors,
const std::vector<uint16_t> &surface_to_deep,
const std::vector<float> &layer_opacities,
const std::array<float, 3> &background_rgb,
ColorSolverMixModel mix_model,
float surface_scatter = 0.f,
bool beer_lambert_rgb_correction = false,
bool td_effective_alpha_correction = false,
const std::vector<ColorSolverStackComponentRole> &component_roles = {},
const std::vector<float> &layer_opacities_by_depth = {},
const ColorSolverCalibratedStackModel *calibrated_stack_model = nullptr,
bool adaptive_spectral_correction = false);
std::array<float, 3> color_solver_oklab_from_srgb(const std::array<float, 3> &rgb);
std::array<float, 3> color_solver_srgb_from_oklab(const std::array<float, 3> &oklab);
std::string color_solver_candidate_cache_key(const std::vector<std::array<float, 3>> &component_colors,
ColorSolverMixModel mix_model,
int total_units = 0);
ColorSolverCandidateSet build_color_solver_candidates(const std::vector<std::array<float, 3>> &component_colors,
ColorSolverMixModel mix_model,
int total_units = 0);
void build_color_solver_candidate_kd_trees(ColorSolverCandidateSet &candidates);
const ColorSolverCandidateSet &color_solver_candidates(ColorSolverCandidateCache &cache,
const std::vector<std::array<float, 3>> &component_colors,
ColorSolverMixModel mix_model,
int total_units = 0);
std::vector<float> solve_color_solver_weights_for_target(const ColorSolverCandidateSet &candidates,
const std::array<float, 3> &target_rgb,
ColorSolverLookupMode lookup_mode,
ColorSolverMode solver_mode);
std::string color_solver_ordered_stack_candidate_cache_key(const std::vector<std::array<float, 3>> &component_colors,
const std::vector<float> &layer_opacities,
const std::array<float, 3> &background_rgb,
ColorSolverMixModel mix_model,
int stack_depth,
int simulated_stack_depth = 0,
size_t candidate_limit = 0,
size_t stack_item_limit = 0,
float surface_scatter = 0.f,
bool beer_lambert_rgb_correction = false,
bool td_effective_alpha_correction = false,
const std::vector<ColorSolverStackComponentRole> &component_roles = {},
bool beam_search_stack_expansion = false,
const std::vector<float> &layer_opacities_by_depth = {},
const ColorSolverCalibratedStackModel *calibrated_stack_model = nullptr,
bool adaptive_spectral_correction = false);
ColorSolverOrderedStackCandidateSet build_color_solver_ordered_stack_candidates(
const std::vector<std::array<float, 3>> &component_colors,
const std::vector<float> &layer_opacities,
const std::array<float, 3> &background_rgb,
ColorSolverMixModel mix_model,
int stack_depth,
int simulated_stack_depth = 0,
size_t candidate_limit = 0,
size_t stack_item_limit = 0,
float surface_scatter = 0.f,
bool beer_lambert_rgb_correction = false,
bool td_effective_alpha_correction = false,
const std::vector<ColorSolverStackComponentRole> &component_roles = {},
bool beam_search_stack_expansion = false,
const std::vector<float> &layer_opacities_by_depth = {},
const ColorSolverCalibratedStackModel *calibrated_stack_model = nullptr,
bool adaptive_spectral_correction = false);
const ColorSolverOrderedStackCandidateSet &color_solver_ordered_stack_candidates(
ColorSolverOrderedStackCandidateCache &cache,
const std::vector<std::array<float, 3>> &component_colors,
const std::vector<float> &layer_opacities,
const std::array<float, 3> &background_rgb,
ColorSolverMixModel mix_model,
int stack_depth,
int simulated_stack_depth = 0,
size_t candidate_limit = 0,
size_t stack_item_limit = 0,
float surface_scatter = 0.f,
bool beer_lambert_rgb_correction = false,
bool td_effective_alpha_correction = false,
const std::vector<ColorSolverStackComponentRole> &component_roles = {},
bool beam_search_stack_expansion = false,
const std::vector<float> &layer_opacities_by_depth = {},
const ColorSolverCalibratedStackModel *calibrated_stack_model = nullptr,
bool adaptive_spectral_correction = false);
ColorSolverOrderedStackResult solve_color_solver_ordered_stack_result_for_target(
const ColorSolverOrderedStackCandidateSet &candidates,
const std::array<float, 3> &target_rgb,
ColorSolverMode solver_mode);
std::vector<uint16_t> solve_color_solver_ordered_stack_for_target(
const ColorSolverOrderedStackCandidateSet &candidates,
const std::array<float, 3> &target_rgb,
ColorSolverMode solver_mode);
} // namespace Slic3r
#endif

View File

@@ -1,14 +0,0 @@
cmake_minimum_required(VERSION 3.13)
project(pigment_painter)
find_package(PNG REQUIRED)
add_library(pigment_painter STATIC
lut_wide.png.c
pigment_painter_mixer.cpp
pigment_painter_mixer.hpp
)
target_include_directories(pigment_painter PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
target_compile_features(pigment_painter PUBLIC cxx_std_17)
target_link_libraries(pigment_painter PRIVATE PNG::PNG)

View File

@@ -1,674 +0,0 @@
GNU GENERAL PUBLIC LICENSE
Version 3, 29 June 2007
Copyright (C) 2007 Free Software Foundation, Inc. <https://fsf.org/>
Everyone is permitted to copy and distribute verbatim copies
of this license document, but changing it is not allowed.
Preamble
The GNU General Public License is a free, copyleft license for
software and other kinds of works.
The licenses for most software and other practical works are designed
to take away your freedom to share and change the works. By contrast,
the GNU General Public License is intended to guarantee your freedom to
share and change all versions of a program--to make sure it remains free
software for all its users. We, the Free Software Foundation, use the
GNU General Public License for most of our software; it applies also to
any other work released this way by its authors. You can apply it to
your programs, too.
When we speak of free software, we are referring to freedom, not
price. Our General Public Licenses are designed to make sure that you
have the freedom to distribute copies of free software (and charge for
them if you wish), that you receive source code or can get it if you
want it, that you can change the software or use pieces of it in new
free programs, and that you know you can do these things.
To protect your rights, we need to prevent others from denying you
these rights or asking you to surrender the rights. Therefore, you have
certain responsibilities if you distribute copies of the software, or if
you modify it: responsibilities to respect the freedom of others.
For example, if you distribute copies of such a program, whether
gratis or for a fee, you must pass on to the recipients the same
freedoms that you received. You must make sure that they, too, receive
or can get the source code. And you must show them these terms so they
know their rights.
Developers that use the GNU GPL protect your rights with two steps:
(1) assert copyright on the software, and (2) offer you this License
giving you legal permission to copy, distribute and/or modify it.
For the developers' and authors' protection, the GPL clearly explains
that there is no warranty for this free software. For both users' and
authors' sake, the GPL requires that modified versions be marked as
changed, so that their problems will not be attributed erroneously to
authors of previous versions.
Some devices are designed to deny users access to install or run
modified versions of the software inside them, although the manufacturer
can do so. This is fundamentally incompatible with the aim of
protecting users' freedom to change the software. The systematic
pattern of such abuse occurs in the area of products for individuals to
use, which is precisely where it is most unacceptable. Therefore, we
have designed this version of the GPL to prohibit the practice for those
products. If such problems arise substantially in other domains, we
stand ready to extend this provision to those domains in future versions
of the GPL, as needed to protect the freedom of users.
Finally, every program is threatened constantly by software patents.
States should not allow patents to restrict development and use of
software on general-purpose computers, but in those that do, we wish to
avoid the special danger that patents applied to a free program could
make it effectively proprietary. To prevent this, the GPL assures that
patents cannot be used to render the program non-free.
The precise terms and conditions for copying, distribution and
modification follow.
TERMS AND CONDITIONS
0. Definitions.
"This License" refers to version 3 of the GNU General Public License.
"Copyright" also means copyright-like laws that apply to other kinds of
works, such as semiconductor masks.
"The Program" refers to any copyrightable work licensed under this
License. Each licensee is addressed as "you". "Licensees" and
"recipients" may be individuals or organizations.
To "modify" a work means to copy from or adapt all or part of the work
in a fashion requiring copyright permission, other than the making of an
exact copy. The resulting work is called a "modified version" of the
earlier work or a work "based on" the earlier work.
A "covered work" means either the unmodified Program or a work based
on the Program.
To "propagate" a work means to do anything with it that, without
permission, would make you directly or secondarily liable for
infringement under applicable copyright law, except executing it on a
computer or modifying a private copy. Propagation includes copying,
distribution (with or without modification), making available to the
public, and in some countries other activities as well.
To "convey" a work means any kind of propagation that enables other
parties to make or receive copies. Mere interaction with a user through
a computer network, with no transfer of a copy, is not conveying.
An interactive user interface displays "Appropriate Legal Notices"
to the extent that it includes a convenient and prominently visible
feature that (1) displays an appropriate copyright notice, and (2)
tells the user that there is no warranty for the work (except to the
extent that warranties are provided), that licensees may convey the
work under this License, and how to view a copy of this License. If
the interface presents a list of user commands or options, such as a
menu, a prominent item in the list meets this criterion.
1. Source Code.
The "source code" for a work means the preferred form of the work
for making modifications to it. "Object code" means any non-source
form of a work.
A "Standard Interface" means an interface that either is an official
standard defined by a recognized standards body, or, in the case of
interfaces specified for a particular programming language, one that
is widely used among developers working in that language.
The "System Libraries" of an executable work include anything, other
than the work as a whole, that (a) is included in the normal form of
packaging a Major Component, but which is not part of that Major
Component, and (b) serves only to enable use of the work with that
Major Component, or to implement a Standard Interface for which an
implementation is available to the public in source code form. A
"Major Component", in this context, means a major essential component
(kernel, window system, and so on) of the specific operating system
(if any) on which the executable work runs, or a compiler used to
produce the work, or an object code interpreter used to run it.
The "Corresponding Source" for a work in object code form means all
the source code needed to generate, install, and (for an executable
work) run the object code and to modify the work, including scripts to
control those activities. However, it does not include the work's
System Libraries, or general-purpose tools or generally available free
programs which are used unmodified in performing those activities but
which are not part of the work. For example, Corresponding Source
includes interface definition files associated with source files for
the work, and the source code for shared libraries and dynamically
linked subprograms that the work is specifically designed to require,
such as by intimate data communication or control flow between those
subprograms and other parts of the work.
The Corresponding Source need not include anything that users
can regenerate automatically from other parts of the Corresponding
Source.
The Corresponding Source for a work in source code form is that
same work.
2. Basic Permissions.
All rights granted under this License are granted for the term of
copyright on the Program, and are irrevocable provided the stated
conditions are met. This License explicitly affirms your unlimited
permission to run the unmodified Program. The output from running a
covered work is covered by this License only if the output, given its
content, constitutes a covered work. This License acknowledges your
rights of fair use or other equivalent, as provided by copyright law.
You may make, run and propagate covered works that you do not
convey, without conditions so long as your license otherwise remains
in force. You may convey covered works to others for the sole purpose
of having them make modifications exclusively for you, or provide you
with facilities for running those works, provided that you comply with
the terms of this License in conveying all material for which you do
not control copyright. Those thus making or running the covered works
for you must do so exclusively on your behalf, under your direction
and control, on terms that prohibit them from making any copies of
your copyrighted material outside their relationship with you.
Conveying under any other circumstances is permitted solely under
the conditions stated below. Sublicensing is not allowed; section 10
makes it unnecessary.
3. Protecting Users' Legal Rights From Anti-Circumvention Law.
No covered work shall be deemed part of an effective technological
measure under any applicable law fulfilling obligations under article
11 of the WIPO copyright treaty adopted on 20 December 1996, or
similar laws prohibiting or restricting circumvention of such
measures.
When you convey a covered work, you waive any legal power to forbid
circumvention of technological measures to the extent such circumvention
is effected by exercising rights under this License with respect to
the covered work, and you disclaim any intention to limit operation or
modification of the work as a means of enforcing, against the work's
users, your or third parties' legal rights to forbid circumvention of
technological measures.
4. Conveying Verbatim Copies.
You may convey verbatim copies of the Program's source code as you
receive it, in any medium, provided that you conspicuously and
appropriately publish on each copy an appropriate copyright notice;
keep intact all notices stating that this License and any
non-permissive terms added in accord with section 7 apply to the code;
keep intact all notices of the absence of any warranty; and give all
recipients a copy of this License along with the Program.
You may charge any price or no price for each copy that you convey,
and you may offer support or warranty protection for a fee.
5. Conveying Modified Source Versions.
You may convey a work based on the Program, or the modifications to
produce it from the Program, in the form of source code under the
terms of section 4, provided that you also meet all of these conditions:
a) The work must carry prominent notices stating that you modified
it, and giving a relevant date.
b) The work must carry prominent notices stating that it is
released under this License and any conditions added under section
7. This requirement modifies the requirement in section 4 to
"keep intact all notices".
c) You must license the entire work, as a whole, under this
License to anyone who comes into possession of a copy. This
License will therefore apply, along with any applicable section 7
additional terms, to the whole of the work, and all its parts,
regardless of how they are packaged. This License gives no
permission to license the work in any other way, but it does not
invalidate such permission if you have separately received it.
d) If the work has interactive user interfaces, each must display
Appropriate Legal Notices; however, if the Program has interactive
interfaces that do not display Appropriate Legal Notices, your
work need not make them do so.
A compilation of a covered work with other separate and independent
works, which are not by their nature extensions of the covered work,
and which are not combined with it such as to form a larger program,
in or on a volume of a storage or distribution medium, is called an
"aggregate" if the compilation and its resulting copyright are not
used to limit the access or legal rights of the compilation's users
beyond what the individual works permit. Inclusion of a covered work
in an aggregate does not cause this License to apply to the other
parts of the aggregate.
6. Conveying Non-Source Forms.
You may convey a covered work in object code form under the terms
of sections 4 and 5, provided that you also convey the
machine-readable Corresponding Source under the terms of this License,
in one of these ways:
a) Convey the object code in, or embodied in, a physical product
(including a physical distribution medium), accompanied by the
Corresponding Source fixed on a durable physical medium
customarily used for software interchange.
b) Convey the object code in, or embodied in, a physical product
(including a physical distribution medium), accompanied by a
written offer, valid for at least three years and valid for as
long as you offer spare parts or customer support for that product
model, to give anyone who possesses the object code either (1) a
copy of the Corresponding Source for all the software in the
product that is covered by this License, on a durable physical
medium customarily used for software interchange, for a price no
more than your reasonable cost of physically performing this
conveying of source, or (2) access to copy the
Corresponding Source from a network server at no charge.
c) Convey individual copies of the object code with a copy of the
written offer to provide the Corresponding Source. This
alternative is allowed only occasionally and noncommercially, and
only if you received the object code with such an offer, in accord
with subsection 6b.
d) Convey the object code by offering access from a designated
place (gratis or for a charge), and offer equivalent access to the
Corresponding Source in the same way through the same place at no
further charge. You need not require recipients to copy the
Corresponding Source along with the object code. If the place to
copy the object code is a network server, the Corresponding Source
may be on a different server (operated by you or a third party)
that supports equivalent copying facilities, provided you maintain
clear directions next to the object code saying where to find the
Corresponding Source. Regardless of what server hosts the
Corresponding Source, you remain obligated to ensure that it is
available for as long as needed to satisfy these requirements.
e) Convey the object code using peer-to-peer transmission, provided
you inform other peers where the object code and Corresponding
Source of the work are being offered to the general public at no
charge under subsection 6d.
A separable portion of the object code, whose source code is excluded
from the Corresponding Source as a System Library, need not be
included in conveying the object code work.
A "User Product" is either (1) a "consumer product", which means any
tangible personal property which is normally used for personal, family,
or household purposes, or (2) anything designed or sold for incorporation
into a dwelling. In determining whether a product is a consumer product,
doubtful cases shall be resolved in favor of coverage. For a particular
product received by a particular user, "normally used" refers to a
typical or common use of that class of product, regardless of the status
of the particular user or of the way in which the particular user
actually uses, or expects or is expected to use, the product. A product
is a consumer product regardless of whether the product has substantial
commercial, industrial or non-consumer uses, unless such uses represent
the only significant mode of use of the product.
"Installation Information" for a User Product means any methods,
procedures, authorization keys, or other information required to install
and execute modified versions of a covered work in that User Product from
a modified version of its Corresponding Source. The information must
suffice to ensure that the continued functioning of the modified object
code is in no case prevented or interfered with solely because
modification has been made.
If you convey an object code work under this section in, or with, or
specifically for use in, a User Product, and the conveying occurs as
part of a transaction in which the right of possession and use of the
User Product is transferred to the recipient in perpetuity or for a
fixed term (regardless of how the transaction is characterized), the
Corresponding Source conveyed under this section must be accompanied
by the Installation Information. But this requirement does not apply
if neither you nor any third party retains the ability to install
modified object code on the User Product (for example, the work has
been installed in ROM).
The requirement to provide Installation Information does not include a
requirement to continue to provide support service, warranty, or updates
for a work that has been modified or installed by the recipient, or for
the User Product in which it has been modified or installed. Access to a
network may be denied when the modification itself materially and
adversely affects the operation of the network or violates the rules and
protocols for communication across the network.
Corresponding Source conveyed, and Installation Information provided,
in accord with this section must be in a format that is publicly
documented (and with an implementation available to the public in
source code form), and must require no special password or key for
unpacking, reading or copying.
7. Additional Terms.
"Additional permissions" are terms that supplement the terms of this
License by making exceptions from one or more of its conditions.
Additional permissions that are applicable to the entire Program shall
be treated as though they were included in this License, to the extent
that they are valid under applicable law. If additional permissions
apply only to part of the Program, that part may be used separately
under those permissions, but the entire Program remains governed by
this License without regard to the additional permissions.
When you convey a copy of a covered work, you may at your option
remove any additional permissions from that copy, or from any part of
it. (Additional permissions may be written to require their own
removal in certain cases when you modify the work.) You may place
additional permissions on material, added by you to a covered work,
for which you have or can give appropriate copyright permission.
Notwithstanding any other provision of this License, for material you
add to a covered work, you may (if authorized by the copyright holders of
that material) supplement the terms of this License with terms:
a) Disclaiming warranty or limiting liability differently from the
terms of sections 15 and 16 of this License; or
b) Requiring preservation of specified reasonable legal notices or
author attributions in that material or in the Appropriate Legal
Notices displayed by works containing it; or
c) Prohibiting misrepresentation of the origin of that material, or
requiring that modified versions of such material be marked in
reasonable ways as different from the original version; or
d) Limiting the use for publicity purposes of names of licensors or
authors of the material; or
e) Declining to grant rights under trademark law for use of some
trade names, trademarks, or service marks; or
f) Requiring indemnification of licensors and authors of that
material by anyone who conveys the material (or modified versions of
it) with contractual assumptions of liability to the recipient, for
any liability that these contractual assumptions directly impose on
those licensors and authors.
All other non-permissive additional terms are considered "further
restrictions" within the meaning of section 10. If the Program as you
received it, or any part of it, contains a notice stating that it is
governed by this License along with a term that is a further
restriction, you may remove that term. If a license document contains
a further restriction but permits relicensing or conveying under this
License, you may add to a covered work material governed by the terms
of that license document, provided that the further restriction does
not survive such relicensing or conveying.
If you add terms to a covered work in accord with this section, you
must place, in the relevant source files, a statement of the
additional terms that apply to those files, or a notice indicating
where to find the applicable terms.
Additional terms, permissive or non-permissive, may be stated in the
form of a separately written license, or stated as exceptions;
the above requirements apply either way.
8. Termination.
You may not propagate or modify a covered work except as expressly
provided under this License. Any attempt otherwise to propagate or
modify it is void, and will automatically terminate your rights under
this License (including any patent licenses granted under the third
paragraph of section 11).
However, if you cease all violation of this License, then your
license from a particular copyright holder is reinstated (a)
provisionally, unless and until the copyright holder explicitly and
finally terminates your license, and (b) permanently, if the copyright
holder fails to notify you of the violation by some reasonable means
prior to 60 days after the cessation.
Moreover, your license from a particular copyright holder is
reinstated permanently if the copyright holder notifies you of the
violation by some reasonable means, this is the first time you have
received notice of violation of this License (for any work) from that
copyright holder, and you cure the violation prior to 30 days after
your receipt of the notice.
Termination of your rights under this section does not terminate the
licenses of parties who have received copies or rights from you under
this License. If your rights have been terminated and not permanently
reinstated, you do not qualify to receive new licenses for the same
material under section 10.
9. Acceptance Not Required for Having Copies.
You are not required to accept this License in order to receive or
run a copy of the Program. Ancillary propagation of a covered work
occurring solely as a consequence of using peer-to-peer transmission
to receive a copy likewise does not require acceptance. However,
nothing other than this License grants you permission to propagate or
modify any covered work. These actions infringe copyright if you do
not accept this License. Therefore, by modifying or propagating a
covered work, you indicate your acceptance of this License to do so.
10. Automatic Licensing of Downstream Recipients.
Each time you convey a covered work, the recipient automatically
receives a license from the original licensors, to run, modify and
propagate that work, subject to this License. You are not responsible
for enforcing compliance by third parties with this License.
An "entity transaction" is a transaction transferring control of an
organization, or substantially all assets of one, or subdividing an
organization, or merging organizations. If propagation of a covered
work results from an entity transaction, each party to that
transaction who receives a copy of the work also receives whatever
licenses to the work the party's predecessor in interest had or could
give under the previous paragraph, plus a right to possession of the
Corresponding Source of the work from the predecessor in interest, if
the predecessor has it or can get it with reasonable efforts.
You may not impose any further restrictions on the exercise of the
rights granted or affirmed under this License. For example, you may
not impose a license fee, royalty, or other charge for exercise of
rights granted under this License, and you may not initiate litigation
(including a cross-claim or counterclaim in a lawsuit) alleging that
any patent claim is infringed by making, using, selling, offering for
sale, or importing the Program or any portion of it.
11. Patents.
A "contributor" is a copyright holder who authorizes use under this
License of the Program or a work on which the Program is based. The
work thus licensed is called the contributor's "contributor version".
A contributor's "essential patent claims" are all patent claims
owned or controlled by the contributor, whether already acquired or
hereafter acquired, that would be infringed by some manner, permitted
by this License, of making, using, or selling its contributor version,
but do not include claims that would be infringed only as a
consequence of further modification of the contributor version. For
purposes of this definition, "control" includes the right to grant
patent sublicenses in a manner consistent with the requirements of
this License.
Each contributor grants you a non-exclusive, worldwide, royalty-free
patent license under the contributor's essential patent claims, to
make, use, sell, offer for sale, import and otherwise run, modify and
propagate the contents of its contributor version.
In the following three paragraphs, a "patent license" is any express
agreement or commitment, however denominated, not to enforce a patent
(such as an express permission to practice a patent or covenant not to
sue for patent infringement). To "grant" such a patent license to a
party means to make such an agreement or commitment not to enforce a
patent against the party.
If you convey a covered work, knowingly relying on a patent license,
and the Corresponding Source of the work is not available for anyone
to copy, free of charge and under the terms of this License, through a
publicly available network server or other readily accessible means,
then you must either (1) cause the Corresponding Source to be so
available, or (2) arrange to deprive yourself of the benefit of the
patent license for this particular work, or (3) arrange, in a manner
consistent with the requirements of this License, to extend the patent
license to downstream recipients. "Knowingly relying" means you have
actual knowledge that, but for the patent license, your conveying the
covered work in a country, or your recipient's use of the covered work
in a country, would infringe one or more identifiable patents in that
country that you have reason to believe are valid.
If, pursuant to or in connection with a single transaction or
arrangement, you convey, or propagate by procuring conveyance of, a
covered work, and grant a patent license to some of the parties
receiving the covered work authorizing them to use, propagate, modify
or convey a specific copy of the covered work, then the patent license
you grant is automatically extended to all recipients of the covered
work and works based on it.
A patent license is "discriminatory" if it does not include within
the scope of its coverage, prohibits the exercise of, or is
conditioned on the non-exercise of one or more of the rights that are
specifically granted under this License. You may not convey a covered
work if you are a party to an arrangement with a third party that is
in the business of distributing software, under which you make payment
to the third party based on the extent of your activity of conveying
the work, and under which the third party grants, to any of the
parties who would receive the covered work from you, a discriminatory
patent license (a) in connection with copies of the covered work
conveyed by you (or copies made from those copies), or (b) primarily
for and in connection with specific products or compilations that
contain the covered work, unless you entered into that arrangement,
or that patent license was granted, prior to 28 March 2007.
Nothing in this License shall be construed as excluding or limiting
any implied license or other defenses to infringement that may
otherwise be available to you under applicable patent law.
12. No Surrender of Others' Freedom.
If conditions are imposed on you (whether by court order, agreement or
otherwise) that contradict the conditions of this License, they do not
excuse you from the conditions of this License. If you cannot convey a
covered work so as to satisfy simultaneously your obligations under this
License and any other pertinent obligations, then as a consequence you may
not convey it at all. For example, if you agree to terms that obligate you
to collect a royalty for further conveying from those to whom you convey
the Program, the only way you could satisfy both those terms and this
License would be to refrain entirely from conveying the Program.
13. Use with the GNU Affero General Public License.
Notwithstanding any other provision of this License, you have
permission to link or combine any covered work with a work licensed
under version 3 of the GNU Affero General Public License into a single
combined work, and to convey the resulting work. The terms of this
License will continue to apply to the part which is the covered work,
but the special requirements of the GNU Affero General Public License,
section 13, concerning interaction through a network will apply to the
combination as such.
14. Revised Versions of this License.
The Free Software Foundation may publish revised and/or new versions of
the GNU General Public License from time to time. Such new versions will
be similar in spirit to the present version, but may differ in detail to
address new problems or concerns.
Each version is given a distinguishing version number. If the
Program specifies that a certain numbered version of the GNU General
Public License "or any later version" applies to it, you have the
option of following the terms and conditions either of that numbered
version or of any later version published by the Free Software
Foundation. If the Program does not specify a version number of the
GNU General Public License, you may choose any version ever published
by the Free Software Foundation.
If the Program specifies that a proxy can decide which future
versions of the GNU General Public License can be used, that proxy's
public statement of acceptance of a version permanently authorizes you
to choose that version for the Program.
Later license versions may give you additional or different
permissions. However, no additional obligations are imposed on any
author or copyright holder as a result of your choosing to follow a
later version.
15. Disclaimer of Warranty.
THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
16. Limitation of Liability.
IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
SUCH DAMAGES.
17. Interpretation of Sections 15 and 16.
If the disclaimer of warranty and limitation of liability provided
above cannot be given local legal effect according to their terms,
reviewing courts shall apply local law that most closely approximates
an absolute waiver of all civil liability in connection with the
Program, unless a warranty or assumption of liability accompanies a
copy of the Program in return for a fee.
END OF TERMS AND CONDITIONS
How to Apply These Terms to Your New Programs
If you develop a new program, and you want it to be of the greatest
possible use to the public, the best way to achieve this is to make it
free software which everyone can redistribute and change under these terms.
To do so, attach the following notices to the program. It is safest
to attach them to the start of each source file to most effectively
state the exclusion of warranty; and each file should have at least
the "copyright" line and a pointer to where the full notice is found.
<one line to give the program's name and a brief idea of what it does.>
Copyright (C) <year> <name of author>
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 3 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program. If not, see <https://www.gnu.org/licenses/>.
Also add information on how to contact you by electronic and paper mail.
If the program does terminal interaction, make it output a short
notice like this when it starts in an interactive mode:
<program> Copyright (C) <year> <name of author>
This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
This is free software, and you are welcome to redistribute it
under certain conditions; type `show c' for details.
The hypothetical commands `show w' and `show c' should show the appropriate
parts of the General Public License. Of course, your program's commands
might be different; for a GUI interface, you would use an "about box".
You should also get your employer (if you work as a programmer) or school,
if any, to sign a "copyright disclaimer" for the program, if necessary.
For more information on this, and how to apply and follow the GNU GPL, see
<https://www.gnu.org/licenses/>.
The GNU General Public License does not permit incorporating your program
into proprietary programs. If your program is a subroutine library, you
may consider it more useful to permit linking proprietary applications with
the library. If this is what you want to do, use the GNU Lesser General
Public License instead of this License. But first, please read
<https://www.gnu.org/licenses/why-not-lgpl.html>.

File diff suppressed because it is too large Load Diff

View File

@@ -1,334 +0,0 @@
#include "pigment_painter_mixer.hpp"
#include <algorithm>
#include <cmath>
#include <cstddef>
#include <cstdint>
#include <cstring>
#include <mutex>
#include <png.h>
extern "C" const char lut_wide_png_data[10295238];
namespace pigment_painter {
namespace {
constexpr int k_lut_dimen = 256;
constexpr size_t k_lut_png_size = sizeof(lut_wide_png_data);
struct PngMemoryReader
{
const std::uint8_t *data = nullptr;
size_t size = 0;
size_t offset = 0;
};
struct LutImage
{
int width = 0;
int height = 0;
int row_size = 0;
std::vector<std::uint8_t> rgba;
bool loaded = false;
};
float clamp01(float value)
{
return std::max(0.f, std::min(1.f, value));
}
float srgb_to_linear(float value)
{
const float x = clamp01(value);
return x <= 0.04045f ? x / 12.92f : std::pow((x + 0.055f) / 1.055f, 2.4f);
}
float linear_to_srgb(float value)
{
const float x = clamp01(value);
return x <= 0.0031308f ? x * 12.92f : 1.055f * std::pow(x, 1.f / 2.4f) - 0.055f;
}
void png_memory_read(png_structp png_ptr, png_bytep out, png_size_t bytes)
{
PngMemoryReader *reader = static_cast<PngMemoryReader *>(png_get_io_ptr(png_ptr));
if (reader == nullptr || reader->offset + bytes > reader->size)
png_error(png_ptr, "pigment painter lut read failed");
std::memcpy(out, reader->data + reader->offset, bytes);
reader->offset += bytes;
}
bool decode_lut_png(LutImage &image)
{
PngMemoryReader reader {
reinterpret_cast<const std::uint8_t *>(lut_wide_png_data),
k_lut_png_size,
0
};
png_structp png = png_create_read_struct(PNG_LIBPNG_VER_STRING, nullptr, nullptr, nullptr);
if (png == nullptr)
return false;
png_infop info = png_create_info_struct(png);
if (info == nullptr) {
png_destroy_read_struct(&png, nullptr, nullptr);
return false;
}
if (setjmp(png_jmpbuf(png))) {
png_destroy_read_struct(&png, &info, nullptr);
return false;
}
png_set_read_fn(png, &reader, png_memory_read);
png_read_info(png, info);
png_uint_32 width = png_get_image_width(png, info);
png_uint_32 height = png_get_image_height(png, info);
int bit_depth = png_get_bit_depth(png, info);
int color_type = png_get_color_type(png, info);
if (bit_depth == 16)
png_set_strip_16(png);
if (color_type == PNG_COLOR_TYPE_PALETTE)
png_set_palette_to_rgb(png);
if (color_type == PNG_COLOR_TYPE_GRAY && bit_depth < 8)
png_set_expand_gray_1_2_4_to_8(png);
if (png_get_valid(png, info, PNG_INFO_tRNS))
png_set_tRNS_to_alpha(png);
if (color_type == PNG_COLOR_TYPE_GRAY || color_type == PNG_COLOR_TYPE_GRAY_ALPHA)
png_set_gray_to_rgb(png);
if (color_type == PNG_COLOR_TYPE_RGB || color_type == PNG_COLOR_TYPE_GRAY || color_type == PNG_COLOR_TYPE_PALETTE)
png_set_filler(png, 0xff, PNG_FILLER_AFTER);
png_read_update_info(png, info);
if (png_get_channels(png, info) != 4 || width % k_lut_dimen != 0 || height % k_lut_dimen != 0) {
png_destroy_read_struct(&png, &info, nullptr);
return false;
}
image.width = int(width);
image.height = int(height);
image.row_size = image.width / k_lut_dimen;
image.rgba.resize(size_t(width) * size_t(height) * 4);
std::vector<png_bytep> rows(height);
for (png_uint_32 row = 0; row < height; ++row)
rows[row] = image.rgba.data() + size_t(row) * size_t(width) * 4;
png_read_image(png, rows.data());
png_read_end(png, nullptr);
png_destroy_read_struct(&png, &info, nullptr);
image.loaded = image.width == k_lut_dimen * image.row_size &&
image.height >= k_lut_dimen * ((k_lut_dimen * 2 + image.row_size - 1) / image.row_size);
return image.loaded;
}
const LutImage *lut_image()
{
static LutImage image;
static std::once_flag once;
std::call_once(once, []() { decode_lut_png(image); });
return image.loaded ? &image : nullptr;
}
std::array<float, 3> sample_lut_texel(const LutImage &image, int x, int y, int z)
{
const int col = z % image.row_size;
const int row = z / image.row_size;
const int ix = x + col * k_lut_dimen;
const int iy = y + row * k_lut_dimen;
const size_t idx = (size_t(iy) * size_t(image.width) + size_t(ix)) * 4;
return {
float(image.rgba[idx]) / 255.f,
float(image.rgba[idx + 2]) / 255.f,
float(image.rgba[idx + 1]) / 255.f
};
}
std::array<float, 3> lerp_color(const std::array<float, 3> &a, const std::array<float, 3> &b, float t)
{
return {
a[0] + (b[0] - a[0]) * t,
a[1] + (b[1] - a[1]) * t,
a[2] + (b[2] - a[2]) * t
};
}
std::array<float, 3> sample_lut(const LutImage &image, const std::array<float, 3> &color, int z_offset)
{
const float xf = clamp01(color[0]) * float(k_lut_dimen - 1);
const float yf = clamp01(color[1]) * float(k_lut_dimen - 1);
const float zf = clamp01(color[2]) * float(k_lut_dimen - 1);
const int x0 = int(std::floor(xf));
const int y0 = int(std::floor(yf));
const int z0 = int(std::floor(zf));
const int x1 = std::min(x0 + 1, k_lut_dimen - 1);
const int y1 = std::min(y0 + 1, k_lut_dimen - 1);
const int z1 = std::min(z0 + 1, k_lut_dimen - 1);
const float tx = xf - float(x0);
const float ty = yf - float(y0);
const float tz = zf - float(z0);
const std::array<float, 3> c000 = sample_lut_texel(image, x0, y0, z0 + z_offset);
const std::array<float, 3> c100 = sample_lut_texel(image, x1, y0, z0 + z_offset);
const std::array<float, 3> c010 = sample_lut_texel(image, x0, y1, z0 + z_offset);
const std::array<float, 3> c110 = sample_lut_texel(image, x1, y1, z0 + z_offset);
const std::array<float, 3> c001 = sample_lut_texel(image, x0, y0, z1 + z_offset);
const std::array<float, 3> c101 = sample_lut_texel(image, x1, y0, z1 + z_offset);
const std::array<float, 3> c011 = sample_lut_texel(image, x0, y1, z1 + z_offset);
const std::array<float, 3> c111 = sample_lut_texel(image, x1, y1, z1 + z_offset);
const std::array<float, 3> c00 = lerp_color(c000, c100, tx);
const std::array<float, 3> c10 = lerp_color(c010, c110, tx);
const std::array<float, 3> c01 = lerp_color(c001, c101, tx);
const std::array<float, 3> c11 = lerp_color(c011, c111, tx);
const std::array<float, 3> c0 = lerp_color(c00, c10, ty);
const std::array<float, 3> c1 = lerp_color(c01, c11, ty);
return lerp_color(c0, c1, tz);
}
std::array<float, 4> color_to_pigment(const LutImage &image, const std::array<float, 3> &color)
{
const std::array<float, 3> sampled = sample_lut(image, color, 0);
std::array<float, 4> pigment {
sampled[0],
sampled[1],
sampled[2],
1.f - sampled[0] - sampled[1] - sampled[2]
};
const float total = pigment[0] + pigment[1] + pigment[2] + pigment[3];
if (total > 0.0001f) {
const float inv_total = 1.f / total;
for (float &value : pigment)
value *= inv_total;
}
return pigment;
}
std::array<float, 3> pigment_to_color(const LutImage &image, const std::array<float, 4> &pigment)
{
return sample_lut(image, { pigment[0], pigment[1], pigment[2] }, k_lut_dimen);
}
std::array<float, 3> mix_with_lut(const std::vector<std::array<float, 3>> &colors,
const std::vector<float> &weights,
const LutImage &image)
{
std::array<float, 4> mixed_pigment { 0.f, 0.f, 0.f, 0.f };
std::array<float, 3> error { 0.f, 0.f, 0.f };
float total_weight = 0.f;
for (const float weight : weights) {
if (std::isfinite(weight) && weight > 0.f)
total_weight += weight;
}
if (total_weight <= 0.f)
return colors.front();
const float inv_total_weight = 1.f / total_weight;
for (size_t idx = 0; idx < colors.size(); ++idx) {
const float raw_weight = weights[idx];
if (!std::isfinite(raw_weight) || raw_weight <= 0.f)
continue;
const float weight = raw_weight * inv_total_weight;
const std::array<float, 4> pigment = color_to_pigment(image, colors[idx]);
const std::array<float, 3> reconstructed = pigment_to_color(image, pigment);
for (size_t channel = 0; channel < 4; ++channel)
mixed_pigment[channel] += pigment[channel] * weight;
for (size_t channel = 0; channel < 3; ++channel)
error[channel] += (clamp01(colors[idx][channel]) - reconstructed[channel]) * weight;
}
const float pigment_total = mixed_pigment[0] + mixed_pigment[1] + mixed_pigment[2] + mixed_pigment[3];
if (pigment_total > 0.0001f) {
const float inv_pigment_total = 1.f / pigment_total;
for (float &value : mixed_pigment)
value *= inv_pigment_total;
}
std::array<float, 3> mixed_color = pigment_to_color(image, mixed_pigment);
for (size_t channel = 0; channel < 3; ++channel)
mixed_color[channel] = clamp01(mixed_color[channel] + error[channel]);
return mixed_color;
}
float reflectance_to_ks(float reflectance)
{
constexpr float k_min_reflectance = 0.02f;
const float r = std::clamp(reflectance, k_min_reflectance, 1.f);
return ((1.f - r) * (1.f - r)) / (2.f * r);
}
float ks_to_reflectance(float ks)
{
const float ratio = std::max(0.f, ks);
return clamp01(1.f + ratio - std::sqrt(std::max(0.f, ratio * ratio + 2.f * ratio)));
}
std::array<float, 3> mix_linear_reflectance(const std::vector<std::array<float, 3>> &colors,
const std::vector<float> &weights)
{
if (colors.empty() || colors.size() != weights.size())
return { 0.f, 0.f, 0.f };
if (const LutImage *image = lut_image(); image != nullptr)
return mix_with_lut(colors, weights, *image);
std::array<float, 3> accumulated_ks { 0.f, 0.f, 0.f };
float total_weight = 0.f;
for (size_t idx = 0; idx < colors.size(); ++idx) {
const float weight = std::max(0.f, weights[idx]);
if (!std::isfinite(weight) || weight <= 0.f)
continue;
accumulated_ks[0] += reflectance_to_ks(srgb_to_linear(colors[idx][0])) * weight;
accumulated_ks[1] += reflectance_to_ks(srgb_to_linear(colors[idx][1])) * weight;
accumulated_ks[2] += reflectance_to_ks(srgb_to_linear(colors[idx][2])) * weight;
total_weight += weight;
}
if (total_weight <= 0.f)
return colors.front();
const float inv_total = 1.f / total_weight;
return {
linear_to_srgb(ks_to_reflectance(accumulated_ks[0] * inv_total)),
linear_to_srgb(ks_to_reflectance(accumulated_ks[1] * inv_total)),
linear_to_srgb(ks_to_reflectance(accumulated_ks[2] * inv_total))
};
}
} // namespace
std::array<float, 3> mix_srgb(const std::vector<std::array<float, 3>> &colors,
const std::vector<float> &weights)
{
return mix_linear_reflectance(colors, weights);
}
std::array<float, 3> mix_srgb(const std::vector<std::array<float, 3>> &colors,
const std::vector<int> &weights)
{
std::vector<float> float_weights;
float_weights.reserve(weights.size());
for (const int weight : weights)
float_weights.emplace_back(float(std::max(0, weight)));
return mix_linear_reflectance(colors, float_weights);
}
} // namespace pigment_painter

View File

@@ -1,17 +0,0 @@
#ifndef PIGMENT_PAINTER_MIXER_HPP
#define PIGMENT_PAINTER_MIXER_HPP
#include <array>
#include <vector>
namespace pigment_painter {
std::array<float, 3> mix_srgb(const std::vector<std::array<float, 3>> &colors,
const std::vector<float> &weights);
std::array<float, 3> mix_srgb(const std::vector<std::array<float, 3>> &colors,
const std::vector<int> &weights);
} // namespace pigment_painter
#endif

View File

@@ -1,10 +0,0 @@
cmake_minimum_required(VERSION 3.13)
project(prusa_fdm_mixer)
add_library(prusa_fdm_mixer STATIC
prusa_fdm_mixer.cpp
prusa_fdm_mixer.hpp
)
target_include_directories(prusa_fdm_mixer PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
target_compile_features(prusa_fdm_mixer PUBLIC cxx_std_17)

View File

@@ -1,21 +0,0 @@
MIT License
Copyright (c) 2026 Ondrej Bartas (Prusa Research s.r.o.) and contributors
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:
The above copyright notice and this permission notice shall be included in all
copies or substantial portions of the Software.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.

View File

@@ -1,351 +0,0 @@
/*
* prusa_fdm_mixer.cpp — Implementation of the prusa-fdm-mixer color mixing model.
*
* Copyright (c) Prusa Research s.r.o.
* MIT License — see LICENSE.
*/
#include "prusa_fdm_mixer.hpp"
#include <algorithm>
#include <cmath>
#include <cstdio>
#include <stdexcept>
namespace prusa_fdm_mixer {
namespace {
constexpr double PI = 3.14159265358979323846;
/* ----------------------------------------------------------------------------
* sRGB <-> linear RGB
* -------------------------------------------------------------------------- */
inline double srgb_to_linear(double c) {
c = c / 255.0;
if (c <= 0.04045) return c / 12.92;
return std::pow((c + 0.055) / 1.055, 2.4);
}
inline double linear_to_srgb(double c) {
c = std::clamp(c, 0.0, 1.0);
double v;
if (c <= 0.0031308) v = 12.92 * c;
else v = 1.055 * std::pow(c, 1.0 / 2.4) - 0.055;
return v * 255.0;
}
/* ----------------------------------------------------------------------------
* sRGB <-> XYZ (D65)
* -------------------------------------------------------------------------- */
struct XYZ { double x, y, z; };
inline XYZ rgb_to_xyz(const RGB& rgb) {
const double r = srgb_to_linear(rgb.r);
const double g = srgb_to_linear(rgb.g);
const double b = srgb_to_linear(rgb.b);
return XYZ{
(r * 0.4124564 + g * 0.3575761 + b * 0.1804375) * 100.0,
(r * 0.2126729 + g * 0.7151522 + b * 0.0721750) * 100.0,
(r * 0.0193339 + g * 0.1191920 + b * 0.9503041) * 100.0,
};
}
inline RGB xyz_to_rgb(const XYZ& xyz) {
const double x = xyz.x / 100.0;
const double y = xyz.y / 100.0;
const double z = xyz.z / 100.0;
const double r = linear_to_srgb(x * 3.2404542 + y * -1.5371385 + z * -0.4985314);
const double g = linear_to_srgb(x * -0.9692660 + y * 1.8760108 + z * 0.0415560);
const double b = linear_to_srgb(x * 0.0556434 + y * -0.2040259 + z * 1.0572252);
auto clamp_round = [](double v) -> std::uint8_t {
const long iv = std::lround(v);
return static_cast<std::uint8_t>(std::clamp<long>(iv, 0, 255));
};
return RGB{ clamp_round(r), clamp_round(g), clamp_round(b) };
}
/* ----------------------------------------------------------------------------
* XYZ <-> CIELAB (D65)
* -------------------------------------------------------------------------- */
constexpr double XN = 95.047;
constexpr double YN = 100.0;
constexpr double ZN = 108.883;
inline double lab_f(double t) {
return (t > 0.008856) ? std::cbrt(t) : (7.787 * t + 16.0 / 116.0);
}
inline double lab_f_inv(double t) {
return (t > 0.206893) ? (t * t * t) : ((t - 16.0 / 116.0) / 7.787);
}
inline LAB xyz_to_lab(const XYZ& xyz) {
const double fx = lab_f(xyz.x / XN);
const double fy = lab_f(xyz.y / YN);
const double fz = lab_f(xyz.z / ZN);
return LAB{ 116.0 * fy - 16.0, 500.0 * (fx - fy), 200.0 * (fy - fz) };
}
inline XYZ lab_to_xyz(const LAB& lab) {
const double fy = (lab.L + 16.0) / 116.0;
const double fx = lab.a / 500.0 + fy;
const double fz = fy - lab.b / 200.0;
return XYZ{ XN * lab_f_inv(fx), YN * lab_f_inv(fy), ZN * lab_f_inv(fz) };
}
} // anonymous namespace
/* ============================================================================
* Public color-space helpers
* ============================================================================ */
RGB hex_to_rgb(const std::string& hex) {
std::string s = hex;
if (!s.empty() && s[0] == '#') s.erase(0, 1);
if (s.size() != 6) {
throw std::invalid_argument("prusa_fdm_mixer::hex_to_rgb: expected 6 hex digits, got: " + hex);
}
auto parse_byte = [&](size_t off) -> std::uint8_t {
unsigned int v = 0;
for (size_t i = 0; i < 2; ++i) {
char c = s[off + i];
unsigned int d;
if (c >= '0' && c <= '9') d = static_cast<unsigned int>(c - '0');
else if (c >= 'a' && c <= 'f') d = 10u + static_cast<unsigned int>(c - 'a');
else if (c >= 'A' && c <= 'F') d = 10u + static_cast<unsigned int>(c - 'A');
else throw std::invalid_argument("prusa_fdm_mixer::hex_to_rgb: invalid hex char in: " + hex);
v = (v << 4) | d;
}
return static_cast<std::uint8_t>(v);
};
return RGB{ parse_byte(0), parse_byte(2), parse_byte(4) };
}
std::string rgb_to_hex(const RGB& rgb) {
char buf[8];
std::snprintf(buf, sizeof(buf), "#%02x%02x%02x",
static_cast<unsigned int>(rgb.r),
static_cast<unsigned int>(rgb.g),
static_cast<unsigned int>(rgb.b));
return std::string(buf);
}
LAB rgb_to_lab(const RGB& rgb) {
return xyz_to_lab(rgb_to_xyz(rgb));
}
RGB lab_to_rgb(const LAB& lab) {
return xyz_to_rgb(lab_to_xyz(lab));
}
/* ============================================================================
* prusa-fdm-mixer model
* ============================================================================ */
namespace {
// Empirically fit constants — see companion repo for derivation.
constexpr double YN_EXPONENT = 3.0;
constexpr double L_SLOPE = -0.0477;
constexpr double L_INTERCEPT = -2.112;
constexpr double L_KINK_THRESHOLD = 15.0;
constexpr double L_KINK_SLOPE = -0.060;
constexpr double C_SLOPE = 0.2780;
constexpr double C_INTERCEPT = -15.580;
constexpr double PEAK_STRENGTH = 1.375;
constexpr double HUE_PEAK_DEG = 10.38;
constexpr double HUE_CENTER_DEG = 210.0;
constexpr double HUE_HALF_WIDTH_DEG = 30.0;
LAB predict_lab(const std::vector<Part>& parts) {
if (parts.empty()) {
throw std::invalid_argument("prusa_fdm_mixer::mix: empty parts list");
}
// ---- Gradient safety: if any single part has ratio >= ~1, return it directly. ----
// Without this guard, the constant lightness correction (-2.112 * cs) would
// perturb the predicted color even at the endpoints of a gradient.
for (const Part& p : parts) {
if (p.ratio >= 0.9999) {
return rgb_to_lab(hex_to_rgb(p.hex));
}
}
// ---- Step 1: Yule-Nielsen base prediction ----
double r_acc = 0.0, g_acc = 0.0, b_acc = 0.0;
std::vector<double> component_Ls;
component_Ls.reserve(parts.size());
const double inv_n = 1.0 / YN_EXPONENT;
for (const Part& p : parts) {
const RGB rgb = hex_to_rgb(p.hex);
const double r_lin = srgb_to_linear(rgb.r);
const double g_lin = srgb_to_linear(rgb.g);
const double b_lin = srgb_to_linear(rgb.b);
r_acc += std::pow(r_lin, inv_n) * p.ratio;
g_acc += std::pow(g_lin, inv_n) * p.ratio;
b_acc += std::pow(b_lin, inv_n) * p.ratio;
component_Ls.push_back(rgb_to_lab(rgb).L);
}
auto pow_clamped = [](double v, double exp) {
return std::pow(std::max(0.0, v), exp);
};
const double yn_r = linear_to_srgb(pow_clamped(r_acc, YN_EXPONENT));
const double yn_g = linear_to_srgb(pow_clamped(g_acc, YN_EXPONENT));
const double yn_b = linear_to_srgb(pow_clamped(b_acc, YN_EXPONENT));
auto clamp_round = [](double v) -> std::uint8_t {
const long iv = std::lround(v);
return static_cast<std::uint8_t>(std::clamp<long>(iv, 0, 255));
};
const RGB yn_rgb{ clamp_round(yn_r), clamp_round(yn_g), clamp_round(yn_b) };
const LAB base = rgb_to_lab(yn_rgb);
// ---- Bell-curve weight ----
// For N components: w = N^N * prod(ratios)
// = 1 when ratios are equal (peak correction zone)
// = 0 at any endpoint (single-component, no correction needed)
double w = 1.0;
for (const Part& p : parts) w *= p.ratio;
w *= std::pow(static_cast<double>(parts.size()),
static_cast<double>(parts.size()));
w = std::clamp(w, 0.0, 1.0);
const double cs = w * PEAK_STRENGTH;
// ---- Step 2: piecewise lightness correction ----
const double L_min = *std::min_element(component_Ls.begin(), component_Ls.end());
const double L_max = *std::max_element(component_Ls.begin(), component_Ls.end());
const double L_gap = L_max - L_min;
double L_corr = L_SLOPE * L_gap + L_INTERCEPT;
if (L_gap > L_KINK_THRESHOLD) {
L_corr += L_KINK_SLOPE * (L_gap - L_KINK_THRESHOLD);
}
L_corr *= cs;
const double L_new = base.L + L_corr;
// ---- Step 3: chroma correction ----
double a_out = base.a;
double b_out = base.b;
const double pred_C = std::hypot(base.a, base.b);
if (pred_C >= 0.01) {
const double target_dC = (C_SLOPE * L_new + C_INTERCEPT) * cs;
const double new_C = std::max(0.0, pred_C + target_dC);
const double scale = new_C / pred_C;
a_out = base.a * scale;
b_out = base.b * scale;
}
// ---- Step 4: cyan-band hue rotation ----
const double new_C_final = std::hypot(a_out, b_out);
if (new_C_final >= 1.0) {
double pred_h = std::atan2(b_out, a_out) * 180.0 / PI;
if (pred_h < 0.0) pred_h += 360.0;
double h_corr = 0.0;
if (pred_h >= HUE_CENTER_DEG - HUE_HALF_WIDTH_DEG &&
pred_h < HUE_CENTER_DEG + HUE_HALF_WIDTH_DEG) {
const double dist = std::abs(pred_h - HUE_CENTER_DEG);
const double falloff = std::max(0.0, 1.0 - dist / HUE_HALF_WIDTH_DEG);
h_corr = HUE_PEAK_DEG * falloff * w;
}
if (h_corr != 0.0) {
double new_h = std::fmod(pred_h + h_corr, 360.0);
if (new_h < 0.0) new_h += 360.0;
const double new_h_rad = new_h * PI / 180.0;
a_out = new_C_final * std::cos(new_h_rad);
b_out = new_C_final * std::sin(new_h_rad);
}
}
return LAB{ L_new, a_out, b_out };
}
} // anonymous namespace
RGB mix_rgb(const std::vector<Part>& parts) {
return lab_to_rgb(predict_lab(parts));
}
std::string mix(const std::vector<Part>& parts) {
return rgb_to_hex(mix_rgb(parts));
}
/* ============================================================================
* ΔE2000
* ============================================================================ */
double delta_e_2000(const LAB& lab1, const LAB& lab2) {
const double L1 = lab1.L, a1 = lab1.a, b1 = lab1.b;
const double L2 = lab2.L, a2 = lab2.a, b2 = lab2.b;
const double avg_L = (L1 + L2) / 2.0;
const double C1 = std::hypot(a1, b1);
const double C2 = std::hypot(a2, b2);
const double avg_C = (C1 + C2) / 2.0;
const double avg_C7 = std::pow(avg_C, 7.0);
const double pow25_7 = std::pow(25.0, 7.0);
const double G = 0.5 * (1.0 - std::sqrt(avg_C7 / (avg_C7 + pow25_7)));
const double a1p = a1 * (1.0 + G);
const double a2p = a2 * (1.0 + G);
const double C1p = std::hypot(a1p, b1);
const double C2p = std::hypot(a2p, b2);
const double avg_Cp = (C1p + C2p) / 2.0;
auto deg = [](double x) {
double d = x * 180.0 / PI;
if (d < 0.0) d += 360.0;
return d;
};
const double h1p = deg(std::atan2(b1, a1p));
const double h2p = deg(std::atan2(b2, a2p));
double dHp_diff = h2p - h1p;
double dhp = 0.0;
if (C1p * C2p != 0.0) {
if (std::abs(dHp_diff) <= 180.0) dhp = dHp_diff;
else if (dHp_diff > 180.0) dhp = dHp_diff - 360.0;
else dhp = dHp_diff + 360.0;
}
double avg_Hp;
if (C1p * C2p == 0.0) avg_Hp = h1p + h2p;
else if (std::abs(h1p - h2p) <= 180.0) avg_Hp = (h1p + h2p) / 2.0;
else if (h1p + h2p < 360.0) avg_Hp = (h1p + h2p + 360.0) / 2.0;
else avg_Hp = (h1p + h2p - 360.0) / 2.0;
const double T = 1.0
- 0.17 * std::cos((avg_Hp - 30.0) * PI / 180.0)
+ 0.24 * std::cos((2.0 * avg_Hp) * PI / 180.0)
+ 0.32 * std::cos((3.0 * avg_Hp + 6.0) * PI / 180.0)
- 0.20 * std::cos((4.0 * avg_Hp - 63.0) * PI / 180.0);
const double dLp = L2 - L1;
const double dCp = C2p - C1p;
const double dHpFinal = 2.0 * std::sqrt(C1p * C2p) * std::sin(dhp * PI / 360.0);
const double SL = 1.0 + (0.015 * std::pow(avg_L - 50.0, 2.0))
/ std::sqrt(20.0 + std::pow(avg_L - 50.0, 2.0));
const double SC = 1.0 + 0.045 * avg_Cp;
const double SH = 1.0 + 0.015 * avg_Cp * T;
const double dTheta = 30.0 * std::exp(-std::pow((avg_Hp - 275.0) / 25.0, 2.0));
const double avg_Cp7 = std::pow(avg_Cp, 7.0);
const double RC = 2.0 * std::sqrt(avg_Cp7 / (avg_Cp7 + pow25_7));
const double RT = -RC * std::sin(2.0 * dTheta * PI / 180.0);
return std::sqrt(
std::pow(dLp / SL, 2.0) +
std::pow(dCp / SC, 2.0) +
std::pow(dHpFinal / SH, 2.0) +
RT * (dCp / SC) * (dHpFinal / SH)
);
}
} // namespace prusa_fdm_mixer

View File

@@ -1,99 +0,0 @@
/*
* prusa_fdm_mixer.hpp — Predicts the apparent color of FDM filament mixes.
*
* The prusa-fdm-mixer model, calibrated against measured prints. Produces
* predictions with a median ΔE2000 of ~5.7 against real samples
* (Linear RGB ~14.5 for comparison).
*
* Drop-in usage in PrusaSlicer / OrcaSlicer / any C++17 project:
*
* #include "prusa_fdm_mixer.hpp"
*
* std::vector<prusa_fdm_mixer::Part> parts = {
* { "#007a9d", 0.75 }, // 75% azure blue
* { "#f6b921", 0.25 }, // 25% yellow
* };
* std::string mixed_hex = prusa_fdm_mixer::mix(parts);
* // mixed_hex == "#XXXXXX" — predicted apparent color
*
* Properties:
* - Gradient-safe: a part with ratio 1.0 returns that part's hex exactly.
* - Smooth: small ratio changes produce small color changes.
* - Works for 2 or 3+ components; ratios should sum to 1.
*
* No external dependencies beyond the C++ standard library.
*
* Copyright (c) Prusa Research s.r.o.
* MIT License — see LICENSE.
*/
#ifndef PRUSA_FDM_MIXER_HPP
#define PRUSA_FDM_MIXER_HPP
#include <array>
#include <cstdint>
#include <string>
#include <vector>
namespace prusa_fdm_mixer {
/** A single filament component in a mix. */
struct Part {
/** 6-digit hex color including leading '#', e.g. "#aabbcc". */
std::string hex;
/** Mixing ratio in [0, 1]. Ratios across all parts should sum to 1. */
double ratio;
};
/** RGB triple, channel values in [0, 255]. */
struct RGB {
std::uint8_t r;
std::uint8_t g;
std::uint8_t b;
};
/** CIELAB triple — L in [0, 100], a/b unbounded but typically [-128, 127]. */
struct LAB {
double L;
double a;
double b;
};
/* ============================================================================
* Public API
* ============================================================================ */
/**
* Predict the apparent color when filaments are mixed in the given ratios.
* @param parts Two or more parts; ratios should sum to ~1.
* @return Predicted hex color, e.g. "#aabbcc".
*/
std::string mix(const std::vector<Part>& parts);
/**
* Same as mix() but returns an RGB struct.
*/
RGB mix_rgb(const std::vector<Part>& parts);
/* ============================================================================
* Color-space conversions (exposed for callers who want them)
* ============================================================================ */
/** Parse a "#rrggbb" hex string. Throws std::invalid_argument on bad input. */
RGB hex_to_rgb(const std::string& hex);
/** Format an RGB as "#rrggbb" lowercase. */
std::string rgb_to_hex(const RGB& rgb);
/** Convert sRGB (0-255 channels) to CIELAB (D65 white point). */
LAB rgb_to_lab(const RGB& rgb);
/** Convert CIELAB (D65 white point) back to sRGB (0-255 channels, clamped). */
RGB lab_to_rgb(const LAB& lab);
/** ΔE2000 perceptual color difference between two LAB colors. */
double delta_e_2000(const LAB& lab1, const LAB& lab2);
} // namespace prusa_fdm_mixer
#endif // PRUSA_FDM_MIXER_HPP

View File

@@ -1,8 +0,0 @@
add_library(tinygltf_v3 STATIC tiny_gltf_v3.c)
target_include_directories(tinygltf_v3 PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
set_target_properties(tinygltf_v3 PROPERTIES
C_STANDARD 11
C_STANDARD_REQUIRED ON
)

View File

@@ -1,21 +0,0 @@
MIT License
Copyright (c) 2017 Syoyo Fujita, Aurélien Chatelain and many contributors
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:
The above copyright notice and this permission notice shall be included in all
copies or substantial portions of the Software.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

View File

@@ -5638,7 +5638,7 @@ msgstr ""
msgid "Save current project as"
msgstr ""
msgid "Import 3MF/STL/STEP/SVG/OBJ/GLTF/GLB/AMF"
msgid "Import 3MF/STL/STEP/SVG/OBJ/AMF"
msgstr ""
msgid "Load a model"

View File

@@ -6126,8 +6126,8 @@ msgstr "Desa el projecte com a"
msgid "Save current project as"
msgstr "Desar el projecte actual com"
msgid "Import 3MF/STL/STEP/SVG/OBJ/GLTF/GLB/AMF"
msgstr "Importar 3MF STL/STEP/SVG/OBJ/GLTF/GLB/AMF"
msgid "Import 3MF/STL/STEP/SVG/OBJ/AMF"
msgstr "Importar 3MF STL/STEP/SVG/OBJ/AMF"
msgid "Load a model"
msgstr "Carregar un model"

View File

@@ -6048,8 +6048,8 @@ msgstr "Uložit projekt jako"
msgid "Save current project as"
msgstr "Uložit aktuální projekt jako"
msgid "Import 3MF/STL/STEP/SVG/OBJ/GLTF/GLB/AMF"
msgstr "Importovat 3MF/STL/STEP/SVG/OBJ/GLTF/GLB/AMF"
msgid "Import 3MF/STL/STEP/SVG/OBJ/AMF"
msgstr "Importovat 3MF/STL/STEP/SVG/OBJ/AMF"
msgid "Load a model"
msgstr "Načíst model"

View File

@@ -6219,8 +6219,8 @@ msgstr "Projekt speichern als"
msgid "Save current project as"
msgstr "Aktuelles Projekt speichern als"
msgid "Import 3MF/STL/STEP/SVG/OBJ/GLTF/GLB/AMF"
msgstr "Importiere 3MF/STL/STEP/SVG/OBJ/GLTF/GLB/AMF"
msgid "Import 3MF/STL/STEP/SVG/OBJ/AMF"
msgstr "Importiere 3MF/STL/STEP/SVG/OBJ/AMF"
msgid "Load a model"
msgstr "Lade ein Modell"

View File

@@ -5695,7 +5695,7 @@ msgstr ""
msgid "Save current project as"
msgstr ""
msgid "Import 3MF/STL/STEP/SVG/OBJ/GLTF/GLB/AMF"
msgid "Import 3MF/STL/STEP/SVG/OBJ/AMF"
msgstr ""
msgid "Load a model"

View File

@@ -6206,8 +6206,8 @@ msgstr "Guardar proyecto como"
msgid "Save current project as"
msgstr "Guardar el proyecto actual como"
msgid "Import 3MF/STL/STEP/SVG/OBJ/GLTF/GLB/AMF"
msgstr "Importar 3MF/STL/STEP/SVG/OBJ/GLTF/GLB/AMF"
msgid "Import 3MF/STL/STEP/SVG/OBJ/AMF"
msgstr "Importar 3MF/STL/STEP/SVG/OBJ/AMF"
msgid "Load a model"
msgstr "Cargar un modelo"

View File

@@ -6227,8 +6227,8 @@ msgstr "Enregistrer le projet sous"
msgid "Save current project as"
msgstr "Enregistrer le projet actuel sous"
msgid "Import 3MF/STL/STEP/SVG/OBJ/GLTF/GLB/AMF"
msgstr "Importer des fichiers 3MF/STL/STEP/SVG/OBJ/GLTF/GLB/AMF"
msgid "Import 3MF/STL/STEP/SVG/OBJ/AMF"
msgstr "Importer des fichiers 3MF/STL/STEP/SVG/OBJ/AMF"
msgid "Load a model"
msgstr "Charger un modèle"

View File

@@ -6124,8 +6124,8 @@ msgstr "Projekt mentése másként"
msgid "Save current project as"
msgstr "Jelenlegi projekt mentése másként"
msgid "Import 3MF/STL/STEP/SVG/OBJ/GLTF/GLB/AMF"
msgstr "Importálás 3MF/STL/STEP/SVG/OBJ/GLTF/GLB/AMF"
msgid "Import 3MF/STL/STEP/SVG/OBJ/AMF"
msgstr "Importálás 3MF/STL/STEP/SVG/OBJ/AMF"
msgid "Load a model"
msgstr "Modell betöltése"

View File

@@ -6179,8 +6179,8 @@ msgstr "Salva progetto con nome"
msgid "Save current project as"
msgstr "Salva progetto corrente con nome"
msgid "Import 3MF/STL/STEP/SVG/OBJ/GLTF/GLB/AMF"
msgstr "Importa 3MF/STL/STEP/SVG/OBJ/GLTF/GLB/AMF"
msgid "Import 3MF/STL/STEP/SVG/OBJ/AMF"
msgstr "Importa 3MF/STL/STEP/SVG/OBJ/AMF"
msgid "Load a model"
msgstr "Carica modello"

View File

@@ -5981,8 +5981,8 @@ msgstr "プロジェクトを名前を付けて保存"
msgid "Save current project as"
msgstr "プロジェクトを名前を付けて保存"
msgid "Import 3MF/STL/STEP/SVG/OBJ/GLTF/GLB/AMF"
msgstr "3MF/STL/STEP/SVG/OBJ/GLTF/GLB/AMFをインポート"
msgid "Import 3MF/STL/STEP/SVG/OBJ/AMF"
msgstr "3MF/STL/STEP/SVG/OBJ/AMFをインポート"
msgid "Load a model"
msgstr "モデルを読み込む"

View File

@@ -5959,8 +5959,8 @@ msgstr "프로젝트 다른 이름으로 저장"
msgid "Save current project as"
msgstr "현재 프로젝트 다른 이름으로 저장"
msgid "Import 3MF/STL/STEP/SVG/OBJ/GLTF/GLB/AMF"
msgstr "3MF/STL/STEP/SVG/OBJ/GLTF/GLB/AMF 가져오기"
msgid "Import 3MF/STL/STEP/SVG/OBJ/AMF"
msgstr "3MF/STL/STEP/SVG/OBJ/AMF 가져오기"
msgid "Load a model"
msgstr "모델 불러오기"

View File

@@ -6085,8 +6085,8 @@ msgstr "Išsaugoti projektą kaip"
msgid "Save current project as"
msgstr "Išsaugoti dabartinį projektą kaip"
msgid "Import 3MF/STL/STEP/SVG/OBJ/GLTF/GLB/AMF"
msgstr "Importuoti 3MF/STL/STEP/SVG/OBJ/GLTF/GLB/AMF"
msgid "Import 3MF/STL/STEP/SVG/OBJ/AMF"
msgstr "Importuoti 3MF/STL/STEP/SVG/OBJ/AMF"
msgid "Load a model"
msgstr "Įkelti modelį"

View File

@@ -6072,8 +6072,8 @@ msgstr "Bewaar project als"
msgid "Save current project as"
msgstr "Bewaar huidig project als"
msgid "Import 3MF/STL/STEP/SVG/OBJ/GLTF/GLB/AMF"
msgstr "3MF/STL/STEP/SVG/OBJ/GLTF/GLB/AMF importeren"
msgid "Import 3MF/STL/STEP/SVG/OBJ/AMF"
msgstr "3MF/STL/STEP/SVG/OBJ/AMF importeren"
msgid "Load a model"
msgstr "Laad een model"

View File

@@ -6043,8 +6043,8 @@ msgstr "Zapisz projekt jako"
msgid "Save current project as"
msgstr "Zapisz bieżący projekt jako"
msgid "Import 3MF/STL/STEP/SVG/OBJ/GLTF/GLB/AMF"
msgstr "Importuj 3MF/STL/STEP/SVG/OBJ/GLTF/GLB/AMF"
msgid "Import 3MF/STL/STEP/SVG/OBJ/AMF"
msgstr "Importuj 3MF/STL/STEP/SVG/OBJ/AMF"
msgid "Load a model"
msgstr "Wczytaj model"

View File

@@ -6143,8 +6143,8 @@ msgstr "Salvar projeto como"
msgid "Save current project as"
msgstr "Salvar o projeto atual como"
msgid "Import 3MF/STL/STEP/SVG/OBJ/GLTF/GLB/AMF"
msgstr "Importar 3MF/STL/STEP/SVG/OBJ/GLTF/GLB/AMF"
msgid "Import 3MF/STL/STEP/SVG/OBJ/AMF"
msgstr "Importar 3MF/STL/STEP/SVG/OBJ/AMF"
msgid "Load a model"
msgstr "Carregar um modelo"

View File

@@ -6265,8 +6265,8 @@ msgstr "Сохранить проект как"
msgid "Save current project as"
msgstr "Сохранить текущий проект как"
msgid "Import 3MF/STL/STEP/SVG/OBJ/GLTF/GLB/AMF"
msgstr "Импорт 3MF/STL/STEP/SVG/OBJ/GLTF/GLB/AMF"
msgid "Import 3MF/STL/STEP/SVG/OBJ/AMF"
msgstr "Импорт 3MF/STL/STEP/SVG/OBJ/AMF"
msgid "Load a model"
msgstr "Загрузка модели"

View File

@@ -6041,8 +6041,8 @@ msgstr "Spara Projekt som"
msgid "Save current project as"
msgstr "Spara nuvarande projekt som"
msgid "Import 3MF/STL/STEP/SVG/OBJ/GLTF/GLB/AMF"
msgstr "Importera 3MF/STL/STEP/SVG/OBJ/GLTF/GLB/AMF"
msgid "Import 3MF/STL/STEP/SVG/OBJ/AMF"
msgstr "Importera 3MF/STL/STEP/SVG/OBJ/AMF"
msgid "Load a model"
msgstr "Ladda modell"

View File

@@ -6062,8 +6062,8 @@ msgstr "Projeyi farklı kaydet"
msgid "Save current project as"
msgstr "Mevcut projeyi farklı kaydet"
msgid "Import 3MF/STL/STEP/SVG/OBJ/GLTF/GLB/AMF"
msgstr "3MF/STL/STEP/SVG/OBJ/GLTF/GLB/AMF'yi içe aktar"
msgid "Import 3MF/STL/STEP/SVG/OBJ/AMF"
msgstr "3MF/STL/STEP/SVG/OBJ/AMF'yi içe aktar"
msgid "Load a model"
msgstr "Model yükle"

View File

@@ -5950,8 +5950,8 @@ msgstr "Зберегти проєкт як"
msgid "Save current project as"
msgstr "Зберегти поточний проєкт як"
msgid "Import 3MF/STL/STEP/SVG/OBJ/GLTF/GLB/AMF"
msgstr "Імпорт 3MF/STL/STEP/SVG/OBJ/GLTF/GLB/AMF"
msgid "Import 3MF/STL/STEP/SVG/OBJ/AMF"
msgstr "Імпорт 3MF/STL/STEP/SVG/OBJ/AMF"
msgid "Load a model"
msgstr "Завантажте модель"

View File

@@ -6003,8 +6003,8 @@ msgstr "Lưu dự án thành"
msgid "Save current project as"
msgstr "Lưu dự án hiện tại thành"
msgid "Import 3MF/STL/STEP/SVG/OBJ/GLTF/GLB/AMF"
msgstr "Nhập 3MF/STL/STEP/SVG/OBJ/GLTF/GLB/AMF"
msgid "Import 3MF/STL/STEP/SVG/OBJ/AMF"
msgstr "Nhập 3MF/STL/STEP/SVG/OBJ/AMF"
msgid "Load a model"
msgstr "Tải model"

View File

@@ -5848,8 +5848,8 @@ msgstr "项目另存为"
msgid "Save current project as"
msgstr "项目另存为"
msgid "Import 3MF/STL/STEP/SVG/OBJ/GLTF/GLB/AMF"
msgstr "导入 3MF/STL/STEP/SVG/OBJ/GLTF/GLB/AMF"
msgid "Import 3MF/STL/STEP/SVG/OBJ/AMF"
msgstr "导入 3MF/STL/STEP/SVG/OBJ/AMF"
msgid "Load a model"
msgstr "加载模型"

View File

@@ -5916,8 +5916,8 @@ msgstr "另存專案為"
msgid "Save current project as"
msgstr "將目前專案另存為"
msgid "Import 3MF/STL/STEP/SVG/OBJ/GLTF/GLB/AMF"
msgstr "匯入 3MF/STL/STEP/SVG/OBJ/GLTF/GLB/AMF"
msgid "Import 3MF/STL/STEP/SVG/OBJ/AMF"
msgstr "匯入 3MF/STL/STEP/SVG/OBJ/AMF"
msgid "Load a model"
msgstr "載入模型"

Binary file not shown.

Before

Width:  |  Height:  |  Size: 46 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 46 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 46 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 28 KiB

View File

@@ -1,61 +0,0 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<svg
width="40"
height="40"
viewBox="0 0 40 40"
version="1.1"
id="svg17"
sodipodi:docname="image_projection.svg"
inkscape:version="1.4.3 (0d15f75, 2025-12-25)"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns="http://www.w3.org/2000/svg"
xmlns:svg="http://www.w3.org/2000/svg">
<sodipodi:namedview
id="namedview1"
pagecolor="#ffffff"
bordercolor="#000000"
borderopacity="0.25"
inkscape:showpageshadow="2"
inkscape:pageopacity="0.0"
inkscape:pagecheckerboard="0"
inkscape:deskcolor="#d1d1d1"
inkscape:zoom="8.1972734"
inkscape:cx="25.374291"
inkscape:cy="23.971385"
inkscape:window-width="1135"
inkscape:window-height="616"
inkscape:window-x="555"
inkscape:window-y="322"
inkscape:window-maximized="0"
inkscape:current-layer="svg17" />
<defs
id="defs17" />
<rect
style="fill:#77d1ff;fill-opacity:1;stroke:#2b3436;stroke-opacity:1"
id="rect20"
width="19.864098"
height="14.551606"
x="3.9266238"
y="5.0815129" />
<path
style="fill:none;fill-opacity:1;stroke:#2b3436;stroke-opacity:1"
d="m 26.446966,11.89536 v 17.136303 l 8.376353,4.936095 0.05434,-17.914796 z"
id="path20"
sodipodi:nodetypes="ccccc" />
<path
style="fill:#ffffff;fill-opacity:1;stroke:none;stroke-opacity:1"
d="m 5.9484579,16.541602 4.1557721,-6.192915 3.748343,6.274401 3.422401,-3.748343 3.177943,3.829829 z"
id="path22" />
<path
style="fill:#17eac5;fill-opacity:1;stroke:#2b3436;stroke-opacity:1"
d="M 25.535042,12.035433 8.0178771,22.738372 8.0539714,38.543239 25.595623,28.782985 Z"
id="path21"
sodipodi:nodetypes="ccccc" />
<circle
style="fill:#fcff00;fill-opacity:1;stroke:none;stroke-opacity:1"
id="path23"
cx="16.94903"
cy="9.0449152"
r="3.259429" />
</svg>

Before

Width:  |  Height:  |  Size: 2.0 KiB

View File

@@ -1,61 +0,0 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<svg
width="40"
height="40"
viewBox="0 0 40 40"
version="1.1"
id="svg17"
sodipodi:docname="image_projection_dark.svg"
inkscape:version="1.4.3 (0d15f75, 2025-12-25)"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns="http://www.w3.org/2000/svg"
xmlns:svg="http://www.w3.org/2000/svg">
<sodipodi:namedview
id="namedview1"
pagecolor="#ffffff"
bordercolor="#000000"
borderopacity="0.25"
inkscape:showpageshadow="2"
inkscape:pageopacity="0.0"
inkscape:pagecheckerboard="0"
inkscape:deskcolor="#d1d1d1"
inkscape:zoom="8.1972734"
inkscape:cx="25.374291"
inkscape:cy="23.971385"
inkscape:window-width="1135"
inkscape:window-height="616"
inkscape:window-x="555"
inkscape:window-y="322"
inkscape:window-maximized="0"
inkscape:current-layer="svg17" />
<defs
id="defs17" />
<rect
style="fill:#77d1ff;fill-opacity:1;stroke:#b6b6b6;stroke-opacity:1"
id="rect20"
width="19.864098"
height="14.551606"
x="3.9266238"
y="5.0815129" />
<path
style="fill:none;fill-opacity:1;stroke:#b6b6b6;stroke-opacity:1"
d="m 26.446966,11.89536 v 17.136303 l 8.376353,4.936095 0.05434,-17.914796 z"
id="path20"
sodipodi:nodetypes="ccccc" />
<path
style="fill:#ffffff;fill-opacity:1;stroke:none;stroke-opacity:1"
d="m 5.9484579,16.541602 4.1557721,-6.192915 3.748343,6.274401 3.422401,-3.748343 3.177943,3.829829 z"
id="path22" />
<path
style="fill:#17eac5;fill-opacity:1;stroke:#b6b6b6;stroke-opacity:1"
d="M 25.535042,12.035433 8.0178771,22.738372 8.0539714,38.543239 25.595623,28.782985 Z"
id="path21"
sodipodi:nodetypes="ccccc" />
<circle
style="fill:#fcff00;fill-opacity:1;stroke:none;stroke-opacity:1"
id="path23"
cx="16.94903"
cy="9.0449152"
r="3.259429" />
</svg>

Before

Width:  |  Height:  |  Size: 2.0 KiB

View File

@@ -1,89 +0,0 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<svg
width="40"
height="40"
viewBox="0 0 40 40"
version="1.1"
id="svg17"
sodipodi:docname="true_color_painting.svg"
inkscape:version="1.4.3 (0d15f75, 2025-12-25)"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns="http://www.w3.org/2000/svg"
xmlns:svg="http://www.w3.org/2000/svg">
<sodipodi:namedview
id="namedview1"
pagecolor="#ffffff"
bordercolor="#000000"
borderopacity="0.25"
inkscape:showpageshadow="2"
inkscape:pageopacity="0.0"
inkscape:pagecheckerboard="0"
inkscape:deskcolor="#d1d1d1"
inkscape:zoom="11.115146"
inkscape:cx="25.460755"
inkscape:cy="19.657862"
inkscape:window-width="1219"
inkscape:window-height="718"
inkscape:window-x="447"
inkscape:window-y="116"
inkscape:window-maximized="0"
inkscape:current-layer="svg17"
showguides="true">
<sodipodi:guide
position="55.149975,1.2240794"
orientation="0,-1"
id="guide1"
inkscape:locked="false" />
</sodipodi:namedview>
<defs
id="defs17" />
<path
d="M27.878,34.926h-4.4c-.509,0-.845,0-.955-.394a.593.593,0,0,1,.36-.67,2.3,2.3,0,0,0,1.2-2.189,3.253,3.253,0,1,1,3.8,3.206Zm-3.538-1h2.988a2.253,2.253,0,1,0-2.253-2.253A3.445,3.445,0,0,1,24.34,33.926Z"
style="fill:#009688"
id="path1" />
<path
d="m 30.5,30.289 -0.846,-0.535 4.364,-6.9 a 0.222,0.222 0 0 0 -0.36,-0.258 l -5.4,6.644 -0.776,-0.631 5.4,-6.644 a 1.222,1.222 0 0 1 1.982,1.423 z"
style="fill:#009688"
id="path2" />
<path
d="M33.5,35h-1a.5.5,0,0,1,0-1h1a.5.5,0,0,0,.5-.5v-5a.5.5,0,0,1,1,0v5A1.5,1.5,0,0,1,33.5,35Z"
style="fill:#2b3436"
id="path3" />
<path
d="M19.5,35H5.5A1.5,1.5,0,0,1,4,33.5V5.5A1.5,1.5,0,0,1,5.5,4h28A1.5,1.5,0,0,1,35,5.5v13a.5.5,0,0,1-1,0V5.5a.5.5,0,0,0-.5-.5H5.5a.5.5,0,0,0-.5.5v28a.5.5,0,0,0,.5.5h14a.5.5,0,0,1,0,1Z"
style="fill:#2b3436"
id="path4" />
<path
style="fill:none;stroke:#2b3436;stroke-opacity:1"
d="m 8.4562867,23.400587 c 0,0 2.2252913,-19.4227297 14.8714013,-14.7256034 12.757329,4.7384364 6.050618,16.8396744 2.91596,13.1218244 -3.134658,-3.717851 -5.467426,-0.874789 -5.467426,-0.874789 0,0 -2.529885,2.814818 0.364495,5.613225 2.151955,2.0806 -1.057336,4.314407 -2.734014,4.606003 -1.676677,0.291596 -8.7840319,1.444616 -9.5859212,-0.08626 -0.8018892,-1.53088 -0.3644951,-7.654397 -0.3644951,-7.654397 z"
id="path17" />
<ellipse
style="fill:#3297ff;fill-opacity:1;stroke:none;stroke-width:1.31579;stroke-opacity:1"
id="path18"
cx="20.280308"
cy="12.027146"
rx="1.7120823"
ry="1.7583548" />
<ellipse
style="fill:#f7ff0d;fill-opacity:1;stroke:none;stroke-width:1.31579;stroke-opacity:1"
id="ellipse18"
cx="15.427248"
cy="15.754859"
rx="1.7120823"
ry="1.7583548" />
<ellipse
style="fill:#ff0d0d;fill-opacity:1;stroke:none;stroke-width:1.31579;stroke-opacity:1"
id="ellipse19"
cx="12.402879"
cy="21.240925"
rx="1.7120823"
ry="1.7583548" />
<ellipse
style="fill:#0dff24;fill-opacity:1;stroke:none;stroke-width:1.31579;stroke-opacity:1"
id="ellipse20"
cx="12.051207"
cy="27.571003"
rx="1.7120823"
ry="1.7583548" />
</svg>

Before

Width:  |  Height:  |  Size: 3.3 KiB

View File

@@ -1,82 +0,0 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<svg
width="40"
height="40"
viewBox="0 0 40 40"
version="1.1"
id="svg17"
sodipodi:docname="true_color_painting_dark.svg"
inkscape:version="1.4.3 (0d15f75, 2025-12-25)"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns="http://www.w3.org/2000/svg"
xmlns:svg="http://www.w3.org/2000/svg">
<sodipodi:namedview
id="namedview1"
pagecolor="#ffffff"
bordercolor="#000000"
borderopacity="0.25"
inkscape:showpageshadow="2"
inkscape:pageopacity="0.0"
inkscape:pagecheckerboard="0"
inkscape:deskcolor="#d1d1d1"
inkscape:zoom="10.121314"
inkscape:cx="22.872525"
inkscape:cy="18.278259"
inkscape:window-width="1192"
inkscape:window-height="701"
inkscape:window-x="170"
inkscape:window-y="295"
inkscape:window-maximized="0"
inkscape:current-layer="svg17" />
<defs
id="defs17" />
<path
d="M27.878,34.926h-4.4c-.509,0-.845,0-.955-.394a.593.593,0,0,1,.36-.67,2.3,2.3,0,0,0,1.2-2.189,3.253,3.253,0,1,1,3.8,3.206Zm-3.538-1h2.988a2.253,2.253,0,1,0-2.253-2.253A3.445,3.445,0,0,1,24.34,33.926Z"
style="fill:#009688"
id="path1" />
<path
d="m 30.5,30.289 -0.846,-0.535 4.364,-6.9 a 0.222,0.222 0 0 0 -0.36,-0.258 l -5.4,6.644 -0.776,-0.631 5.4,-6.644 a 1.222,1.222 0 0 1 1.982,1.423 z"
style="fill:#009688"
id="path2" />
<path
d="M33.5,35h-1a.5.5,0,0,1,0-1h1a.5.5,0,0,0,.5-.5v-5a.5.5,0,0,1,1,0v5A1.5,1.5,0,0,1,33.5,35Z"
style="fill:#b6b6b6;fill-opacity:1"
id="path3" />
<path
d="M19.5,35H5.5A1.5,1.5,0,0,1,4,33.5V5.5A1.5,1.5,0,0,1,5.5,4h28A1.5,1.5,0,0,1,35,5.5v13a.5.5,0,0,1-1,0V5.5a.5.5,0,0,0-.5-.5H5.5a.5.5,0,0,0-.5.5v28a.5.5,0,0,0,.5.5h14a.5.5,0,0,1,0,1Z"
style="fill:#b6b6b6;fill-opacity:1"
id="path4" />
<path
style="fill:none;stroke:#b6b6b6;stroke-opacity:0.90588236"
d="m 8.4562867,23.400587 c 0,0 2.2252913,-19.4227297 14.8714013,-14.7256034 12.757329,4.7384364 6.050618,16.8396744 2.91596,13.1218244 -3.134658,-3.717851 -5.467426,-0.874789 -5.467426,-0.874789 0,0 -2.529885,2.814818 0.364495,5.613225 2.151955,2.0806 -1.057336,4.314407 -2.734014,4.606003 -1.676677,0.291596 -8.7840319,1.444616 -9.5859212,-0.08626 -0.8018892,-1.53088 -0.3644951,-7.654397 -0.3644951,-7.654397 z"
id="path17" />
<ellipse
style="fill:#3297ff;fill-opacity:1;stroke:none;stroke-width:1.31579;stroke-opacity:1"
id="path18"
cx="20.280308"
cy="12.027146"
rx="1.7120823"
ry="1.7583548" />
<ellipse
style="fill:#f7ff0d;fill-opacity:1;stroke:none;stroke-width:1.31579;stroke-opacity:1"
id="ellipse18"
cx="15.427248"
cy="15.754859"
rx="1.7120823"
ry="1.7583548" />
<ellipse
style="fill:#ff0d0d;fill-opacity:1;stroke:none;stroke-width:1.31579;stroke-opacity:1"
id="ellipse19"
cx="12.402879"
cy="21.240925"
rx="1.7120823"
ry="1.7583548" />
<ellipse
style="fill:#0dff24;fill-opacity:1;stroke:none;stroke-width:1.31579;stroke-opacity:1"
id="ellipse20"
cx="12.051207"
cy="27.571003"
rx="1.7120823"
ry="1.7583548" />
</svg>

Before

Width:  |  Height:  |  Size: 3.2 KiB

View File

@@ -1,6 +1,6 @@
{
"name": "Afinia",
"version": "02.04.00.02",
"version": "02.04.00.01",
"force_update": "0",
"description": "Afinia configurations",
"machine_model_list": [
@@ -124,6 +124,14 @@
"name": "fdm_filament_tpu",
"sub_path": "filament/fdm_filament_tpu.json"
},
{
"name": "Afinia ABS",
"sub_path": "filament/Afinia ABS.json"
},
{
"name": "Afinia ABS+",
"sub_path": "filament/Afinia ABS+.json"
},
{
"name": "Afinia ABS+@HS",
"sub_path": "filament/Afinia ABS+@HS.json"
@@ -132,18 +140,34 @@
"name": "Afinia ABS@HS",
"sub_path": "filament/Afinia ABS@HS.json"
},
{
"name": "Afinia Value ABS",
"sub_path": "filament/Afinia Value ABS.json"
},
{
"name": "Afinia Value ABS@HS",
"sub_path": "filament/Afinia Value ABS@HS.json"
},
{
"name": "Afinia PLA",
"sub_path": "filament/Afinia PLA.json"
},
{
"name": "Afinia PLA@HS",
"sub_path": "filament/Afinia PLA@HS.json"
},
{
"name": "Afinia Value PLA",
"sub_path": "filament/Afinia Value PLA.json"
},
{
"name": "Afinia Value PLA@HS",
"sub_path": "filament/Afinia Value PLA@HS.json"
},
{
"name": "Afinia TPU",
"sub_path": "filament/Afinia TPU.json"
},
{
"name": "Afinia TPU@HS",
"sub_path": "filament/Afinia TPU@HS.json"

View File

@@ -0,0 +1,37 @@
{
"type": "filament",
"filament_id": "GFB00",
"setting_id": "i5tf9foHnTVNmA2r",
"name": "Afinia ABS+",
"from": "system",
"instantiation": "true",
"inherits": "fdm_filament_abs",
"filament_flow_ratio": [
"0.95"
],
"filament_cost": [
"24.99"
],
"filament_vendor": [
"Afinia"
],
"fan_max_speed": [
"60"
],
"filament_max_volumetric_speed": [
"16"
],
"nozzle_temperature": [
"275"
],
"nozzle_temperature_initial_layer": [
"275"
],
"slow_down_layer_time": [
"12"
],
"compatible_printers": [
"Afinia H400 Pro 0.4 nozzle",
"Afinia H400 Pro 0.6 nozzle"
]
}

View File

@@ -0,0 +1,31 @@
{
"type": "filament",
"filament_id": "GFB00",
"setting_id": "LhDHvMepbh8ecfQT",
"name": "Afinia ABS",
"from": "system",
"instantiation": "true",
"inherits": "fdm_filament_abs",
"filament_flow_ratio": [
"0.95"
],
"filament_cost": [
"24.99"
],
"filament_vendor": [
"Afinia"
],
"fan_max_speed": [
"60"
],
"filament_max_volumetric_speed": [
"16"
],
"slow_down_layer_time": [
"12"
],
"compatible_printers": [
"Afinia H400 Pro 0.4 nozzle",
"Afinia H400 Pro 0.6 nozzle"
]
}

View File

@@ -0,0 +1,34 @@
{
"type": "filament",
"filament_id": "GFA00",
"setting_id": "1qEFsay7kjYIUkpG",
"name": "Afinia PLA",
"from": "system",
"instantiation": "true",
"inherits": "fdm_filament_pla",
"filament_cost": [
"24.99"
],
"filament_density": [
"1.26"
],
"filament_flow_ratio": [
"0.98"
],
"filament_max_volumetric_speed": [
"21"
],
"filament_vendor": [
"Afinia"
],
"filament_long_retractions_when_cut": [
"1"
],
"filament_retraction_distances_when_cut": [
"18"
],
"compatible_printers": [
"Afinia H400 Pro 0.4 nozzle",
"Afinia H400 Pro 0.6 nozzle"
]
}

View File

@@ -0,0 +1,28 @@
{
"type": "filament",
"name": "Afinia TPU",
"inherits": "fdm_filament_tpu",
"from": "system",
"setting_id": "E7WBTARZ971LaDMj",
"filament_id": "GFU01",
"instantiation": "true",
"filament_vendor": [
"Afinia"
],
"filament_density": [
"1.22"
],
"nozzle_temperature_initial_layer": [
"230"
],
"filament_cost": [
"41.99"
],
"nozzle_temperature": [
"230"
],
"compatible_printers": [
"Afinia H400 Pro 0.4 nozzle",
"Afinia H400 Pro 0.6 nozzle"
]
}

View File

@@ -0,0 +1,37 @@
{
"type": "filament",
"filament_id": "GFB00",
"setting_id": "jEYVpOPBjFtQ0DXn",
"name": "Afinia Value ABS",
"from": "system",
"instantiation": "true",
"inherits": "fdm_filament_abs",
"filament_flow_ratio": [
"0.95"
],
"filament_cost": [
"24.99"
],
"filament_vendor": [
"Afinia"
],
"fan_max_speed": [
"60"
],
"filament_max_volumetric_speed": [
"16"
],
"nozzle_temperature": [
"245"
],
"nozzle_temperature_initial_layer": [
"245"
],
"slow_down_layer_time": [
"12"
],
"compatible_printers": [
"Afinia H400 Pro 0.4 nozzle",
"Afinia H400 Pro 0.6 nozzle"
]
}

View File

@@ -0,0 +1,40 @@
{
"type": "filament",
"filament_id": "GFA00",
"setting_id": "oNBk0IxmW7C99WI3",
"name": "Afinia Value PLA",
"from": "system",
"instantiation": "true",
"inherits": "fdm_filament_pla",
"filament_cost": [
"24.99"
],
"filament_density": [
"1.26"
],
"filament_flow_ratio": [
"0.98"
],
"filament_max_volumetric_speed": [
"21"
],
"filament_vendor": [
"Afinia"
],
"filament_long_retractions_when_cut": [
"1"
],
"filament_retraction_distances_when_cut": [
"18"
],
"nozzle_temperature": [
"190"
],
"nozzle_temperature_initial_layer": [
"190"
],
"compatible_printers": [
"Afinia H400 Pro 0.4 nozzle",
"Afinia H400 Pro 0.6 nozzle"
]
}

View File

@@ -1,7 +1,6 @@
{
"type": "process",
"name": "0.20mm Optimal 0.6 nozzle @Anker",
"renamed_from": "0.20mm Optimal 0.6 nozzle @Anker.json",
"inherits": "fdm_process_anker_common_0_6",
"from": "system",
"setting_id": "re5qmcOFJ1OJP3Ip",

View File

@@ -124,7 +124,6 @@
"0"
],
"machine_pause_gcode": "M600",
"bed_temperature_formula": "by_first_filament",
"machine_start_gcode": "G9111 bedTemp=[first_layer_bed_temperature] extruderTemp=[first_layer_temperature[initial_tool]]\nM117\n; print_bed_min = {print_bed_min[0]},{print_bed_min[1]}\n; print_bed_max = {print_bed_max[0]},{print_bed_max[1]}\n; print_bed_size = {print_bed_size[0]},{print_bed_size[1]}\n; first_layer_print_min = {first_layer_print_min[0]},{first_layer_print_min[1]}\n; first_layer_print_max = {first_layer_print_max[0]},{first_layer_print_max[1]}\n; first_layer_print_size = {first_layer_print_size[0]},{first_layer_print_size[1]}",
"machine_tool_change_time": "0",
"machine_unload_filament_time": "0",

View File

@@ -1,7 +1,7 @@
{
"name": "Bambulab",
"url": "http://www.bambulab.com/Parameters/vendor/BBL.json",
"version": "02.01.00.19",
"version": "02.01.00.18",
"force_update": "0",
"description": "BBL configurations",
"machine_model_list": [
@@ -2177,10 +2177,6 @@
"name": "Generic ABS @BBL X2D 0.4 nozzle",
"sub_path": "filament/Generic ABS @BBL X2D 0.4 nozzle.json"
},
{
"name": "addnorth ABS rABS",
"sub_path": "filament/addnorth/addnorth ABS rABS.json"
},
{
"name": "PolyLite ABS @BBL A1",
"sub_path": "filament/Polymaker/PolyLite ABS @BBL A1.json"
@@ -3009,22 +3005,6 @@
"name": "Generic PA @BBL X2D 0.4 nozzle",
"sub_path": "filament/Generic PA @BBL X2D 0.4 nozzle.json"
},
{
"name": "addnorth PA Adura",
"sub_path": "filament/addnorth/addnorth PA Adura.json"
},
{
"name": "addnorth PA Adura FDA",
"sub_path": "filament/addnorth/addnorth PA Adura FDA.json"
},
{
"name": "addnorth PA6 Addlantis",
"sub_path": "filament/addnorth/addnorth PA6 Addlantis.json"
},
{
"name": "addnorth PVDF Adamant S1",
"sub_path": "filament/addnorth/addnorth PVDF Adamant S1.json"
},
{
"name": "Generic PA-CF",
"sub_path": "filament/Generic PA-CF.json"
@@ -3049,10 +3029,6 @@
"name": "Generic PA-CF @BBL X2D 0.4 nozzle",
"sub_path": "filament/Generic PA-CF @BBL X2D 0.4 nozzle.json"
},
{
"name": "addnorth PA-CF Adura X",
"sub_path": "filament/addnorth/addnorth PA-CF Adura X.json"
},
{
"name": "Bambu PC @BBL A1",
"sub_path": "filament/Bambu PC @BBL A1.json"
@@ -3353,10 +3329,6 @@
"name": "Generic PC @BBL X2D 0.4 nozzle",
"sub_path": "filament/Generic PC @BBL X2D 0.4 nozzle.json"
},
{
"name": "addnorth PC BLend HT LCF",
"sub_path": "filament/addnorth/addnorth PC BLend HT LCF.json"
},
{
"name": "Generic PCTG @BBL A1",
"sub_path": "filament/Generic PCTG @BBL A1.json"
@@ -4213,30 +4185,6 @@
"name": "Generic PETG @BBL X2D 0.4 nozzle",
"sub_path": "filament/Generic PETG @BBL X2D 0.4 nozzle.json"
},
{
"name": "addnorth PETG Base",
"sub_path": "filament/addnorth/addnorth PETG Base.json"
},
{
"name": "addnorth PETG ESD",
"sub_path": "filament/addnorth/addnorth PETG ESD.json"
},
{
"name": "addnorth PETG Economy",
"sub_path": "filament/addnorth/addnorth PETG Economy.json"
},
{
"name": "addnorth PETG Flame v0",
"sub_path": "filament/addnorth/addnorth PETG Flame v0.json"
},
{
"name": "addnorth PETG PRO Matte",
"sub_path": "filament/addnorth/addnorth PETG PRO Matte.json"
},
{
"name": "addnorth PETG rPETG Matte",
"sub_path": "filament/addnorth/addnorth PETG rPETG Matte.json"
},
{
"name": "Generic PETG HF @BBL A1",
"sub_path": "filament/Generic PETG HF @BBL A1.json"
@@ -4357,10 +4305,6 @@
"name": "Generic PETG-CF @BBL X2D 0.4 nozzle",
"sub_path": "filament/Generic PETG-CF @BBL X2D 0.4 nozzle.json"
},
{
"name": "addnorth PETG-CF Rigid X",
"sub_path": "filament/addnorth/addnorth PETG-CF Rigid X.json"
},
{
"name": "PolyLite PETG @BBL A1",
"sub_path": "filament/Polymaker/PolyLite PETG @BBL A1.json"
@@ -6645,34 +6589,6 @@
"name": "Generic PLA @BBL X2D 0.4 nozzle",
"sub_path": "filament/Generic PLA @BBL X2D 0.4 nozzle.json"
},
{
"name": "addnorth PLA E-PLA",
"sub_path": "filament/addnorth/addnorth PLA E-PLA.json"
},
{
"name": "addnorth PLA Economy",
"sub_path": "filament/addnorth/addnorth PLA Economy.json"
},
{
"name": "addnorth PLA HT-PLA PRO Matte",
"sub_path": "filament/addnorth/addnorth PLA HT-PLA PRO Matte.json"
},
{
"name": "addnorth PLA Textura",
"sub_path": "filament/addnorth/addnorth PLA Textura.json"
},
{
"name": "addnorth PLA Wood",
"sub_path": "filament/addnorth/addnorth PLA Wood.json"
},
{
"name": "addnorth PLA X-PLA",
"sub_path": "filament/addnorth/addnorth PLA X-PLA.json"
},
{
"name": "addnorth PLA rPLA RE-ADD",
"sub_path": "filament/addnorth/addnorth PLA rPLA RE-ADD.json"
},
{
"name": "Generic PLA High Speed @BBL A1",
"sub_path": "filament/Generic PLA High Speed @BBL A1.json"
@@ -6733,10 +6649,6 @@
"name": "Generic PLA High Speed @BBL X2D 0.4 nozzle",
"sub_path": "filament/Generic PLA High Speed @BBL X2D 0.4 nozzle.json"
},
{
"name": "addnorth PLA X-PLA High Speed",
"sub_path": "filament/addnorth/addnorth PLA X-PLA High Speed.json"
},
{
"name": "Generic PLA Silk",
"sub_path": "filament/Generic PLA Silk.json"
@@ -6777,10 +6689,6 @@
"name": "Generic PLA Silk @BBL X2D 0.4 nozzle",
"sub_path": "filament/Generic PLA Silk @BBL X2D 0.4 nozzle.json"
},
{
"name": "addnorth PLA Premium Silk",
"sub_path": "filament/addnorth/addnorth PLA Premium Silk.json"
},
{
"name": "Generic PLA-CF",
"sub_path": "filament/Generic PLA-CF.json"
@@ -6821,10 +6729,6 @@
"name": "Generic PLA-CF @BBL X2D 0.4 nozzle",
"sub_path": "filament/Generic PLA-CF @BBL X2D 0.4 nozzle.json"
},
{
"name": "addnorth PLA-CF Carbon Fiber",
"sub_path": "filament/addnorth/addnorth PLA-CF Carbon Fiber.json"
},
{
"name": "Numakers PLA+ @BBL A1",
"sub_path": "filament/Numakers/Numakers PLA+ @BBL A1.json"
@@ -7077,6 +6981,10 @@
"name": "Panchroma PLA @BBL X1C 0.2 nozzle",
"sub_path": "filament/Polymaker/Panchroma PLA @BBL X1C 0.2 nozzle.json"
},
{
"name": "Panchroma PLA Silk @BBL X1C 0.2 nozzle",
"sub_path": "filament/Polymaker/Panchroma PLA Silk @BBL X1C 0.2 nozzle.json"
},
{
"name": "Panchroma PLA Celestial @BBL A1",
"sub_path": "filament/Polymaker/Panchroma PLA Celestial @BBL A1.json"
@@ -7473,10 +7381,6 @@
"name": "Panchroma PLA Silk @BBL X1C",
"sub_path": "filament/Polymaker/Panchroma PLA Silk @BBL X1C.json"
},
{
"name": "Panchroma PLA Silk @BBL X1C 0.2 nozzle",
"sub_path": "filament/Polymaker/Panchroma PLA Silk @BBL X1C 0.2 nozzle.json"
},
{
"name": "Panchroma PLA Starlight @BBL A1",
"sub_path": "filament/Polymaker/Panchroma PLA Starlight @BBL A1.json"
@@ -8985,18 +8889,6 @@
"name": "Generic TPU @BBL X2D 0.4 nozzle",
"sub_path": "filament/Generic TPU @BBL X2D 0.4 nozzle.json"
},
{
"name": "addnorth TPU EasyFlex",
"sub_path": "filament/addnorth/addnorth TPU EasyFlex.json"
},
{
"name": "addnorth TPU Pro Matte 85A",
"sub_path": "filament/addnorth/addnorth TPU Pro Matte 85A.json"
},
{
"name": "addnorth TPU Pro Matte 95A",
"sub_path": "filament/addnorth/addnorth TPU Pro Matte 95A.json"
},
{
"name": "Generic TPU for AMS @BBL A1",
"sub_path": "filament/Generic TPU for AMS @BBL A1.json"

View File

@@ -1,7 +1,6 @@
{
"type": "filament",
"name": "Bambu PLA Tough @BBL X1C",
"renamed_from": "Bambu PLA Impact @BBL X1C",
"inherits": "Bambu PLA Tough @base",
"from": "system",
"setting_id": "GFSA09_02",

View File

@@ -1,7 +1,6 @@
{
"type": "filament",
"name": "Panchroma PLA Satin @BBL A1",
"renamed_from": "Panchroma PLA Stain @BBL A1",
"inherits": "Panchroma PLA Satin @base",
"from": "system",
"setting_id": "GFSPM005_00",

View File

@@ -1,7 +1,6 @@
{
"type": "filament",
"name": "Panchroma PLA Satin @BBL A1M",
"renamed_from": "Panchroma PLA Stain @BBL A1M",
"inherits": "Panchroma PLA Satin @base",
"from": "system",
"setting_id": "GFSPM005_02",

View File

@@ -1,7 +1,6 @@
{
"type": "filament",
"name": "Panchroma PLA Satin @BBL P1P",
"renamed_from": "Panchroma PLA Stain @BBL P1P",
"inherits": "Panchroma PLA Satin @base",
"from": "system",
"setting_id": "GFSPM005_04",

View File

@@ -1,7 +1,6 @@
{
"type": "filament",
"name": "Panchroma PLA Satin @BBL X1",
"renamed_from": "Panchroma PLA Stain @BBL X1",
"inherits": "Panchroma PLA Satin @base",
"from": "system",
"setting_id": "GFSPM005_06",

View File

@@ -1,339 +0,0 @@
{
"type": "filament",
"name": "addnorth ABS rABS",
"inherits": "Generic ABS @base",
"from": "system",
"setting_id": "GF_ANRA_00",
"filament_id": "GF_ANRA",
"instantiation": "true",
"activate_air_filtration": [
"1"
],
"additional_cooling_fan_speed": [
"0"
],
"chamber_temperatures": [
"50"
],
"circle_compensation_speed": [
"200"
],
"close_fan_the_first_x_layers": [
"3"
],
"compatible_printers": [
"Bambu Lab A1 mini 0.4 nozzle",
"Bambu Lab A1 mini 0.6 nozzle",
"Bambu Lab A1 mini 0.8 nozzle",
"Bambu Lab A1 0.4 nozzle",
"Bambu Lab A1 0.6 nozzle",
"Bambu Lab A1 0.8 nozzle",
"Bambu Lab P1P 0.4 nozzle",
"Bambu Lab P1P 0.6 nozzle",
"Bambu Lab P1P 0.8 nozzle",
"Bambu Lab P1S 0.4 nozzle",
"Bambu Lab P1S 0.6 nozzle",
"Bambu Lab P1S 0.8 nozzle",
"Bambu Lab X1 0.4 nozzle",
"Bambu Lab X1 0.6 nozzle",
"Bambu Lab X1 0.8 nozzle",
"Bambu Lab X1 Carbon 0.4 nozzle",
"Bambu Lab X1 Carbon 0.6 nozzle",
"Bambu Lab X1 Carbon 0.8 nozzle",
"Bambu Lab X1E 0.4 nozzle",
"Bambu Lab X1E 0.6 nozzle",
"Bambu Lab X1E 0.8 nozzle",
"Bambu Lab H2D 0.4 nozzle",
"Bambu Lab H2D 0.6 nozzle",
"Bambu Lab H2D 0.8 nozzle",
"Bambu Lab H2D Pro 0.4 nozzle",
"Bambu Lab H2D Pro 0.6 nozzle",
"Bambu Lab H2D Pro 0.8 nozzle",
"Bambu Lab H2S 0.4 nozzle",
"Bambu Lab H2S 0.6 nozzle",
"Bambu Lab H2S 0.8 nozzle",
"Bambu Lab P2S 0.4 nozzle",
"Bambu Lab P2S 0.6 nozzle",
"Bambu Lab P2S 0.8 nozzle",
"Bambu Lab X2D 0.2 nozzle",
"Bambu Lab X2D 0.4 nozzle",
"Bambu Lab X2D 0.6 nozzle",
"Bambu Lab X2D 0.8 nozzle"
],
"compatible_printers_condition": "",
"compatible_prints": [],
"compatible_prints_condition": "",
"complete_print_exhaust_fan_speed": [
"70"
],
"cool_plate_temp": [
"0"
],
"cool_plate_temp_initial_layer": [
"0"
],
"counter_coef_1": [
"0"
],
"counter_coef_2": [
"0.008"
],
"counter_coef_3": [
"-0.041"
],
"counter_limit_max": [
"0.033"
],
"counter_limit_min": [
"-0.035"
],
"default_filament_colour": [
""
],
"diameter_limit": [
"50"
],
"during_print_exhaust_fan_speed": [
"70"
],
"enable_overhang_bridge_fan": [
"1"
],
"enable_pressure_advance": [
"0"
],
"eng_plate_temp": [
"105"
],
"eng_plate_temp_initial_layer": [
"105"
],
"fan_cooling_layer_time": [
"30"
],
"fan_max_speed": [
"25"
],
"fan_min_speed": [
"0"
],
"filament_adhesiveness_category": [
"200"
],
"filament_change_length": [
"10"
],
"filament_cost": [
"43"
],
"filament_density": [
"1.03"
],
"filament_deretraction_speed": [
"nil",
"nil"
],
"filament_diameter": [
"1.75"
],
"filament_end_gcode": [
"; filament end gcode \n"
],
"filament_extruder_variant": [
"Direct Drive Standard"
],
"filament_flow_ratio": [
"0.95",
"0.95"
],
"filament_is_support": [
"0"
],
"filament_long_retractions_when_cut": [
"nil",
"nil"
],
"filament_max_volumetric_speed": [
"12",
"12"
],
"filament_minimal_purge_on_wipe_tower": [
"15"
],
"filament_notes": "File Version:2.6 - V.Pack:18_05_2026",
"filament_pre_cooling_temperature": [
"0",
"0"
],
"filament_prime_volume": [
"45"
],
"filament_ramming_travel_time": [
"0",
"0"
],
"filament_ramming_volumetric_speed": [
"-1",
"-1"
],
"filament_retract_before_wipe": [
"nil",
"nil"
],
"filament_retract_restart_extra": [
"nil"
],
"filament_retract_when_changing_layer": [
"nil",
"nil"
],
"filament_retraction_distances_when_cut": [
"nil",
"nil"
],
"filament_retraction_length": [
"nil",
"nil"
],
"filament_retraction_minimum_travel": [
"nil",
"nil"
],
"filament_retraction_speed": [
"nil",
"nil"
],
"filament_scarf_gap": [
"0%"
],
"filament_scarf_height": [
"10%"
],
"filament_scarf_length": [
"10"
],
"filament_scarf_seam_type": [
"none"
],
"filament_settings_id": [
"addnorth ABS rABS"
],
"filament_shrink": [
"100%"
],
"filament_soluble": [
"0"
],
"filament_start_gcode": [
"; filament start gcode\n{if (bed_temperature[current_extruder] >80)||(bed_temperature_initial_layer[current_extruder] >80)}M106 P3 S255\n{elsif (bed_temperature[current_extruder] >60)||(bed_temperature_initial_layer[current_extruder] >60)}M106 P3 S180\n{endif}\n\n{if activate_air_filtration[current_extruder] && support_air_filtration}\nM106 P3 S{during_print_exhaust_fan_speed_num[current_extruder]} \n{endif}"
],
"filament_type": [
"ABS"
],
"filament_vendor": [
"addnorth"
],
"filament_wipe": [
"nil",
"nil"
],
"filament_wipe_distance": [
"nil",
"nil"
],
"filament_z_hop": [
"nil",
"nil"
],
"filament_z_hop_types": [
"nil",
"nil"
],
"full_fan_speed_layer": [
"0"
],
"hole_coef_1": [
"0"
],
"hole_coef_2": [
"-0.008"
],
"hole_coef_3": [
"0.23415"
],
"hole_limit_max": [
"0.22"
],
"hole_limit_min": [
"0.088"
],
"hot_plate_temp": [
"105"
],
"hot_plate_temp_initial_layer": [
"105"
],
"impact_strength_z": [
"10"
],
"nozzle_temperature": [
"255",
"255"
],
"nozzle_temperature_initial_layer": [
"250",
"250"
],
"nozzle_temperature_range_high": [
"260"
],
"nozzle_temperature_range_low": [
"230"
],
"overhang_fan_speed": [
"50"
],
"overhang_fan_threshold": [
"25%"
],
"overhang_threshold_participating_cooling": [
"95%"
],
"pre_start_fan_time": [
"2"
],
"pressure_advance": [
"0.02"
],
"reduce_fan_stop_start_freq": [
"1"
],
"required_nozzle_HRC": [
"3"
],
"slow_down_for_layer_cooling": [
"1"
],
"slow_down_layer_time": [
"8"
],
"slow_down_min_speed": [
"20"
],
"supertack_plate_temp": [
"0"
],
"supertack_plate_temp_initial_layer": [
"0"
],
"temperature_vitrification": [
"100"
],
"textured_plate_temp": [
"105"
],
"textured_plate_temp_initial_layer": [
"105"
],
"version": "2.0.0.77"
}

View File

@@ -1,339 +0,0 @@
{
"type": "filament",
"name": "addnorth PA Adura FDA",
"inherits": "Generic PA @base",
"from": "system",
"setting_id": "GF_ANAF_00",
"filament_id": "GF_ANAF",
"instantiation": "true",
"activate_air_filtration": [
"1"
],
"additional_cooling_fan_speed": [
"0"
],
"chamber_temperatures": [
"50"
],
"circle_compensation_speed": [
"200"
],
"close_fan_the_first_x_layers": [
"3"
],
"compatible_printers": [
"Bambu Lab A1 mini 0.4 nozzle",
"Bambu Lab A1 mini 0.6 nozzle",
"Bambu Lab A1 mini 0.8 nozzle",
"Bambu Lab A1 0.4 nozzle",
"Bambu Lab A1 0.6 nozzle",
"Bambu Lab A1 0.8 nozzle",
"Bambu Lab P1P 0.4 nozzle",
"Bambu Lab P1P 0.6 nozzle",
"Bambu Lab P1P 0.8 nozzle",
"Bambu Lab P1S 0.4 nozzle",
"Bambu Lab P1S 0.6 nozzle",
"Bambu Lab P1S 0.8 nozzle",
"Bambu Lab X1 0.4 nozzle",
"Bambu Lab X1 0.6 nozzle",
"Bambu Lab X1 0.8 nozzle",
"Bambu Lab X1 Carbon 0.4 nozzle",
"Bambu Lab X1 Carbon 0.6 nozzle",
"Bambu Lab X1 Carbon 0.8 nozzle",
"Bambu Lab X1E 0.4 nozzle",
"Bambu Lab X1E 0.6 nozzle",
"Bambu Lab X1E 0.8 nozzle",
"Bambu Lab H2D 0.4 nozzle",
"Bambu Lab H2D 0.6 nozzle",
"Bambu Lab H2D 0.8 nozzle",
"Bambu Lab H2D Pro 0.4 nozzle",
"Bambu Lab H2D Pro 0.6 nozzle",
"Bambu Lab H2D Pro 0.8 nozzle",
"Bambu Lab H2S 0.4 nozzle",
"Bambu Lab H2S 0.6 nozzle",
"Bambu Lab H2S 0.8 nozzle",
"Bambu Lab P2S 0.4 nozzle",
"Bambu Lab P2S 0.6 nozzle",
"Bambu Lab P2S 0.8 nozzle",
"Bambu Lab X2D 0.2 nozzle",
"Bambu Lab X2D 0.4 nozzle",
"Bambu Lab X2D 0.6 nozzle",
"Bambu Lab X2D 0.8 nozzle"
],
"compatible_printers_condition": "",
"compatible_prints": [],
"compatible_prints_condition": "",
"complete_print_exhaust_fan_speed": [
"70"
],
"cool_plate_temp": [
"0"
],
"cool_plate_temp_initial_layer": [
"0"
],
"counter_coef_1": [
"0"
],
"counter_coef_2": [
"0.008"
],
"counter_coef_3": [
"-0.041"
],
"counter_limit_max": [
"0.033"
],
"counter_limit_min": [
"-0.035"
],
"default_filament_colour": [
""
],
"diameter_limit": [
"50"
],
"during_print_exhaust_fan_speed": [
"70"
],
"enable_overhang_bridge_fan": [
"1"
],
"enable_pressure_advance": [
"0"
],
"eng_plate_temp": [
"100"
],
"eng_plate_temp_initial_layer": [
"100"
],
"fan_cooling_layer_time": [
"5"
],
"fan_max_speed": [
"30"
],
"fan_min_speed": [
"10"
],
"filament_adhesiveness_category": [
"300"
],
"filament_change_length": [
"10"
],
"filament_cost": [
"50"
],
"filament_density": [
"1.1"
],
"filament_deretraction_speed": [
"nil",
"nil"
],
"filament_diameter": [
"1.75"
],
"filament_end_gcode": [
"; filament end gcode \n"
],
"filament_extruder_variant": [
"Direct Drive Standard"
],
"filament_flow_ratio": [
"0.99",
"0.99"
],
"filament_is_support": [
"0"
],
"filament_long_retractions_when_cut": [
"nil",
"nil"
],
"filament_max_volumetric_speed": [
"8",
"11"
],
"filament_minimal_purge_on_wipe_tower": [
"15"
],
"filament_notes": "File Version:2.6 - V.Pack:18_05_2026",
"filament_pre_cooling_temperature": [
"0",
"0"
],
"filament_prime_volume": [
"45"
],
"filament_ramming_travel_time": [
"0",
"0"
],
"filament_ramming_volumetric_speed": [
"-1",
"-1"
],
"filament_retract_before_wipe": [
"nil",
"nil"
],
"filament_retract_restart_extra": [
"nil"
],
"filament_retract_when_changing_layer": [
"nil",
"nil"
],
"filament_retraction_distances_when_cut": [
"nil",
"nil"
],
"filament_retraction_length": [
"1",
"1"
],
"filament_retraction_minimum_travel": [
"nil",
"nil"
],
"filament_retraction_speed": [
"nil",
"nil"
],
"filament_scarf_gap": [
"0%"
],
"filament_scarf_height": [
"10%"
],
"filament_scarf_length": [
"10"
],
"filament_scarf_seam_type": [
"none"
],
"filament_settings_id": [
"addnorth PA Adura FDA"
],
"filament_shrink": [
"100%"
],
"filament_soluble": [
"0"
],
"filament_start_gcode": [
"; filament start gcode\n{if (bed_temperature[current_extruder] >80)||(bed_temperature_initial_layer[current_extruder] >80)}M106 P3 S255\n{elsif (bed_temperature[current_extruder] >60)||(bed_temperature_initial_layer[current_extruder] >60)}M106 P3 S180\n{endif}\n\n{if activate_air_filtration[current_extruder] && support_air_filtration}\nM106 P3 S{during_print_exhaust_fan_speed_num[current_extruder]} \n{endif}"
],
"filament_type": [
"PA"
],
"filament_vendor": [
"addnorth"
],
"filament_wipe": [
"nil",
"nil"
],
"filament_wipe_distance": [
"nil",
"nil"
],
"filament_z_hop": [
"0.4",
"0.4"
],
"filament_z_hop_types": [
"nil",
"nil"
],
"full_fan_speed_layer": [
"2"
],
"hole_coef_1": [
"0"
],
"hole_coef_2": [
"-0.008"
],
"hole_coef_3": [
"0.23415"
],
"hole_limit_max": [
"0.22"
],
"hole_limit_min": [
"0.088"
],
"hot_plate_temp": [
"100"
],
"hot_plate_temp_initial_layer": [
"100"
],
"impact_strength_z": [
"10"
],
"nozzle_temperature": [
"265",
"265"
],
"nozzle_temperature_initial_layer": [
"265",
"265"
],
"nozzle_temperature_range_high": [
"270"
],
"nozzle_temperature_range_low": [
"245"
],
"overhang_fan_speed": [
"70"
],
"overhang_fan_threshold": [
"10%"
],
"overhang_threshold_participating_cooling": [
"95%"
],
"pre_start_fan_time": [
"2"
],
"pressure_advance": [
"0.02"
],
"reduce_fan_stop_start_freq": [
"1"
],
"required_nozzle_HRC": [
"40"
],
"slow_down_for_layer_cooling": [
"1"
],
"slow_down_layer_time": [
"10"
],
"slow_down_min_speed": [
"20"
],
"supertack_plate_temp": [
"0"
],
"supertack_plate_temp_initial_layer": [
"0"
],
"temperature_vitrification": [
"110"
],
"textured_plate_temp": [
"100"
],
"textured_plate_temp_initial_layer": [
"100"
],
"version": "2.0.0.77"
}

View File

@@ -1,339 +0,0 @@
{
"type": "filament",
"name": "addnorth PA Adura",
"inherits": "Generic PA @base",
"from": "system",
"setting_id": "GF_ANAD_00",
"filament_id": "GF_ANAD",
"instantiation": "true",
"activate_air_filtration": [
"1"
],
"additional_cooling_fan_speed": [
"0"
],
"chamber_temperatures": [
"50"
],
"circle_compensation_speed": [
"200"
],
"close_fan_the_first_x_layers": [
"3"
],
"compatible_printers": [
"Bambu Lab A1 mini 0.4 nozzle",
"Bambu Lab A1 mini 0.6 nozzle",
"Bambu Lab A1 mini 0.8 nozzle",
"Bambu Lab A1 0.4 nozzle",
"Bambu Lab A1 0.6 nozzle",
"Bambu Lab A1 0.8 nozzle",
"Bambu Lab P1P 0.4 nozzle",
"Bambu Lab P1P 0.6 nozzle",
"Bambu Lab P1P 0.8 nozzle",
"Bambu Lab P1S 0.4 nozzle",
"Bambu Lab P1S 0.6 nozzle",
"Bambu Lab P1S 0.8 nozzle",
"Bambu Lab X1 0.4 nozzle",
"Bambu Lab X1 0.6 nozzle",
"Bambu Lab X1 0.8 nozzle",
"Bambu Lab X1 Carbon 0.4 nozzle",
"Bambu Lab X1 Carbon 0.6 nozzle",
"Bambu Lab X1 Carbon 0.8 nozzle",
"Bambu Lab X1E 0.4 nozzle",
"Bambu Lab X1E 0.6 nozzle",
"Bambu Lab X1E 0.8 nozzle",
"Bambu Lab H2D 0.4 nozzle",
"Bambu Lab H2D 0.6 nozzle",
"Bambu Lab H2D 0.8 nozzle",
"Bambu Lab H2D Pro 0.4 nozzle",
"Bambu Lab H2D Pro 0.6 nozzle",
"Bambu Lab H2D Pro 0.8 nozzle",
"Bambu Lab H2S 0.4 nozzle",
"Bambu Lab H2S 0.6 nozzle",
"Bambu Lab H2S 0.8 nozzle",
"Bambu Lab P2S 0.4 nozzle",
"Bambu Lab P2S 0.6 nozzle",
"Bambu Lab P2S 0.8 nozzle",
"Bambu Lab X2D 0.2 nozzle",
"Bambu Lab X2D 0.4 nozzle",
"Bambu Lab X2D 0.6 nozzle",
"Bambu Lab X2D 0.8 nozzle"
],
"compatible_printers_condition": "",
"compatible_prints": [],
"compatible_prints_condition": "",
"complete_print_exhaust_fan_speed": [
"70"
],
"cool_plate_temp": [
"0"
],
"cool_plate_temp_initial_layer": [
"0"
],
"counter_coef_1": [
"0"
],
"counter_coef_2": [
"0.008"
],
"counter_coef_3": [
"-0.041"
],
"counter_limit_max": [
"0.033"
],
"counter_limit_min": [
"-0.035"
],
"default_filament_colour": [
""
],
"diameter_limit": [
"50"
],
"during_print_exhaust_fan_speed": [
"70"
],
"enable_overhang_bridge_fan": [
"1"
],
"enable_pressure_advance": [
"0"
],
"eng_plate_temp": [
"100"
],
"eng_plate_temp_initial_layer": [
"100"
],
"fan_cooling_layer_time": [
"5"
],
"fan_max_speed": [
"30"
],
"fan_min_speed": [
"10"
],
"filament_adhesiveness_category": [
"300"
],
"filament_change_length": [
"10"
],
"filament_cost": [
"50"
],
"filament_density": [
"1.1"
],
"filament_deretraction_speed": [
"nil",
"nil"
],
"filament_diameter": [
"1.75"
],
"filament_end_gcode": [
"; filament end gcode \n"
],
"filament_extruder_variant": [
"Direct Drive Standard"
],
"filament_flow_ratio": [
"0.99",
"0.99"
],
"filament_is_support": [
"0"
],
"filament_long_retractions_when_cut": [
"nil",
"nil"
],
"filament_max_volumetric_speed": [
"8",
"11"
],
"filament_minimal_purge_on_wipe_tower": [
"15"
],
"filament_notes": "File Version:2.6 - V.Pack:18_05_2026",
"filament_pre_cooling_temperature": [
"0",
"0"
],
"filament_prime_volume": [
"45"
],
"filament_ramming_travel_time": [
"0",
"0"
],
"filament_ramming_volumetric_speed": [
"-1",
"-1"
],
"filament_retract_before_wipe": [
"nil",
"nil"
],
"filament_retract_restart_extra": [
"nil"
],
"filament_retract_when_changing_layer": [
"nil",
"nil"
],
"filament_retraction_distances_when_cut": [
"nil",
"nil"
],
"filament_retraction_length": [
"1",
"1"
],
"filament_retraction_minimum_travel": [
"nil",
"nil"
],
"filament_retraction_speed": [
"nil",
"nil"
],
"filament_scarf_gap": [
"0%"
],
"filament_scarf_height": [
"10%"
],
"filament_scarf_length": [
"10"
],
"filament_scarf_seam_type": [
"none"
],
"filament_settings_id": [
"addnorth PA Adura"
],
"filament_shrink": [
"100%"
],
"filament_soluble": [
"0"
],
"filament_start_gcode": [
"; filament start gcode\n{if (bed_temperature[current_extruder] >80)||(bed_temperature_initial_layer[current_extruder] >80)}M106 P3 S255\n{elsif (bed_temperature[current_extruder] >60)||(bed_temperature_initial_layer[current_extruder] >60)}M106 P3 S180\n{endif}\n\n{if activate_air_filtration[current_extruder] && support_air_filtration}\nM106 P3 S{during_print_exhaust_fan_speed_num[current_extruder]} \n{endif}"
],
"filament_type": [
"PA"
],
"filament_vendor": [
"addnorth"
],
"filament_wipe": [
"nil",
"nil"
],
"filament_wipe_distance": [
"nil",
"nil"
],
"filament_z_hop": [
"0.4",
"0.4"
],
"filament_z_hop_types": [
"nil",
"nil"
],
"full_fan_speed_layer": [
"2"
],
"hole_coef_1": [
"0"
],
"hole_coef_2": [
"-0.008"
],
"hole_coef_3": [
"0.23415"
],
"hole_limit_max": [
"0.22"
],
"hole_limit_min": [
"0.088"
],
"hot_plate_temp": [
"100"
],
"hot_plate_temp_initial_layer": [
"100"
],
"impact_strength_z": [
"10"
],
"nozzle_temperature": [
"265",
"265"
],
"nozzle_temperature_initial_layer": [
"265",
"265"
],
"nozzle_temperature_range_high": [
"270"
],
"nozzle_temperature_range_low": [
"245"
],
"overhang_fan_speed": [
"70"
],
"overhang_fan_threshold": [
"10%"
],
"overhang_threshold_participating_cooling": [
"95%"
],
"pre_start_fan_time": [
"2"
],
"pressure_advance": [
"0.02"
],
"reduce_fan_stop_start_freq": [
"1"
],
"required_nozzle_HRC": [
"40"
],
"slow_down_for_layer_cooling": [
"1"
],
"slow_down_layer_time": [
"10"
],
"slow_down_min_speed": [
"20"
],
"supertack_plate_temp": [
"0"
],
"supertack_plate_temp_initial_layer": [
"0"
],
"temperature_vitrification": [
"110"
],
"textured_plate_temp": [
"100"
],
"textured_plate_temp_initial_layer": [
"100"
],
"version": "2.0.0.77"
}

View File

@@ -1,339 +0,0 @@
{
"type": "filament",
"name": "addnorth PA-CF Adura X",
"inherits": "Generic PA-CF @base",
"from": "system",
"setting_id": "GF_ANAX_00",
"filament_id": "GF_ANAX",
"instantiation": "true",
"activate_air_filtration": [
"1"
],
"additional_cooling_fan_speed": [
"0"
],
"chamber_temperatures": [
"50"
],
"circle_compensation_speed": [
"200"
],
"close_fan_the_first_x_layers": [
"3"
],
"compatible_printers": [
"Bambu Lab A1 mini 0.4 nozzle",
"Bambu Lab A1 mini 0.6 nozzle",
"Bambu Lab A1 mini 0.8 nozzle",
"Bambu Lab A1 0.4 nozzle",
"Bambu Lab A1 0.6 nozzle",
"Bambu Lab A1 0.8 nozzle",
"Bambu Lab P1P 0.4 nozzle",
"Bambu Lab P1P 0.6 nozzle",
"Bambu Lab P1P 0.8 nozzle",
"Bambu Lab P1S 0.4 nozzle",
"Bambu Lab P1S 0.6 nozzle",
"Bambu Lab P1S 0.8 nozzle",
"Bambu Lab X1 0.4 nozzle",
"Bambu Lab X1 0.6 nozzle",
"Bambu Lab X1 0.8 nozzle",
"Bambu Lab X1 Carbon 0.4 nozzle",
"Bambu Lab X1 Carbon 0.6 nozzle",
"Bambu Lab X1 Carbon 0.8 nozzle",
"Bambu Lab X1E 0.4 nozzle",
"Bambu Lab X1E 0.6 nozzle",
"Bambu Lab X1E 0.8 nozzle",
"Bambu Lab H2D 0.4 nozzle",
"Bambu Lab H2D 0.6 nozzle",
"Bambu Lab H2D 0.8 nozzle",
"Bambu Lab H2D Pro 0.4 nozzle",
"Bambu Lab H2D Pro 0.6 nozzle",
"Bambu Lab H2D Pro 0.8 nozzle",
"Bambu Lab H2S 0.4 nozzle",
"Bambu Lab H2S 0.6 nozzle",
"Bambu Lab H2S 0.8 nozzle",
"Bambu Lab P2S 0.4 nozzle",
"Bambu Lab P2S 0.6 nozzle",
"Bambu Lab P2S 0.8 nozzle",
"Bambu Lab X2D 0.2 nozzle",
"Bambu Lab X2D 0.4 nozzle",
"Bambu Lab X2D 0.6 nozzle",
"Bambu Lab X2D 0.8 nozzle"
],
"compatible_printers_condition": "",
"compatible_prints": [],
"compatible_prints_condition": "",
"complete_print_exhaust_fan_speed": [
"70"
],
"cool_plate_temp": [
"0"
],
"cool_plate_temp_initial_layer": [
"0"
],
"counter_coef_1": [
"0"
],
"counter_coef_2": [
"0.008"
],
"counter_coef_3": [
"-0.041"
],
"counter_limit_max": [
"0.033"
],
"counter_limit_min": [
"-0.035"
],
"default_filament_colour": [
""
],
"diameter_limit": [
"50"
],
"during_print_exhaust_fan_speed": [
"70"
],
"enable_overhang_bridge_fan": [
"1"
],
"enable_pressure_advance": [
"0"
],
"eng_plate_temp": [
"100"
],
"eng_plate_temp_initial_layer": [
"100"
],
"fan_cooling_layer_time": [
"5"
],
"fan_max_speed": [
"30"
],
"fan_min_speed": [
"10"
],
"filament_adhesiveness_category": [
"300"
],
"filament_change_length": [
"10"
],
"filament_cost": [
"109"
],
"filament_density": [
"1.2"
],
"filament_deretraction_speed": [
"nil",
"nil"
],
"filament_diameter": [
"1.75"
],
"filament_end_gcode": [
"; filament end gcode \n"
],
"filament_extruder_variant": [
"Direct Drive Standard"
],
"filament_flow_ratio": [
"0.99",
"0.99"
],
"filament_is_support": [
"0"
],
"filament_long_retractions_when_cut": [
"nil",
"nil"
],
"filament_max_volumetric_speed": [
"8",
"15"
],
"filament_minimal_purge_on_wipe_tower": [
"15"
],
"filament_notes": "File Version:2.6 - V.Pack:18_05_2026",
"filament_pre_cooling_temperature": [
"0",
"0"
],
"filament_prime_volume": [
"45"
],
"filament_ramming_travel_time": [
"0",
"0"
],
"filament_ramming_volumetric_speed": [
"-1",
"-1"
],
"filament_retract_before_wipe": [
"nil",
"nil"
],
"filament_retract_restart_extra": [
"nil"
],
"filament_retract_when_changing_layer": [
"nil",
"nil"
],
"filament_retraction_distances_when_cut": [
"nil",
"nil"
],
"filament_retraction_length": [
"nil",
"nil"
],
"filament_retraction_minimum_travel": [
"nil",
"nil"
],
"filament_retraction_speed": [
"nil",
"nil"
],
"filament_scarf_gap": [
"0%"
],
"filament_scarf_height": [
"10%"
],
"filament_scarf_length": [
"10"
],
"filament_scarf_seam_type": [
"none"
],
"filament_settings_id": [
"addnorth PA-CF Adura X"
],
"filament_shrink": [
"100%"
],
"filament_soluble": [
"0"
],
"filament_start_gcode": [
"; filament start gcode\n{if (bed_temperature[current_extruder] >80)||(bed_temperature_initial_layer[current_extruder] >80)}M106 P3 S255\n{elsif (bed_temperature[current_extruder] >60)||(bed_temperature_initial_layer[current_extruder] >60)}M106 P3 S180\n{endif}\n\n{if activate_air_filtration[current_extruder] && support_air_filtration}\nM106 P3 S{during_print_exhaust_fan_speed_num[current_extruder]} \n{endif}"
],
"filament_type": [
"PA-CF"
],
"filament_vendor": [
"addnorth"
],
"filament_wipe": [
"nil",
"nil"
],
"filament_wipe_distance": [
"nil",
"nil"
],
"filament_z_hop": [
"nil",
"nil"
],
"filament_z_hop_types": [
"nil",
"nil"
],
"full_fan_speed_layer": [
"2"
],
"hole_coef_1": [
"0"
],
"hole_coef_2": [
"-0.008"
],
"hole_coef_3": [
"0.23415"
],
"hole_limit_max": [
"0.22"
],
"hole_limit_min": [
"0.088"
],
"hot_plate_temp": [
"100"
],
"hot_plate_temp_initial_layer": [
"100"
],
"impact_strength_z": [
"10"
],
"nozzle_temperature": [
"280",
"280"
],
"nozzle_temperature_initial_layer": [
"275",
"275"
],
"nozzle_temperature_range_high": [
"280"
],
"nozzle_temperature_range_low": [
"260"
],
"overhang_fan_speed": [
"90"
],
"overhang_fan_threshold": [
"10%"
],
"overhang_threshold_participating_cooling": [
"95%"
],
"pre_start_fan_time": [
"2"
],
"pressure_advance": [
"0.02"
],
"reduce_fan_stop_start_freq": [
"1"
],
"required_nozzle_HRC": [
"40"
],
"slow_down_for_layer_cooling": [
"1"
],
"slow_down_layer_time": [
"2"
],
"slow_down_min_speed": [
"20"
],
"supertack_plate_temp": [
"0"
],
"supertack_plate_temp_initial_layer": [
"0"
],
"temperature_vitrification": [
"120"
],
"textured_plate_temp": [
"100"
],
"textured_plate_temp_initial_layer": [
"100"
],
"version": "2.0.0.77"
}

View File

@@ -1,339 +0,0 @@
{
"type": "filament",
"name": "addnorth PA6 Addlantis",
"inherits": "Generic PA @base",
"from": "system",
"setting_id": "GF_ANLA_00",
"filament_id": "GF_ANLA",
"instantiation": "true",
"activate_air_filtration": [
"1"
],
"additional_cooling_fan_speed": [
"0"
],
"chamber_temperatures": [
"60"
],
"circle_compensation_speed": [
"200"
],
"close_fan_the_first_x_layers": [
"3"
],
"compatible_printers": [
"Bambu Lab A1 mini 0.4 nozzle",
"Bambu Lab A1 mini 0.6 nozzle",
"Bambu Lab A1 mini 0.8 nozzle",
"Bambu Lab A1 0.4 nozzle",
"Bambu Lab A1 0.6 nozzle",
"Bambu Lab A1 0.8 nozzle",
"Bambu Lab P1P 0.4 nozzle",
"Bambu Lab P1P 0.6 nozzle",
"Bambu Lab P1P 0.8 nozzle",
"Bambu Lab P1S 0.4 nozzle",
"Bambu Lab P1S 0.6 nozzle",
"Bambu Lab P1S 0.8 nozzle",
"Bambu Lab X1 0.4 nozzle",
"Bambu Lab X1 0.6 nozzle",
"Bambu Lab X1 0.8 nozzle",
"Bambu Lab X1 Carbon 0.4 nozzle",
"Bambu Lab X1 Carbon 0.6 nozzle",
"Bambu Lab X1 Carbon 0.8 nozzle",
"Bambu Lab X1E 0.4 nozzle",
"Bambu Lab X1E 0.6 nozzle",
"Bambu Lab X1E 0.8 nozzle",
"Bambu Lab H2D 0.4 nozzle",
"Bambu Lab H2D 0.6 nozzle",
"Bambu Lab H2D 0.8 nozzle",
"Bambu Lab H2D Pro 0.4 nozzle",
"Bambu Lab H2D Pro 0.6 nozzle",
"Bambu Lab H2D Pro 0.8 nozzle",
"Bambu Lab H2S 0.4 nozzle",
"Bambu Lab H2S 0.6 nozzle",
"Bambu Lab H2S 0.8 nozzle",
"Bambu Lab P2S 0.4 nozzle",
"Bambu Lab P2S 0.6 nozzle",
"Bambu Lab P2S 0.8 nozzle",
"Bambu Lab X2D 0.2 nozzle",
"Bambu Lab X2D 0.4 nozzle",
"Bambu Lab X2D 0.6 nozzle",
"Bambu Lab X2D 0.8 nozzle"
],
"compatible_printers_condition": "",
"compatible_prints": [],
"compatible_prints_condition": "",
"complete_print_exhaust_fan_speed": [
"70"
],
"cool_plate_temp": [
"0"
],
"cool_plate_temp_initial_layer": [
"0"
],
"counter_coef_1": [
"0"
],
"counter_coef_2": [
"0.008"
],
"counter_coef_3": [
"-0.041"
],
"counter_limit_max": [
"0.033"
],
"counter_limit_min": [
"-0.035"
],
"default_filament_colour": [
""
],
"diameter_limit": [
"50"
],
"during_print_exhaust_fan_speed": [
"70"
],
"enable_overhang_bridge_fan": [
"1"
],
"enable_pressure_advance": [
"0"
],
"eng_plate_temp": [
"100"
],
"eng_plate_temp_initial_layer": [
"100"
],
"fan_cooling_layer_time": [
"5"
],
"fan_max_speed": [
"30"
],
"fan_min_speed": [
"10"
],
"filament_adhesiveness_category": [
"300"
],
"filament_change_length": [
"10"
],
"filament_cost": [
"82"
],
"filament_density": [
"1.18"
],
"filament_deretraction_speed": [
"nil",
"nil"
],
"filament_diameter": [
"1.75"
],
"filament_end_gcode": [
"; filament end gcode \n"
],
"filament_extruder_variant": [
"Direct Drive Standard"
],
"filament_flow_ratio": [
"0.99",
"0.99"
],
"filament_is_support": [
"0"
],
"filament_long_retractions_when_cut": [
"nil",
"nil"
],
"filament_max_volumetric_speed": [
"8",
"11"
],
"filament_minimal_purge_on_wipe_tower": [
"15"
],
"filament_notes": "File Version:2.62 - V.Pack:18_05_2026",
"filament_pre_cooling_temperature": [
"0",
"0"
],
"filament_prime_volume": [
"45"
],
"filament_ramming_travel_time": [
"0",
"0"
],
"filament_ramming_volumetric_speed": [
"-1",
"-1"
],
"filament_retract_before_wipe": [
"nil",
"nil"
],
"filament_retract_restart_extra": [
"nil"
],
"filament_retract_when_changing_layer": [
"nil",
"nil"
],
"filament_retraction_distances_when_cut": [
"nil",
"nil"
],
"filament_retraction_length": [
"0.6",
"0.6"
],
"filament_retraction_minimum_travel": [
"nil",
"nil"
],
"filament_retraction_speed": [
"nil",
"nil"
],
"filament_scarf_gap": [
"0%"
],
"filament_scarf_height": [
"10%"
],
"filament_scarf_length": [
"10"
],
"filament_scarf_seam_type": [
"none"
],
"filament_settings_id": [
"addnorth PA6 Addlantis"
],
"filament_shrink": [
"100%"
],
"filament_soluble": [
"0"
],
"filament_start_gcode": [
"; filament start gcode\n{if (bed_temperature[current_extruder] >80)||(bed_temperature_initial_layer[current_extruder] >80)}M106 P3 S255\n{elsif (bed_temperature[current_extruder] >60)||(bed_temperature_initial_layer[current_extruder] >60)}M106 P3 S180\n{endif}\n\n{if activate_air_filtration[current_extruder] && support_air_filtration}\nM106 P3 S{during_print_exhaust_fan_speed_num[current_extruder]} \n{endif}"
],
"filament_type": [
"PA6"
],
"filament_vendor": [
"addnorth"
],
"filament_wipe": [
"nil",
"nil"
],
"filament_wipe_distance": [
"nil",
"nil"
],
"filament_z_hop": [
"0.4",
"0.4"
],
"filament_z_hop_types": [
"nil",
"nil"
],
"full_fan_speed_layer": [
"2"
],
"hole_coef_1": [
"0"
],
"hole_coef_2": [
"-0.008"
],
"hole_coef_3": [
"0.23415"
],
"hole_limit_max": [
"0.22"
],
"hole_limit_min": [
"0.088"
],
"hot_plate_temp": [
"100"
],
"hot_plate_temp_initial_layer": [
"100"
],
"impact_strength_z": [
"10"
],
"nozzle_temperature": [
"275",
"275"
],
"nozzle_temperature_initial_layer": [
"275",
"275"
],
"nozzle_temperature_range_high": [
"285"
],
"nozzle_temperature_range_low": [
"265"
],
"overhang_fan_speed": [
"40"
],
"overhang_fan_threshold": [
"0%"
],
"overhang_threshold_participating_cooling": [
"95%"
],
"pre_start_fan_time": [
"2"
],
"pressure_advance": [
"0.02"
],
"reduce_fan_stop_start_freq": [
"1"
],
"required_nozzle_HRC": [
"40"
],
"slow_down_for_layer_cooling": [
"0"
],
"slow_down_layer_time": [
"15"
],
"slow_down_min_speed": [
"20"
],
"supertack_plate_temp": [
"0"
],
"supertack_plate_temp_initial_layer": [
"0"
],
"temperature_vitrification": [
"110"
],
"textured_plate_temp": [
"100"
],
"textured_plate_temp_initial_layer": [
"100"
],
"version": "2.0.0.77"
}

View File

@@ -1,339 +0,0 @@
{
"type": "filament",
"name": "addnorth PC BLend HT LCF",
"inherits": "Generic PC @base",
"from": "system",
"setting_id": "GF_ANPBX_00",
"filament_id": "GF_ANPBX",
"instantiation": "true",
"activate_air_filtration": [
"0"
],
"additional_cooling_fan_speed": [
"0"
],
"chamber_temperatures": [
"50"
],
"circle_compensation_speed": [
"200"
],
"close_fan_the_first_x_layers": [
"3"
],
"compatible_printers": [
"Bambu Lab A1 mini 0.4 nozzle",
"Bambu Lab A1 mini 0.6 nozzle",
"Bambu Lab A1 mini 0.8 nozzle",
"Bambu Lab A1 0.4 nozzle",
"Bambu Lab A1 0.6 nozzle",
"Bambu Lab A1 0.8 nozzle",
"Bambu Lab P1P 0.4 nozzle",
"Bambu Lab P1P 0.6 nozzle",
"Bambu Lab P1P 0.8 nozzle",
"Bambu Lab P1S 0.4 nozzle",
"Bambu Lab P1S 0.6 nozzle",
"Bambu Lab P1S 0.8 nozzle",
"Bambu Lab X1 0.4 nozzle",
"Bambu Lab X1 0.6 nozzle",
"Bambu Lab X1 0.8 nozzle",
"Bambu Lab X1 Carbon 0.4 nozzle",
"Bambu Lab X1 Carbon 0.6 nozzle",
"Bambu Lab X1 Carbon 0.8 nozzle",
"Bambu Lab X1E 0.4 nozzle",
"Bambu Lab X1E 0.6 nozzle",
"Bambu Lab X1E 0.8 nozzle",
"Bambu Lab H2D 0.4 nozzle",
"Bambu Lab H2D 0.6 nozzle",
"Bambu Lab H2D 0.8 nozzle",
"Bambu Lab H2D Pro 0.4 nozzle",
"Bambu Lab H2D Pro 0.6 nozzle",
"Bambu Lab H2D Pro 0.8 nozzle",
"Bambu Lab H2S 0.4 nozzle",
"Bambu Lab H2S 0.6 nozzle",
"Bambu Lab H2S 0.8 nozzle",
"Bambu Lab P2S 0.4 nozzle",
"Bambu Lab P2S 0.6 nozzle",
"Bambu Lab P2S 0.8 nozzle",
"Bambu Lab X2D 0.2 nozzle",
"Bambu Lab X2D 0.4 nozzle",
"Bambu Lab X2D 0.6 nozzle",
"Bambu Lab X2D 0.8 nozzle"
],
"compatible_printers_condition": "",
"compatible_prints": [],
"compatible_prints_condition": "",
"complete_print_exhaust_fan_speed": [
"70"
],
"cool_plate_temp": [
"0"
],
"cool_plate_temp_initial_layer": [
"0"
],
"counter_coef_1": [
"0"
],
"counter_coef_2": [
"0.008"
],
"counter_coef_3": [
"-0.041"
],
"counter_limit_max": [
"0.033"
],
"counter_limit_min": [
"-0.035"
],
"default_filament_colour": [
""
],
"diameter_limit": [
"50"
],
"during_print_exhaust_fan_speed": [
"70"
],
"enable_overhang_bridge_fan": [
"1"
],
"enable_pressure_advance": [
"0"
],
"eng_plate_temp": [
"70"
],
"eng_plate_temp_initial_layer": [
"70"
],
"fan_cooling_layer_time": [
"30"
],
"fan_max_speed": [
"40"
],
"fan_min_speed": [
"40"
],
"filament_adhesiveness_category": [
"300"
],
"filament_change_length": [
"10"
],
"filament_cost": [
"109"
],
"filament_density": [
"1.3"
],
"filament_deretraction_speed": [
"nil",
"nil"
],
"filament_diameter": [
"1.75"
],
"filament_end_gcode": [
"; filament end gcode \n"
],
"filament_extruder_variant": [
"Direct Drive Standard"
],
"filament_flow_ratio": [
"0.95",
"0.95"
],
"filament_is_support": [
"0"
],
"filament_long_retractions_when_cut": [
"nil",
"nil"
],
"filament_max_volumetric_speed": [
"15",
"15"
],
"filament_minimal_purge_on_wipe_tower": [
"15"
],
"filament_notes": "File Version:2.6 - V.Pack:18_05_2026",
"filament_pre_cooling_temperature": [
"0",
"0"
],
"filament_prime_volume": [
"45"
],
"filament_ramming_travel_time": [
"0",
"0"
],
"filament_ramming_volumetric_speed": [
"-1",
"-1"
],
"filament_retract_before_wipe": [
"nil",
"nil"
],
"filament_retract_restart_extra": [
"nil"
],
"filament_retract_when_changing_layer": [
"nil",
"nil"
],
"filament_retraction_distances_when_cut": [
"nil",
"nil"
],
"filament_retraction_length": [
"nil",
"nil"
],
"filament_retraction_minimum_travel": [
"nil",
"nil"
],
"filament_retraction_speed": [
"nil",
"nil"
],
"filament_scarf_gap": [
"0%"
],
"filament_scarf_height": [
"10%"
],
"filament_scarf_length": [
"10"
],
"filament_scarf_seam_type": [
"none"
],
"filament_settings_id": [
"addnorth PC BLend HT LCF"
],
"filament_shrink": [
"100%"
],
"filament_soluble": [
"0"
],
"filament_start_gcode": [
"; filament start gcode\n{if (bed_temperature[current_extruder] >80)||(bed_temperature_initial_layer[current_extruder] >80)}M106 P3 S255\n{elsif (bed_temperature[current_extruder] >60)||(bed_temperature_initial_layer[current_extruder] >60)}M106 P3 S180\n{endif}\n\n{if activate_air_filtration[current_extruder] && support_air_filtration}\nM106 P3 S{during_print_exhaust_fan_speed_num[current_extruder]} \n{endif}"
],
"filament_type": [
"PC"
],
"filament_vendor": [
"addnorth"
],
"filament_wipe": [
"nil",
"nil"
],
"filament_wipe_distance": [
"nil",
"nil"
],
"filament_z_hop": [
"nil",
"nil"
],
"filament_z_hop_types": [
"nil",
"nil"
],
"full_fan_speed_layer": [
"0"
],
"hole_coef_1": [
"0"
],
"hole_coef_2": [
"-0.008"
],
"hole_coef_3": [
"0.23415"
],
"hole_limit_max": [
"0.22"
],
"hole_limit_min": [
"0.088"
],
"hot_plate_temp": [
"80"
],
"hot_plate_temp_initial_layer": [
"80"
],
"impact_strength_z": [
"10"
],
"nozzle_temperature": [
"285",
"285"
],
"nozzle_temperature_initial_layer": [
"275",
"275"
],
"nozzle_temperature_range_high": [
"290"
],
"nozzle_temperature_range_low": [
"265"
],
"overhang_fan_speed": [
"90"
],
"overhang_fan_threshold": [
"10%"
],
"overhang_threshold_participating_cooling": [
"95%"
],
"pre_start_fan_time": [
"2"
],
"pressure_advance": [
"0.02"
],
"reduce_fan_stop_start_freq": [
"1"
],
"required_nozzle_HRC": [
"40"
],
"slow_down_for_layer_cooling": [
"1"
],
"slow_down_layer_time": [
"2"
],
"slow_down_min_speed": [
"20"
],
"supertack_plate_temp": [
"70"
],
"supertack_plate_temp_initial_layer": [
"70"
],
"temperature_vitrification": [
"185"
],
"textured_plate_temp": [
"100"
],
"textured_plate_temp_initial_layer": [
"100"
],
"version": "2.0.0.77"
}

View File

@@ -1,339 +0,0 @@
{
"type": "filament",
"name": "addnorth PETG Base",
"inherits": "Generic PETG @base",
"from": "system",
"setting_id": "GF_ANPE_00",
"filament_id": "GF_ANPE",
"instantiation": "true",
"activate_air_filtration": [
"0"
],
"additional_cooling_fan_speed": [
"0"
],
"chamber_temperatures": [
"0"
],
"circle_compensation_speed": [
"200"
],
"close_fan_the_first_x_layers": [
"3"
],
"compatible_printers": [
"Bambu Lab A1 mini 0.4 nozzle",
"Bambu Lab A1 mini 0.6 nozzle",
"Bambu Lab A1 mini 0.8 nozzle",
"Bambu Lab A1 0.4 nozzle",
"Bambu Lab A1 0.6 nozzle",
"Bambu Lab A1 0.8 nozzle",
"Bambu Lab P1P 0.4 nozzle",
"Bambu Lab P1P 0.6 nozzle",
"Bambu Lab P1P 0.8 nozzle",
"Bambu Lab P1S 0.4 nozzle",
"Bambu Lab P1S 0.6 nozzle",
"Bambu Lab P1S 0.8 nozzle",
"Bambu Lab X1 0.4 nozzle",
"Bambu Lab X1 0.6 nozzle",
"Bambu Lab X1 0.8 nozzle",
"Bambu Lab X1 Carbon 0.4 nozzle",
"Bambu Lab X1 Carbon 0.6 nozzle",
"Bambu Lab X1 Carbon 0.8 nozzle",
"Bambu Lab X1E 0.4 nozzle",
"Bambu Lab X1E 0.6 nozzle",
"Bambu Lab X1E 0.8 nozzle",
"Bambu Lab H2D 0.4 nozzle",
"Bambu Lab H2D 0.6 nozzle",
"Bambu Lab H2D 0.8 nozzle",
"Bambu Lab H2D Pro 0.4 nozzle",
"Bambu Lab H2D Pro 0.6 nozzle",
"Bambu Lab H2D Pro 0.8 nozzle",
"Bambu Lab H2S 0.4 nozzle",
"Bambu Lab H2S 0.6 nozzle",
"Bambu Lab H2S 0.8 nozzle",
"Bambu Lab P2S 0.4 nozzle",
"Bambu Lab P2S 0.6 nozzle",
"Bambu Lab P2S 0.8 nozzle",
"Bambu Lab X2D 0.2 nozzle",
"Bambu Lab X2D 0.4 nozzle",
"Bambu Lab X2D 0.6 nozzle",
"Bambu Lab X2D 0.8 nozzle"
],
"compatible_printers_condition": "",
"compatible_prints": [],
"compatible_prints_condition": "",
"complete_print_exhaust_fan_speed": [
"70"
],
"cool_plate_temp": [
"0"
],
"cool_plate_temp_initial_layer": [
"0"
],
"counter_coef_1": [
"0"
],
"counter_coef_2": [
"0.008"
],
"counter_coef_3": [
"-0.041"
],
"counter_limit_max": [
"0.033"
],
"counter_limit_min": [
"-0.035"
],
"default_filament_colour": [
""
],
"diameter_limit": [
"50"
],
"during_print_exhaust_fan_speed": [
"70"
],
"enable_overhang_bridge_fan": [
"1"
],
"enable_pressure_advance": [
"0"
],
"eng_plate_temp": [
"70"
],
"eng_plate_temp_initial_layer": [
"70"
],
"fan_cooling_layer_time": [
"30"
],
"fan_max_speed": [
"90"
],
"fan_min_speed": [
"40"
],
"filament_adhesiveness_category": [
"300"
],
"filament_change_length": [
"10"
],
"filament_cost": [
"35.6"
],
"filament_density": [
"1.27"
],
"filament_deretraction_speed": [
"nil",
"nil"
],
"filament_diameter": [
"1.75"
],
"filament_end_gcode": [
"; filament end gcode \n"
],
"filament_extruder_variant": [
"Direct Drive Standard"
],
"filament_flow_ratio": [
"0.95",
"0.95"
],
"filament_is_support": [
"0"
],
"filament_long_retractions_when_cut": [
"nil",
"nil"
],
"filament_max_volumetric_speed": [
"10",
"10"
],
"filament_minimal_purge_on_wipe_tower": [
"15"
],
"filament_notes": "File Version:2.6 - V.Pack:18_05_2026",
"filament_pre_cooling_temperature": [
"0",
"0"
],
"filament_prime_volume": [
"45"
],
"filament_ramming_travel_time": [
"0",
"0"
],
"filament_ramming_volumetric_speed": [
"-1",
"-1"
],
"filament_retract_before_wipe": [
"nil",
"nil"
],
"filament_retract_restart_extra": [
"nil"
],
"filament_retract_when_changing_layer": [
"nil",
"nil"
],
"filament_retraction_distances_when_cut": [
"nil",
"nil"
],
"filament_retraction_length": [
"nil",
"nil"
],
"filament_retraction_minimum_travel": [
"nil",
"nil"
],
"filament_retraction_speed": [
"nil",
"nil"
],
"filament_scarf_gap": [
"0%"
],
"filament_scarf_height": [
"10%"
],
"filament_scarf_length": [
"10"
],
"filament_scarf_seam_type": [
"none"
],
"filament_settings_id": [
"addnorth PETG Base"
],
"filament_shrink": [
"100%"
],
"filament_soluble": [
"0"
],
"filament_start_gcode": [
"; filament start gcode\n{if (bed_temperature[current_extruder] >80)||(bed_temperature_initial_layer[current_extruder] >80)}M106 P3 S255\n{elsif (bed_temperature[current_extruder] >60)||(bed_temperature_initial_layer[current_extruder] >60)}M106 P3 S180\n{endif}\n\n{if activate_air_filtration[current_extruder] && support_air_filtration}\nM106 P3 S{during_print_exhaust_fan_speed_num[current_extruder]} \n{endif}"
],
"filament_type": [
"PETG"
],
"filament_vendor": [
"addnorth"
],
"filament_wipe": [
"nil",
"nil"
],
"filament_wipe_distance": [
"nil",
"nil"
],
"filament_z_hop": [
"nil",
"nil"
],
"filament_z_hop_types": [
"nil",
"nil"
],
"full_fan_speed_layer": [
"0"
],
"hole_coef_1": [
"0"
],
"hole_coef_2": [
"-0.008"
],
"hole_coef_3": [
"0.23415"
],
"hole_limit_max": [
"0.22"
],
"hole_limit_min": [
"0.088"
],
"hot_plate_temp": [
"80"
],
"hot_plate_temp_initial_layer": [
"80"
],
"impact_strength_z": [
"10"
],
"nozzle_temperature": [
"260",
"260"
],
"nozzle_temperature_initial_layer": [
"255",
"255"
],
"nozzle_temperature_range_high": [
"275"
],
"nozzle_temperature_range_low": [
"240"
],
"overhang_fan_speed": [
"90"
],
"overhang_fan_threshold": [
"10%"
],
"overhang_threshold_participating_cooling": [
"95%"
],
"pre_start_fan_time": [
"2"
],
"pressure_advance": [
"0.02"
],
"reduce_fan_stop_start_freq": [
"1"
],
"required_nozzle_HRC": [
"3"
],
"slow_down_for_layer_cooling": [
"1"
],
"slow_down_layer_time": [
"8"
],
"slow_down_min_speed": [
"20"
],
"supertack_plate_temp": [
"70"
],
"supertack_plate_temp_initial_layer": [
"70"
],
"temperature_vitrification": [
"50"
],
"textured_plate_temp": [
"75"
],
"textured_plate_temp_initial_layer": [
"75"
],
"version": "2.0.0.77"
}

View File

@@ -1,339 +0,0 @@
{
"type": "filament",
"name": "addnorth PETG ESD",
"inherits": "Generic PETG @base",
"from": "system",
"setting_id": "GF_ANEG_00",
"filament_id": "GF_ANEG",
"instantiation": "true",
"activate_air_filtration": [
"0"
],
"additional_cooling_fan_speed": [
"0"
],
"chamber_temperatures": [
"0"
],
"circle_compensation_speed": [
"200"
],
"close_fan_the_first_x_layers": [
"3"
],
"compatible_printers": [
"Bambu Lab A1 mini 0.4 nozzle",
"Bambu Lab A1 mini 0.6 nozzle",
"Bambu Lab A1 mini 0.8 nozzle",
"Bambu Lab A1 0.4 nozzle",
"Bambu Lab A1 0.6 nozzle",
"Bambu Lab A1 0.8 nozzle",
"Bambu Lab P1P 0.4 nozzle",
"Bambu Lab P1P 0.6 nozzle",
"Bambu Lab P1P 0.8 nozzle",
"Bambu Lab P1S 0.4 nozzle",
"Bambu Lab P1S 0.6 nozzle",
"Bambu Lab P1S 0.8 nozzle",
"Bambu Lab X1 0.4 nozzle",
"Bambu Lab X1 0.6 nozzle",
"Bambu Lab X1 0.8 nozzle",
"Bambu Lab X1 Carbon 0.4 nozzle",
"Bambu Lab X1 Carbon 0.6 nozzle",
"Bambu Lab X1 Carbon 0.8 nozzle",
"Bambu Lab X1E 0.4 nozzle",
"Bambu Lab X1E 0.6 nozzle",
"Bambu Lab X1E 0.8 nozzle",
"Bambu Lab H2D 0.4 nozzle",
"Bambu Lab H2D 0.6 nozzle",
"Bambu Lab H2D 0.8 nozzle",
"Bambu Lab H2D Pro 0.4 nozzle",
"Bambu Lab H2D Pro 0.6 nozzle",
"Bambu Lab H2D Pro 0.8 nozzle",
"Bambu Lab H2S 0.4 nozzle",
"Bambu Lab H2S 0.6 nozzle",
"Bambu Lab H2S 0.8 nozzle",
"Bambu Lab P2S 0.4 nozzle",
"Bambu Lab P2S 0.6 nozzle",
"Bambu Lab P2S 0.8 nozzle",
"Bambu Lab X2D 0.2 nozzle",
"Bambu Lab X2D 0.4 nozzle",
"Bambu Lab X2D 0.6 nozzle",
"Bambu Lab X2D 0.8 nozzle"
],
"compatible_printers_condition": "",
"compatible_prints": [],
"compatible_prints_condition": "",
"complete_print_exhaust_fan_speed": [
"70"
],
"cool_plate_temp": [
"0"
],
"cool_plate_temp_initial_layer": [
"0"
],
"counter_coef_1": [
"0"
],
"counter_coef_2": [
"0.008"
],
"counter_coef_3": [
"-0.041"
],
"counter_limit_max": [
"0.033"
],
"counter_limit_min": [
"-0.035"
],
"default_filament_colour": [
""
],
"diameter_limit": [
"50"
],
"during_print_exhaust_fan_speed": [
"70"
],
"enable_overhang_bridge_fan": [
"1"
],
"enable_pressure_advance": [
"0"
],
"eng_plate_temp": [
"70"
],
"eng_plate_temp_initial_layer": [
"70"
],
"fan_cooling_layer_time": [
"30"
],
"fan_max_speed": [
"90"
],
"fan_min_speed": [
"40"
],
"filament_adhesiveness_category": [
"300"
],
"filament_change_length": [
"10"
],
"filament_cost": [
"76"
],
"filament_density": [
"1.3"
],
"filament_deretraction_speed": [
"nil",
"nil"
],
"filament_diameter": [
"1.75"
],
"filament_end_gcode": [
"; filament end gcode \n"
],
"filament_extruder_variant": [
"Direct Drive Standard"
],
"filament_flow_ratio": [
"0.97",
"0.97"
],
"filament_is_support": [
"0"
],
"filament_long_retractions_when_cut": [
"nil",
"nil"
],
"filament_max_volumetric_speed": [
"20",
"20"
],
"filament_minimal_purge_on_wipe_tower": [
"15"
],
"filament_notes": "File Version:2.6 high reliability - V.Pack:18_05_2026",
"filament_pre_cooling_temperature": [
"0",
"0"
],
"filament_prime_volume": [
"45"
],
"filament_ramming_travel_time": [
"0",
"0"
],
"filament_ramming_volumetric_speed": [
"-1",
"-1"
],
"filament_retract_before_wipe": [
"nil",
"nil"
],
"filament_retract_restart_extra": [
"nil"
],
"filament_retract_when_changing_layer": [
"nil",
"nil"
],
"filament_retraction_distances_when_cut": [
"nil",
"nil"
],
"filament_retraction_length": [
"nil",
"nil"
],
"filament_retraction_minimum_travel": [
"nil",
"nil"
],
"filament_retraction_speed": [
"nil",
"nil"
],
"filament_scarf_gap": [
"0%"
],
"filament_scarf_height": [
"10%"
],
"filament_scarf_length": [
"10"
],
"filament_scarf_seam_type": [
"none"
],
"filament_settings_id": [
"addnorth PETG ESD"
],
"filament_shrink": [
"100%"
],
"filament_soluble": [
"0"
],
"filament_start_gcode": [
"; filament start gcode\n{if (bed_temperature[current_extruder] >80)||(bed_temperature_initial_layer[current_extruder] >80)}M106 P3 S255\n{elsif (bed_temperature[current_extruder] >60)||(bed_temperature_initial_layer[current_extruder] >60)}M106 P3 S180\n{endif}\n\n{if activate_air_filtration[current_extruder] && support_air_filtration}\nM106 P3 S{during_print_exhaust_fan_speed_num[current_extruder]} \n{endif}"
],
"filament_type": [
"PETG"
],
"filament_vendor": [
"addnorth"
],
"filament_wipe": [
"nil",
"nil"
],
"filament_wipe_distance": [
"nil",
"nil"
],
"filament_z_hop": [
"nil",
"nil"
],
"filament_z_hop_types": [
"nil",
"nil"
],
"full_fan_speed_layer": [
"0"
],
"hole_coef_1": [
"0"
],
"hole_coef_2": [
"-0.008"
],
"hole_coef_3": [
"0.23415"
],
"hole_limit_max": [
"0.22"
],
"hole_limit_min": [
"0.088"
],
"hot_plate_temp": [
"80"
],
"hot_plate_temp_initial_layer": [
"80"
],
"impact_strength_z": [
"10"
],
"nozzle_temperature": [
"290",
"290"
],
"nozzle_temperature_initial_layer": [
"290",
"290"
],
"nozzle_temperature_range_high": [
"270"
],
"nozzle_temperature_range_low": [
"255"
],
"overhang_fan_speed": [
"90"
],
"overhang_fan_threshold": [
"10%"
],
"overhang_threshold_participating_cooling": [
"95%"
],
"pre_start_fan_time": [
"2"
],
"pressure_advance": [
"0.02"
],
"reduce_fan_stop_start_freq": [
"1"
],
"required_nozzle_HRC": [
"3"
],
"slow_down_for_layer_cooling": [
"1"
],
"slow_down_layer_time": [
"8"
],
"slow_down_min_speed": [
"20"
],
"supertack_plate_temp": [
"70"
],
"supertack_plate_temp_initial_layer": [
"70"
],
"temperature_vitrification": [
"50"
],
"textured_plate_temp": [
"70"
],
"textured_plate_temp_initial_layer": [
"70"
],
"version": "2.0.0.77"
}

View File

@@ -1,339 +0,0 @@
{
"type": "filament",
"name": "addnorth PETG Economy",
"inherits": "Generic PETG @base",
"from": "system",
"setting_id": "GF_ANGE_00",
"filament_id": "GF_ANGE",
"instantiation": "true",
"activate_air_filtration": [
"0"
],
"additional_cooling_fan_speed": [
"0"
],
"chamber_temperatures": [
"0"
],
"circle_compensation_speed": [
"200"
],
"close_fan_the_first_x_layers": [
"3"
],
"compatible_printers": [
"Bambu Lab A1 mini 0.4 nozzle",
"Bambu Lab A1 mini 0.6 nozzle",
"Bambu Lab A1 mini 0.8 nozzle",
"Bambu Lab A1 0.4 nozzle",
"Bambu Lab A1 0.6 nozzle",
"Bambu Lab A1 0.8 nozzle",
"Bambu Lab P1P 0.4 nozzle",
"Bambu Lab P1P 0.6 nozzle",
"Bambu Lab P1P 0.8 nozzle",
"Bambu Lab P1S 0.4 nozzle",
"Bambu Lab P1S 0.6 nozzle",
"Bambu Lab P1S 0.8 nozzle",
"Bambu Lab X1 0.4 nozzle",
"Bambu Lab X1 0.6 nozzle",
"Bambu Lab X1 0.8 nozzle",
"Bambu Lab X1 Carbon 0.4 nozzle",
"Bambu Lab X1 Carbon 0.6 nozzle",
"Bambu Lab X1 Carbon 0.8 nozzle",
"Bambu Lab X1E 0.4 nozzle",
"Bambu Lab X1E 0.6 nozzle",
"Bambu Lab X1E 0.8 nozzle",
"Bambu Lab H2D 0.4 nozzle",
"Bambu Lab H2D 0.6 nozzle",
"Bambu Lab H2D 0.8 nozzle",
"Bambu Lab H2D Pro 0.4 nozzle",
"Bambu Lab H2D Pro 0.6 nozzle",
"Bambu Lab H2D Pro 0.8 nozzle",
"Bambu Lab H2S 0.4 nozzle",
"Bambu Lab H2S 0.6 nozzle",
"Bambu Lab H2S 0.8 nozzle",
"Bambu Lab P2S 0.4 nozzle",
"Bambu Lab P2S 0.6 nozzle",
"Bambu Lab P2S 0.8 nozzle",
"Bambu Lab X2D 0.2 nozzle",
"Bambu Lab X2D 0.4 nozzle",
"Bambu Lab X2D 0.6 nozzle",
"Bambu Lab X2D 0.8 nozzle"
],
"compatible_printers_condition": "",
"compatible_prints": [],
"compatible_prints_condition": "",
"complete_print_exhaust_fan_speed": [
"70"
],
"cool_plate_temp": [
"0"
],
"cool_plate_temp_initial_layer": [
"0"
],
"counter_coef_1": [
"0"
],
"counter_coef_2": [
"0.008"
],
"counter_coef_3": [
"-0.041"
],
"counter_limit_max": [
"0.033"
],
"counter_limit_min": [
"-0.035"
],
"default_filament_colour": [
""
],
"diameter_limit": [
"50"
],
"during_print_exhaust_fan_speed": [
"70"
],
"enable_overhang_bridge_fan": [
"1"
],
"enable_pressure_advance": [
"0"
],
"eng_plate_temp": [
"70"
],
"eng_plate_temp_initial_layer": [
"70"
],
"fan_cooling_layer_time": [
"30"
],
"fan_max_speed": [
"90"
],
"fan_min_speed": [
"40"
],
"filament_adhesiveness_category": [
"300"
],
"filament_change_length": [
"10"
],
"filament_cost": [
"27"
],
"filament_density": [
"1.25"
],
"filament_deretraction_speed": [
"nil",
"nil"
],
"filament_diameter": [
"1.75"
],
"filament_end_gcode": [
"; filament end gcode \n"
],
"filament_extruder_variant": [
"Direct Drive Standard"
],
"filament_flow_ratio": [
"0.95",
"0.95"
],
"filament_is_support": [
"0"
],
"filament_long_retractions_when_cut": [
"nil",
"nil"
],
"filament_max_volumetric_speed": [
"10",
"10"
],
"filament_minimal_purge_on_wipe_tower": [
"15"
],
"filament_notes": "File Version:2.6 - V.Pack:18_05_2026",
"filament_pre_cooling_temperature": [
"0",
"0"
],
"filament_prime_volume": [
"45"
],
"filament_ramming_travel_time": [
"0",
"0"
],
"filament_ramming_volumetric_speed": [
"-1",
"-1"
],
"filament_retract_before_wipe": [
"nil",
"nil"
],
"filament_retract_restart_extra": [
"nil"
],
"filament_retract_when_changing_layer": [
"nil",
"nil"
],
"filament_retraction_distances_when_cut": [
"nil",
"nil"
],
"filament_retraction_length": [
"nil",
"nil"
],
"filament_retraction_minimum_travel": [
"nil",
"nil"
],
"filament_retraction_speed": [
"nil",
"nil"
],
"filament_scarf_gap": [
"0%"
],
"filament_scarf_height": [
"10%"
],
"filament_scarf_length": [
"10"
],
"filament_scarf_seam_type": [
"none"
],
"filament_settings_id": [
"addnorth PETG Economy"
],
"filament_shrink": [
"100%"
],
"filament_soluble": [
"0"
],
"filament_start_gcode": [
"; filament start gcode\n{if (bed_temperature[current_extruder] >80)||(bed_temperature_initial_layer[current_extruder] >80)}M106 P3 S255\n{elsif (bed_temperature[current_extruder] >60)||(bed_temperature_initial_layer[current_extruder] >60)}M106 P3 S180\n{endif}\n\n{if activate_air_filtration[current_extruder] && support_air_filtration}\nM106 P3 S{during_print_exhaust_fan_speed_num[current_extruder]} \n{endif}"
],
"filament_type": [
"PETG"
],
"filament_vendor": [
"addnorth"
],
"filament_wipe": [
"nil",
"nil"
],
"filament_wipe_distance": [
"nil",
"nil"
],
"filament_z_hop": [
"nil",
"nil"
],
"filament_z_hop_types": [
"nil",
"nil"
],
"full_fan_speed_layer": [
"0"
],
"hole_coef_1": [
"0"
],
"hole_coef_2": [
"-0.008"
],
"hole_coef_3": [
"0.23415"
],
"hole_limit_max": [
"0.22"
],
"hole_limit_min": [
"0.088"
],
"hot_plate_temp": [
"80"
],
"hot_plate_temp_initial_layer": [
"80"
],
"impact_strength_z": [
"10"
],
"nozzle_temperature": [
"260",
"260"
],
"nozzle_temperature_initial_layer": [
"255",
"255"
],
"nozzle_temperature_range_high": [
"275"
],
"nozzle_temperature_range_low": [
"240"
],
"overhang_fan_speed": [
"90"
],
"overhang_fan_threshold": [
"10%"
],
"overhang_threshold_participating_cooling": [
"95%"
],
"pre_start_fan_time": [
"2"
],
"pressure_advance": [
"0.02"
],
"reduce_fan_stop_start_freq": [
"1"
],
"required_nozzle_HRC": [
"3"
],
"slow_down_for_layer_cooling": [
"1"
],
"slow_down_layer_time": [
"8"
],
"slow_down_min_speed": [
"20"
],
"supertack_plate_temp": [
"70"
],
"supertack_plate_temp_initial_layer": [
"70"
],
"temperature_vitrification": [
"50"
],
"textured_plate_temp": [
"75"
],
"textured_plate_temp_initial_layer": [
"75"
],
"version": "2.0.0.77"
}

View File

@@ -1,339 +0,0 @@
{
"type": "filament",
"name": "addnorth PETG Flame v0",
"inherits": "Generic PETG @base",
"from": "system",
"setting_id": "GF_ANPF_00",
"filament_id": "GF_ANPF",
"instantiation": "true",
"activate_air_filtration": [
"0"
],
"additional_cooling_fan_speed": [
"0"
],
"chamber_temperatures": [
"0"
],
"circle_compensation_speed": [
"200"
],
"close_fan_the_first_x_layers": [
"3"
],
"compatible_printers": [
"Bambu Lab A1 mini 0.4 nozzle",
"Bambu Lab A1 mini 0.6 nozzle",
"Bambu Lab A1 mini 0.8 nozzle",
"Bambu Lab A1 0.4 nozzle",
"Bambu Lab A1 0.6 nozzle",
"Bambu Lab A1 0.8 nozzle",
"Bambu Lab P1P 0.4 nozzle",
"Bambu Lab P1P 0.6 nozzle",
"Bambu Lab P1P 0.8 nozzle",
"Bambu Lab P1S 0.4 nozzle",
"Bambu Lab P1S 0.6 nozzle",
"Bambu Lab P1S 0.8 nozzle",
"Bambu Lab X1 0.4 nozzle",
"Bambu Lab X1 0.6 nozzle",
"Bambu Lab X1 0.8 nozzle",
"Bambu Lab X1 Carbon 0.4 nozzle",
"Bambu Lab X1 Carbon 0.6 nozzle",
"Bambu Lab X1 Carbon 0.8 nozzle",
"Bambu Lab X1E 0.4 nozzle",
"Bambu Lab X1E 0.6 nozzle",
"Bambu Lab X1E 0.8 nozzle",
"Bambu Lab H2D 0.4 nozzle",
"Bambu Lab H2D 0.6 nozzle",
"Bambu Lab H2D 0.8 nozzle",
"Bambu Lab H2D Pro 0.4 nozzle",
"Bambu Lab H2D Pro 0.6 nozzle",
"Bambu Lab H2D Pro 0.8 nozzle",
"Bambu Lab H2S 0.4 nozzle",
"Bambu Lab H2S 0.6 nozzle",
"Bambu Lab H2S 0.8 nozzle",
"Bambu Lab P2S 0.4 nozzle",
"Bambu Lab P2S 0.6 nozzle",
"Bambu Lab P2S 0.8 nozzle",
"Bambu Lab X2D 0.2 nozzle",
"Bambu Lab X2D 0.4 nozzle",
"Bambu Lab X2D 0.6 nozzle",
"Bambu Lab X2D 0.8 nozzle"
],
"compatible_printers_condition": "",
"compatible_prints": [],
"compatible_prints_condition": "",
"complete_print_exhaust_fan_speed": [
"70"
],
"cool_plate_temp": [
"0"
],
"cool_plate_temp_initial_layer": [
"0"
],
"counter_coef_1": [
"0"
],
"counter_coef_2": [
"0.008"
],
"counter_coef_3": [
"-0.041"
],
"counter_limit_max": [
"0.033"
],
"counter_limit_min": [
"-0.035"
],
"default_filament_colour": [
""
],
"diameter_limit": [
"50"
],
"during_print_exhaust_fan_speed": [
"70"
],
"enable_overhang_bridge_fan": [
"1"
],
"enable_pressure_advance": [
"0"
],
"eng_plate_temp": [
"70"
],
"eng_plate_temp_initial_layer": [
"70"
],
"fan_cooling_layer_time": [
"30"
],
"fan_max_speed": [
"90"
],
"fan_min_speed": [
"40"
],
"filament_adhesiveness_category": [
"300"
],
"filament_change_length": [
"10"
],
"filament_cost": [
"71"
],
"filament_density": [
"1.27"
],
"filament_deretraction_speed": [
"nil",
"nil"
],
"filament_diameter": [
"1.75"
],
"filament_end_gcode": [
"; filament end gcode \n"
],
"filament_extruder_variant": [
"Direct Drive Standard"
],
"filament_flow_ratio": [
"0.97",
"0.97"
],
"filament_is_support": [
"0"
],
"filament_long_retractions_when_cut": [
"nil",
"nil"
],
"filament_max_volumetric_speed": [
"20",
"20"
],
"filament_minimal_purge_on_wipe_tower": [
"15"
],
"filament_notes": "File Version:2.4 high reliability - V.Pack:18_05_2026",
"filament_pre_cooling_temperature": [
"0",
"0"
],
"filament_prime_volume": [
"45"
],
"filament_ramming_travel_time": [
"0",
"0"
],
"filament_ramming_volumetric_speed": [
"-1",
"-1"
],
"filament_retract_before_wipe": [
"nil",
"nil"
],
"filament_retract_restart_extra": [
"nil"
],
"filament_retract_when_changing_layer": [
"nil",
"nil"
],
"filament_retraction_distances_when_cut": [
"nil",
"nil"
],
"filament_retraction_length": [
"nil",
"nil"
],
"filament_retraction_minimum_travel": [
"nil",
"nil"
],
"filament_retraction_speed": [
"nil",
"nil"
],
"filament_scarf_gap": [
"0%"
],
"filament_scarf_height": [
"10%"
],
"filament_scarf_length": [
"10"
],
"filament_scarf_seam_type": [
"none"
],
"filament_settings_id": [
"addnorth PETG Flame V0"
],
"filament_shrink": [
"100%"
],
"filament_soluble": [
"0"
],
"filament_start_gcode": [
"; filament start gcode\n{if (bed_temperature[current_extruder] >80)||(bed_temperature_initial_layer[current_extruder] >80)}M106 P3 S255\n{elsif (bed_temperature[current_extruder] >60)||(bed_temperature_initial_layer[current_extruder] >60)}M106 P3 S180\n{endif}\n\n{if activate_air_filtration[current_extruder] && support_air_filtration}\nM106 P3 S{during_print_exhaust_fan_speed_num[current_extruder]} \n{endif}"
],
"filament_type": [
"PETG"
],
"filament_vendor": [
"addnorth"
],
"filament_wipe": [
"nil",
"nil"
],
"filament_wipe_distance": [
"nil",
"nil"
],
"filament_z_hop": [
"nil",
"nil"
],
"filament_z_hop_types": [
"nil",
"nil"
],
"full_fan_speed_layer": [
"0"
],
"hole_coef_1": [
"0"
],
"hole_coef_2": [
"-0.008"
],
"hole_coef_3": [
"0.23415"
],
"hole_limit_max": [
"0.22"
],
"hole_limit_min": [
"0.088"
],
"hot_plate_temp": [
"80"
],
"hot_plate_temp_initial_layer": [
"80"
],
"impact_strength_z": [
"10"
],
"nozzle_temperature": [
"290",
"290"
],
"nozzle_temperature_initial_layer": [
"290",
"290"
],
"nozzle_temperature_range_high": [
"270"
],
"nozzle_temperature_range_low": [
"255"
],
"overhang_fan_speed": [
"90"
],
"overhang_fan_threshold": [
"10%"
],
"overhang_threshold_participating_cooling": [
"95%"
],
"pre_start_fan_time": [
"2"
],
"pressure_advance": [
"0.02"
],
"reduce_fan_stop_start_freq": [
"1"
],
"required_nozzle_HRC": [
"3"
],
"slow_down_for_layer_cooling": [
"1"
],
"slow_down_layer_time": [
"8"
],
"slow_down_min_speed": [
"20"
],
"supertack_plate_temp": [
"70"
],
"supertack_plate_temp_initial_layer": [
"70"
],
"temperature_vitrification": [
"50"
],
"textured_plate_temp": [
"70"
],
"textured_plate_temp_initial_layer": [
"70"
],
"version": "2.0.0.77"
}

View File

@@ -1,339 +0,0 @@
{
"type": "filament",
"name": "addnorth PETG PRO Matte",
"inherits": "Generic PETG @base",
"from": "system",
"setting_id": "GF_ANPM_00",
"filament_id": "GF_ANPM",
"instantiation": "true",
"activate_air_filtration": [
"0"
],
"additional_cooling_fan_speed": [
"0"
],
"chamber_temperatures": [
"0"
],
"circle_compensation_speed": [
"200"
],
"close_fan_the_first_x_layers": [
"3"
],
"compatible_printers": [
"Bambu Lab A1 mini 0.4 nozzle",
"Bambu Lab A1 mini 0.6 nozzle",
"Bambu Lab A1 mini 0.8 nozzle",
"Bambu Lab A1 0.4 nozzle",
"Bambu Lab A1 0.6 nozzle",
"Bambu Lab A1 0.8 nozzle",
"Bambu Lab P1P 0.4 nozzle",
"Bambu Lab P1P 0.6 nozzle",
"Bambu Lab P1P 0.8 nozzle",
"Bambu Lab P1S 0.4 nozzle",
"Bambu Lab P1S 0.6 nozzle",
"Bambu Lab P1S 0.8 nozzle",
"Bambu Lab X1 0.4 nozzle",
"Bambu Lab X1 0.6 nozzle",
"Bambu Lab X1 0.8 nozzle",
"Bambu Lab X1 Carbon 0.4 nozzle",
"Bambu Lab X1 Carbon 0.6 nozzle",
"Bambu Lab X1 Carbon 0.8 nozzle",
"Bambu Lab X1E 0.4 nozzle",
"Bambu Lab X1E 0.6 nozzle",
"Bambu Lab X1E 0.8 nozzle",
"Bambu Lab H2D 0.4 nozzle",
"Bambu Lab H2D 0.6 nozzle",
"Bambu Lab H2D 0.8 nozzle",
"Bambu Lab H2D Pro 0.4 nozzle",
"Bambu Lab H2D Pro 0.6 nozzle",
"Bambu Lab H2D Pro 0.8 nozzle",
"Bambu Lab H2S 0.4 nozzle",
"Bambu Lab H2S 0.6 nozzle",
"Bambu Lab H2S 0.8 nozzle",
"Bambu Lab P2S 0.4 nozzle",
"Bambu Lab P2S 0.6 nozzle",
"Bambu Lab P2S 0.8 nozzle",
"Bambu Lab X2D 0.2 nozzle",
"Bambu Lab X2D 0.4 nozzle",
"Bambu Lab X2D 0.6 nozzle",
"Bambu Lab X2D 0.8 nozzle"
],
"compatible_printers_condition": "",
"compatible_prints": [],
"compatible_prints_condition": "",
"complete_print_exhaust_fan_speed": [
"70"
],
"cool_plate_temp": [
"0"
],
"cool_plate_temp_initial_layer": [
"0"
],
"counter_coef_1": [
"0"
],
"counter_coef_2": [
"0.008"
],
"counter_coef_3": [
"-0.041"
],
"counter_limit_max": [
"0.033"
],
"counter_limit_min": [
"-0.035"
],
"default_filament_colour": [
""
],
"diameter_limit": [
"50"
],
"during_print_exhaust_fan_speed": [
"70"
],
"enable_overhang_bridge_fan": [
"1"
],
"enable_pressure_advance": [
"0"
],
"eng_plate_temp": [
"70"
],
"eng_plate_temp_initial_layer": [
"70"
],
"fan_cooling_layer_time": [
"30"
],
"fan_max_speed": [
"90"
],
"fan_min_speed": [
"40"
],
"filament_adhesiveness_category": [
"300"
],
"filament_change_length": [
"10"
],
"filament_cost": [
"54.5"
],
"filament_density": [
"1.27"
],
"filament_deretraction_speed": [
"nil",
"nil"
],
"filament_diameter": [
"1.75"
],
"filament_end_gcode": [
"; filament end gcode \n"
],
"filament_extruder_variant": [
"Direct Drive Standard"
],
"filament_flow_ratio": [
"0.95",
"0.95"
],
"filament_is_support": [
"0"
],
"filament_long_retractions_when_cut": [
"nil",
"nil"
],
"filament_max_volumetric_speed": [
"8",
"8"
],
"filament_minimal_purge_on_wipe_tower": [
"15"
],
"filament_notes": "File Version:2.6 - V.Pack:18_05_2026",
"filament_pre_cooling_temperature": [
"0",
"0"
],
"filament_prime_volume": [
"45"
],
"filament_ramming_travel_time": [
"0",
"0"
],
"filament_ramming_volumetric_speed": [
"-1",
"-1"
],
"filament_retract_before_wipe": [
"nil",
"nil"
],
"filament_retract_restart_extra": [
"nil"
],
"filament_retract_when_changing_layer": [
"nil",
"nil"
],
"filament_retraction_distances_when_cut": [
"nil",
"nil"
],
"filament_retraction_length": [
"nil",
"nil"
],
"filament_retraction_minimum_travel": [
"nil",
"nil"
],
"filament_retraction_speed": [
"nil",
"nil"
],
"filament_scarf_gap": [
"0%"
],
"filament_scarf_height": [
"10%"
],
"filament_scarf_length": [
"10"
],
"filament_scarf_seam_type": [
"none"
],
"filament_settings_id": [
"addnorth PETG PRO Matte"
],
"filament_shrink": [
"100%"
],
"filament_soluble": [
"0"
],
"filament_start_gcode": [
"; filament start gcode\n{if (bed_temperature[current_extruder] >80)||(bed_temperature_initial_layer[current_extruder] >80)}M106 P3 S255\n{elsif (bed_temperature[current_extruder] >60)||(bed_temperature_initial_layer[current_extruder] >60)}M106 P3 S180\n{endif}\n\n{if activate_air_filtration[current_extruder] && support_air_filtration}\nM106 P3 S{during_print_exhaust_fan_speed_num[current_extruder]} \n{endif}"
],
"filament_type": [
"PETG"
],
"filament_vendor": [
"addnorth"
],
"filament_wipe": [
"nil",
"nil"
],
"filament_wipe_distance": [
"nil",
"nil"
],
"filament_z_hop": [
"nil",
"nil"
],
"filament_z_hop_types": [
"nil",
"nil"
],
"full_fan_speed_layer": [
"0"
],
"hole_coef_1": [
"0"
],
"hole_coef_2": [
"-0.008"
],
"hole_coef_3": [
"0.23415"
],
"hole_limit_max": [
"0.22"
],
"hole_limit_min": [
"0.088"
],
"hot_plate_temp": [
"80"
],
"hot_plate_temp_initial_layer": [
"80"
],
"impact_strength_z": [
"10"
],
"nozzle_temperature": [
"260",
"260"
],
"nozzle_temperature_initial_layer": [
"260",
"260"
],
"nozzle_temperature_range_high": [
"275"
],
"nozzle_temperature_range_low": [
"235"
],
"overhang_fan_speed": [
"90"
],
"overhang_fan_threshold": [
"10%"
],
"overhang_threshold_participating_cooling": [
"95%"
],
"pre_start_fan_time": [
"1"
],
"pressure_advance": [
"0.02"
],
"reduce_fan_stop_start_freq": [
"1"
],
"required_nozzle_HRC": [
"3"
],
"slow_down_for_layer_cooling": [
"1"
],
"slow_down_layer_time": [
"8"
],
"slow_down_min_speed": [
"20"
],
"supertack_plate_temp": [
"70"
],
"supertack_plate_temp_initial_layer": [
"70"
],
"temperature_vitrification": [
"50"
],
"textured_plate_temp": [
"80"
],
"textured_plate_temp_initial_layer": [
"80"
],
"version": "2.0.0.77"
}

View File

@@ -1,339 +0,0 @@
{
"type": "filament",
"name": "addnorth PETG rPETG Matte",
"inherits": "Generic PETG @base",
"from": "system",
"setting_id": "GF_ANRM_00",
"filament_id": "GF_ANRM",
"instantiation": "true",
"activate_air_filtration": [
"0"
],
"additional_cooling_fan_speed": [
"0"
],
"chamber_temperatures": [
"0"
],
"circle_compensation_speed": [
"200"
],
"close_fan_the_first_x_layers": [
"3"
],
"compatible_printers": [
"Bambu Lab A1 mini 0.4 nozzle",
"Bambu Lab A1 mini 0.6 nozzle",
"Bambu Lab A1 mini 0.8 nozzle",
"Bambu Lab A1 0.4 nozzle",
"Bambu Lab A1 0.6 nozzle",
"Bambu Lab A1 0.8 nozzle",
"Bambu Lab P1P 0.4 nozzle",
"Bambu Lab P1P 0.6 nozzle",
"Bambu Lab P1P 0.8 nozzle",
"Bambu Lab P1S 0.4 nozzle",
"Bambu Lab P1S 0.6 nozzle",
"Bambu Lab P1S 0.8 nozzle",
"Bambu Lab X1 0.4 nozzle",
"Bambu Lab X1 0.6 nozzle",
"Bambu Lab X1 0.8 nozzle",
"Bambu Lab X1 Carbon 0.4 nozzle",
"Bambu Lab X1 Carbon 0.6 nozzle",
"Bambu Lab X1 Carbon 0.8 nozzle",
"Bambu Lab X1E 0.4 nozzle",
"Bambu Lab X1E 0.6 nozzle",
"Bambu Lab X1E 0.8 nozzle",
"Bambu Lab H2D 0.4 nozzle",
"Bambu Lab H2D 0.6 nozzle",
"Bambu Lab H2D 0.8 nozzle",
"Bambu Lab H2D Pro 0.4 nozzle",
"Bambu Lab H2D Pro 0.6 nozzle",
"Bambu Lab H2D Pro 0.8 nozzle",
"Bambu Lab H2S 0.4 nozzle",
"Bambu Lab H2S 0.6 nozzle",
"Bambu Lab H2S 0.8 nozzle",
"Bambu Lab P2S 0.4 nozzle",
"Bambu Lab P2S 0.6 nozzle",
"Bambu Lab P2S 0.8 nozzle",
"Bambu Lab X2D 0.2 nozzle",
"Bambu Lab X2D 0.4 nozzle",
"Bambu Lab X2D 0.6 nozzle",
"Bambu Lab X2D 0.8 nozzle"
],
"compatible_printers_condition": "",
"compatible_prints": [],
"compatible_prints_condition": "",
"complete_print_exhaust_fan_speed": [
"70"
],
"cool_plate_temp": [
"0"
],
"cool_plate_temp_initial_layer": [
"0"
],
"counter_coef_1": [
"0"
],
"counter_coef_2": [
"0.008"
],
"counter_coef_3": [
"-0.041"
],
"counter_limit_max": [
"0.033"
],
"counter_limit_min": [
"-0.035"
],
"default_filament_colour": [
""
],
"diameter_limit": [
"50"
],
"during_print_exhaust_fan_speed": [
"70"
],
"enable_overhang_bridge_fan": [
"1"
],
"enable_pressure_advance": [
"0"
],
"eng_plate_temp": [
"70"
],
"eng_plate_temp_initial_layer": [
"70"
],
"fan_cooling_layer_time": [
"30"
],
"fan_max_speed": [
"90"
],
"fan_min_speed": [
"40"
],
"filament_adhesiveness_category": [
"300"
],
"filament_change_length": [
"10"
],
"filament_cost": [
"36"
],
"filament_density": [
"1.27"
],
"filament_deretraction_speed": [
"nil",
"nil"
],
"filament_diameter": [
"1.75"
],
"filament_end_gcode": [
"; filament end gcode \n"
],
"filament_extruder_variant": [
"Direct Drive Standard"
],
"filament_flow_ratio": [
"0.95",
"0.95"
],
"filament_is_support": [
"0"
],
"filament_long_retractions_when_cut": [
"nil",
"nil"
],
"filament_max_volumetric_speed": [
"10",
"10"
],
"filament_minimal_purge_on_wipe_tower": [
"15"
],
"filament_notes": "File Version:2.6 - V.Pack:18_05_2026",
"filament_pre_cooling_temperature": [
"0",
"0"
],
"filament_prime_volume": [
"45"
],
"filament_ramming_travel_time": [
"0",
"0"
],
"filament_ramming_volumetric_speed": [
"-1",
"-1"
],
"filament_retract_before_wipe": [
"nil",
"nil"
],
"filament_retract_restart_extra": [
"nil"
],
"filament_retract_when_changing_layer": [
"nil",
"nil"
],
"filament_retraction_distances_when_cut": [
"nil",
"nil"
],
"filament_retraction_length": [
"nil",
"nil"
],
"filament_retraction_minimum_travel": [
"nil",
"nil"
],
"filament_retraction_speed": [
"nil",
"nil"
],
"filament_scarf_gap": [
"0%"
],
"filament_scarf_height": [
"10%"
],
"filament_scarf_length": [
"10"
],
"filament_scarf_seam_type": [
"none"
],
"filament_settings_id": [
"addnorth PETG rPETG Matte"
],
"filament_shrink": [
"100%"
],
"filament_soluble": [
"0"
],
"filament_start_gcode": [
"; filament start gcode\n{if (bed_temperature[current_extruder] >80)||(bed_temperature_initial_layer[current_extruder] >80)}M106 P3 S255\n{elsif (bed_temperature[current_extruder] >60)||(bed_temperature_initial_layer[current_extruder] >60)}M106 P3 S180\n{endif}\n\n{if activate_air_filtration[current_extruder] && support_air_filtration}\nM106 P3 S{during_print_exhaust_fan_speed_num[current_extruder]} \n{endif}"
],
"filament_type": [
"PETG"
],
"filament_vendor": [
"addnorth"
],
"filament_wipe": [
"nil",
"nil"
],
"filament_wipe_distance": [
"nil",
"nil"
],
"filament_z_hop": [
"nil",
"nil"
],
"filament_z_hop_types": [
"nil",
"nil"
],
"full_fan_speed_layer": [
"0"
],
"hole_coef_1": [
"0"
],
"hole_coef_2": [
"-0.008"
],
"hole_coef_3": [
"0.23415"
],
"hole_limit_max": [
"0.22"
],
"hole_limit_min": [
"0.088"
],
"hot_plate_temp": [
"80"
],
"hot_plate_temp_initial_layer": [
"80"
],
"impact_strength_z": [
"10"
],
"nozzle_temperature": [
"260",
"260"
],
"nozzle_temperature_initial_layer": [
"255",
"255"
],
"nozzle_temperature_range_high": [
"260"
],
"nozzle_temperature_range_low": [
"225"
],
"overhang_fan_speed": [
"90"
],
"overhang_fan_threshold": [
"10%"
],
"overhang_threshold_participating_cooling": [
"95%"
],
"pre_start_fan_time": [
"2"
],
"pressure_advance": [
"0.02"
],
"reduce_fan_stop_start_freq": [
"1"
],
"required_nozzle_HRC": [
"3"
],
"slow_down_for_layer_cooling": [
"1"
],
"slow_down_layer_time": [
"8"
],
"slow_down_min_speed": [
"20"
],
"supertack_plate_temp": [
"70"
],
"supertack_plate_temp_initial_layer": [
"70"
],
"temperature_vitrification": [
"50"
],
"textured_plate_temp": [
"75"
],
"textured_plate_temp_initial_layer": [
"75"
],
"version": "2.0.0.77"
}

View File

@@ -1,339 +0,0 @@
{
"type": "filament",
"name": "addnorth PETG-CF Rigid X",
"inherits": "Generic PETG-CF @base",
"from": "system",
"setting_id": "GF_ANRX_00",
"filament_id": "GF_ANRX",
"instantiation": "true",
"activate_air_filtration": [
"0"
],
"additional_cooling_fan_speed": [
"100"
],
"chamber_temperatures": [
"0"
],
"circle_compensation_speed": [
"200"
],
"close_fan_the_first_x_layers": [
"3"
],
"compatible_printers": [
"Bambu Lab A1 mini 0.4 nozzle",
"Bambu Lab A1 mini 0.6 nozzle",
"Bambu Lab A1 mini 0.8 nozzle",
"Bambu Lab A1 0.4 nozzle",
"Bambu Lab A1 0.6 nozzle",
"Bambu Lab A1 0.8 nozzle",
"Bambu Lab P1P 0.4 nozzle",
"Bambu Lab P1P 0.6 nozzle",
"Bambu Lab P1P 0.8 nozzle",
"Bambu Lab P1S 0.4 nozzle",
"Bambu Lab P1S 0.6 nozzle",
"Bambu Lab P1S 0.8 nozzle",
"Bambu Lab X1 0.4 nozzle",
"Bambu Lab X1 0.6 nozzle",
"Bambu Lab X1 0.8 nozzle",
"Bambu Lab X1 Carbon 0.4 nozzle",
"Bambu Lab X1 Carbon 0.6 nozzle",
"Bambu Lab X1 Carbon 0.8 nozzle",
"Bambu Lab X1E 0.4 nozzle",
"Bambu Lab X1E 0.6 nozzle",
"Bambu Lab X1E 0.8 nozzle",
"Bambu Lab H2D 0.4 nozzle",
"Bambu Lab H2D 0.6 nozzle",
"Bambu Lab H2D 0.8 nozzle",
"Bambu Lab H2D Pro 0.4 nozzle",
"Bambu Lab H2D Pro 0.6 nozzle",
"Bambu Lab H2D Pro 0.8 nozzle",
"Bambu Lab H2S 0.4 nozzle",
"Bambu Lab H2S 0.6 nozzle",
"Bambu Lab H2S 0.8 nozzle",
"Bambu Lab P2S 0.4 nozzle",
"Bambu Lab P2S 0.6 nozzle",
"Bambu Lab P2S 0.8 nozzle",
"Bambu Lab X2D 0.2 nozzle",
"Bambu Lab X2D 0.4 nozzle",
"Bambu Lab X2D 0.6 nozzle",
"Bambu Lab X2D 0.8 nozzle"
],
"compatible_printers_condition": "",
"compatible_prints": [],
"compatible_prints_condition": "",
"complete_print_exhaust_fan_speed": [
"70"
],
"cool_plate_temp": [
"0"
],
"cool_plate_temp_initial_layer": [
"0"
],
"counter_coef_1": [
"0"
],
"counter_coef_2": [
"0.008"
],
"counter_coef_3": [
"-0.041"
],
"counter_limit_max": [
"0.033"
],
"counter_limit_min": [
"-0.035"
],
"default_filament_colour": [
""
],
"diameter_limit": [
"50"
],
"during_print_exhaust_fan_speed": [
"70"
],
"enable_overhang_bridge_fan": [
"1"
],
"enable_pressure_advance": [
"0"
],
"eng_plate_temp": [
"70"
],
"eng_plate_temp_initial_layer": [
"70"
],
"fan_cooling_layer_time": [
"30"
],
"fan_max_speed": [
"100"
],
"fan_min_speed": [
"5"
],
"filament_adhesiveness_category": [
"300"
],
"filament_change_length": [
"10"
],
"filament_cost": [
"82"
],
"filament_density": [
"1.3"
],
"filament_deretraction_speed": [
"nil",
"nil"
],
"filament_diameter": [
"1.75"
],
"filament_end_gcode": [
"; filament end gcode \n"
],
"filament_extruder_variant": [
"Direct Drive Standard"
],
"filament_flow_ratio": [
"0.95",
"0.95"
],
"filament_is_support": [
"0"
],
"filament_long_retractions_when_cut": [
"nil",
"nil"
],
"filament_max_volumetric_speed": [
"8",
"11"
],
"filament_minimal_purge_on_wipe_tower": [
"15"
],
"filament_notes": "File Version:2.6 - V.Pack:18_05_2026 Special thanks to Mats.Z (3DP24, Jonkoping University / Campus Varnamo) for profile improvements during internship autumn 2025.",
"filament_pre_cooling_temperature": [
"0",
"0"
],
"filament_prime_volume": [
"45"
],
"filament_ramming_travel_time": [
"0",
"0"
],
"filament_ramming_volumetric_speed": [
"-1",
"-1"
],
"filament_retract_before_wipe": [
"nil",
"nil"
],
"filament_retract_restart_extra": [
"nil"
],
"filament_retract_when_changing_layer": [
"nil",
"nil"
],
"filament_retraction_distances_when_cut": [
"nil",
"nil"
],
"filament_retraction_length": [
"nil",
"nil"
],
"filament_retraction_minimum_travel": [
"nil",
"nil"
],
"filament_retraction_speed": [
"nil",
"nil"
],
"filament_scarf_gap": [
"0%"
],
"filament_scarf_height": [
"10%"
],
"filament_scarf_length": [
"10"
],
"filament_scarf_seam_type": [
"none"
],
"filament_settings_id": [
"addnorth PETG-CF Rigid X"
],
"filament_shrink": [
"100%"
],
"filament_soluble": [
"0"
],
"filament_start_gcode": [
"; filament start gcode\n{if (bed_temperature[current_extruder] >80)||(bed_temperature_initial_layer[current_extruder] >80)}M106 P3 S255\n{elsif (bed_temperature[current_extruder] >60)||(bed_temperature_initial_layer[current_extruder] >60)}M106 P3 S180\n{endif}\n\n{if activate_air_filtration[current_extruder] && support_air_filtration}\nM106 P3 S{during_print_exhaust_fan_speed_num[current_extruder]} \n{endif}"
],
"filament_type": [
"PETG-CF"
],
"filament_vendor": [
"addnorth"
],
"filament_wipe": [
"nil",
"nil"
],
"filament_wipe_distance": [
"nil",
"nil"
],
"filament_z_hop": [
"0.4",
"0.4"
],
"filament_z_hop_types": [
"nil",
"nil"
],
"full_fan_speed_layer": [
"0"
],
"hole_coef_1": [
"0"
],
"hole_coef_2": [
"-0.008"
],
"hole_coef_3": [
"0.23415"
],
"hole_limit_max": [
"0.22"
],
"hole_limit_min": [
"0.088"
],
"hot_plate_temp": [
"80"
],
"hot_plate_temp_initial_layer": [
"80"
],
"impact_strength_z": [
"10"
],
"nozzle_temperature": [
"270",
"270"
],
"nozzle_temperature_initial_layer": [
"270",
"270"
],
"nozzle_temperature_range_high": [
"275"
],
"nozzle_temperature_range_low": [
"245"
],
"overhang_fan_speed": [
"100"
],
"overhang_fan_threshold": [
"10%"
],
"overhang_threshold_participating_cooling": [
"95%"
],
"pre_start_fan_time": [
"0"
],
"pressure_advance": [
"0.02"
],
"reduce_fan_stop_start_freq": [
"1"
],
"required_nozzle_HRC": [
"40"
],
"slow_down_for_layer_cooling": [
"1"
],
"slow_down_layer_time": [
"6"
],
"slow_down_min_speed": [
"40"
],
"supertack_plate_temp": [
"70"
],
"supertack_plate_temp_initial_layer": [
"70"
],
"temperature_vitrification": [
"50"
],
"textured_plate_temp": [
"80"
],
"textured_plate_temp_initial_layer": [
"80"
],
"version": "2.0.0.77"
}

View File

@@ -1,339 +0,0 @@
{
"type": "filament",
"name": "addnorth PLA E-PLA",
"inherits": "Generic PLA @base",
"from": "system",
"setting_id": "GF_ANEP_00",
"filament_id": "GF_ANEP",
"instantiation": "true",
"activate_air_filtration": [
"0"
],
"additional_cooling_fan_speed": [
"70"
],
"chamber_temperatures": [
"0"
],
"circle_compensation_speed": [
"200"
],
"close_fan_the_first_x_layers": [
"1"
],
"compatible_printers": [
"Bambu Lab A1 mini 0.4 nozzle",
"Bambu Lab A1 mini 0.6 nozzle",
"Bambu Lab A1 mini 0.8 nozzle",
"Bambu Lab A1 0.4 nozzle",
"Bambu Lab A1 0.6 nozzle",
"Bambu Lab A1 0.8 nozzle",
"Bambu Lab P1P 0.4 nozzle",
"Bambu Lab P1P 0.6 nozzle",
"Bambu Lab P1P 0.8 nozzle",
"Bambu Lab P1S 0.4 nozzle",
"Bambu Lab P1S 0.6 nozzle",
"Bambu Lab P1S 0.8 nozzle",
"Bambu Lab X1 0.4 nozzle",
"Bambu Lab X1 0.6 nozzle",
"Bambu Lab X1 0.8 nozzle",
"Bambu Lab X1 Carbon 0.4 nozzle",
"Bambu Lab X1 Carbon 0.6 nozzle",
"Bambu Lab X1 Carbon 0.8 nozzle",
"Bambu Lab X1E 0.4 nozzle",
"Bambu Lab X1E 0.6 nozzle",
"Bambu Lab X1E 0.8 nozzle",
"Bambu Lab H2D 0.4 nozzle",
"Bambu Lab H2D 0.6 nozzle",
"Bambu Lab H2D 0.8 nozzle",
"Bambu Lab H2D Pro 0.4 nozzle",
"Bambu Lab H2D Pro 0.6 nozzle",
"Bambu Lab H2D Pro 0.8 nozzle",
"Bambu Lab H2S 0.4 nozzle",
"Bambu Lab H2S 0.6 nozzle",
"Bambu Lab H2S 0.8 nozzle",
"Bambu Lab P2S 0.4 nozzle",
"Bambu Lab P2S 0.6 nozzle",
"Bambu Lab P2S 0.8 nozzle",
"Bambu Lab X2D 0.2 nozzle",
"Bambu Lab X2D 0.4 nozzle",
"Bambu Lab X2D 0.6 nozzle",
"Bambu Lab X2D 0.8 nozzle"
],
"compatible_printers_condition": "",
"compatible_prints": [],
"compatible_prints_condition": "",
"complete_print_exhaust_fan_speed": [
"70"
],
"cool_plate_temp": [
"55"
],
"cool_plate_temp_initial_layer": [
"5"
],
"counter_coef_1": [
"0"
],
"counter_coef_2": [
"0.008"
],
"counter_coef_3": [
"-0.041"
],
"counter_limit_max": [
"0.033"
],
"counter_limit_min": [
"-0.035"
],
"default_filament_colour": [
""
],
"diameter_limit": [
"50"
],
"during_print_exhaust_fan_speed": [
"70"
],
"enable_overhang_bridge_fan": [
"1"
],
"enable_pressure_advance": [
"0"
],
"eng_plate_temp": [
"0"
],
"eng_plate_temp_initial_layer": [
"0"
],
"fan_cooling_layer_time": [
"100"
],
"fan_max_speed": [
"100"
],
"fan_min_speed": [
"100"
],
"filament_adhesiveness_category": [
"100"
],
"filament_change_length": [
"10"
],
"filament_cost": [
"20"
],
"filament_density": [
"1.24"
],
"filament_deretraction_speed": [
"nil",
"nil"
],
"filament_diameter": [
"1.75"
],
"filament_end_gcode": [
"; filament end gcode \n"
],
"filament_extruder_variant": [
"Direct Drive Standard"
],
"filament_flow_ratio": [
"0.98",
"0.98"
],
"filament_is_support": [
"0"
],
"filament_long_retractions_when_cut": [
"nil",
"nil"
],
"filament_max_volumetric_speed": [
"12",
"12"
],
"filament_minimal_purge_on_wipe_tower": [
"15"
],
"filament_notes": "File Version:2.7 - V.Pack:18_05_2026",
"filament_pre_cooling_temperature": [
"0",
"0"
],
"filament_prime_volume": [
"45"
],
"filament_ramming_travel_time": [
"0",
"0"
],
"filament_ramming_volumetric_speed": [
"-1",
"-1"
],
"filament_retract_before_wipe": [
"nil",
"nil"
],
"filament_retract_restart_extra": [
"nil"
],
"filament_retract_when_changing_layer": [
"nil",
"nil"
],
"filament_retraction_distances_when_cut": [
"nil",
"nil"
],
"filament_retraction_length": [
"nil",
"nil"
],
"filament_retraction_minimum_travel": [
"nil",
"nil"
],
"filament_retraction_speed": [
"nil",
"nil"
],
"filament_scarf_gap": [
"15%"
],
"filament_scarf_height": [
"10%"
],
"filament_scarf_length": [
"10"
],
"filament_scarf_seam_type": [
"none"
],
"filament_settings_id": [
"addnorth PLA E-PLA"
],
"filament_shrink": [
"100%"
],
"filament_soluble": [
"0"
],
"filament_start_gcode": [
"; filament start gcode {if (bed_temperature[current_extruder] >55)||(bed_temperature_initial_layer[current_extruder] >55)}M106 P3 S200 {elsif(bed_temperature[current_extruder] >50)||(bed_temperature_initial_layer[current_extruder] >50)}M106 P3 S150 {elsif(bed_temperature[current_extruder] >45)||(bed_temperature_initial_layer[current_extruder] >45)}M106 P3 S50 {endif} {if activate_air_filtration[current_extruder] && support_air_filtration} M106 P3 S{during_print_exhaust_fan_speed_num[current_extruder]} {endif}"
],
"filament_type": [
"PLA"
],
"filament_vendor": [
"addnorth"
],
"filament_wipe": [
"nil",
"nil"
],
"filament_wipe_distance": [
"nil",
"nil"
],
"filament_z_hop": [
"nil",
"nil"
],
"filament_z_hop_types": [
"nil",
"nil"
],
"full_fan_speed_layer": [
"0"
],
"hole_coef_1": [
"0"
],
"hole_coef_2": [
"-0.008"
],
"hole_coef_3": [
"0.23415"
],
"hole_limit_max": [
"0.22"
],
"hole_limit_min": [
"0.088"
],
"hot_plate_temp": [
"55"
],
"hot_plate_temp_initial_layer": [
"55"
],
"impact_strength_z": [
"10"
],
"nozzle_temperature": [
"240",
"240"
],
"nozzle_temperature_initial_layer": [
"235",
"235"
],
"nozzle_temperature_range_high": [
"240"
],
"nozzle_temperature_range_low": [
"190"
],
"overhang_fan_speed": [
"100"
],
"overhang_fan_threshold": [
"50%"
],
"overhang_threshold_participating_cooling": [
"95%"
],
"pre_start_fan_time": [
"2"
],
"pressure_advance": [
"0.02"
],
"reduce_fan_stop_start_freq": [
"1"
],
"required_nozzle_HRC": [
"3"
],
"slow_down_for_layer_cooling": [
"1"
],
"slow_down_layer_time": [
"8"
],
"slow_down_min_speed": [
"20"
],
"supertack_plate_temp": [
"45"
],
"supertack_plate_temp_initial_layer": [
"45"
],
"temperature_vitrification": [
"50"
],
"textured_plate_temp": [
"65"
],
"textured_plate_temp_initial_layer": [
"65"
],
"version": "2.0.0.77"
}

View File

@@ -1,339 +0,0 @@
{
"type": "filament",
"name": "addnorth PLA Economy",
"inherits": "Generic PLA @base",
"from": "system",
"setting_id": "GF_ANPL_00",
"filament_id": "GF_ANPL",
"instantiation": "true",
"activate_air_filtration": [
"0"
],
"additional_cooling_fan_speed": [
"70"
],
"chamber_temperatures": [
"0"
],
"circle_compensation_speed": [
"200"
],
"close_fan_the_first_x_layers": [
"1"
],
"compatible_printers": [
"Bambu Lab A1 mini 0.4 nozzle",
"Bambu Lab A1 mini 0.6 nozzle",
"Bambu Lab A1 mini 0.8 nozzle",
"Bambu Lab A1 0.4 nozzle",
"Bambu Lab A1 0.6 nozzle",
"Bambu Lab A1 0.8 nozzle",
"Bambu Lab P1P 0.4 nozzle",
"Bambu Lab P1P 0.6 nozzle",
"Bambu Lab P1P 0.8 nozzle",
"Bambu Lab P1S 0.4 nozzle",
"Bambu Lab P1S 0.6 nozzle",
"Bambu Lab P1S 0.8 nozzle",
"Bambu Lab X1 0.4 nozzle",
"Bambu Lab X1 0.6 nozzle",
"Bambu Lab X1 0.8 nozzle",
"Bambu Lab X1 Carbon 0.4 nozzle",
"Bambu Lab X1 Carbon 0.6 nozzle",
"Bambu Lab X1 Carbon 0.8 nozzle",
"Bambu Lab X1E 0.4 nozzle",
"Bambu Lab X1E 0.6 nozzle",
"Bambu Lab X1E 0.8 nozzle",
"Bambu Lab H2D 0.4 nozzle",
"Bambu Lab H2D 0.6 nozzle",
"Bambu Lab H2D 0.8 nozzle",
"Bambu Lab H2D Pro 0.4 nozzle",
"Bambu Lab H2D Pro 0.6 nozzle",
"Bambu Lab H2D Pro 0.8 nozzle",
"Bambu Lab H2S 0.4 nozzle",
"Bambu Lab H2S 0.6 nozzle",
"Bambu Lab H2S 0.8 nozzle",
"Bambu Lab P2S 0.4 nozzle",
"Bambu Lab P2S 0.6 nozzle",
"Bambu Lab P2S 0.8 nozzle",
"Bambu Lab X2D 0.2 nozzle",
"Bambu Lab X2D 0.4 nozzle",
"Bambu Lab X2D 0.6 nozzle",
"Bambu Lab X2D 0.8 nozzle"
],
"compatible_printers_condition": "",
"compatible_prints": [],
"compatible_prints_condition": "",
"complete_print_exhaust_fan_speed": [
"70"
],
"cool_plate_temp": [
"55"
],
"cool_plate_temp_initial_layer": [
"55"
],
"counter_coef_1": [
"0"
],
"counter_coef_2": [
"0.008"
],
"counter_coef_3": [
"-0.041"
],
"counter_limit_max": [
"0.033"
],
"counter_limit_min": [
"-0.035"
],
"default_filament_colour": [
""
],
"diameter_limit": [
"50"
],
"during_print_exhaust_fan_speed": [
"70"
],
"enable_overhang_bridge_fan": [
"1"
],
"enable_pressure_advance": [
"0"
],
"eng_plate_temp": [
"0"
],
"eng_plate_temp_initial_layer": [
"0"
],
"fan_cooling_layer_time": [
"100"
],
"fan_max_speed": [
"100"
],
"fan_min_speed": [
"100"
],
"filament_adhesiveness_category": [
"100"
],
"filament_change_length": [
"10"
],
"filament_cost": [
"23"
],
"filament_density": [
"1.24"
],
"filament_deretraction_speed": [
"nil",
"nil"
],
"filament_diameter": [
"1.75"
],
"filament_end_gcode": [
"; filament end gcode \n"
],
"filament_extruder_variant": [
"Direct Drive Standard"
],
"filament_flow_ratio": [
"0.98",
"0.98"
],
"filament_is_support": [
"0"
],
"filament_long_retractions_when_cut": [
"nil",
"nil"
],
"filament_max_volumetric_speed": [
"12",
"12"
],
"filament_minimal_purge_on_wipe_tower": [
"15"
],
"filament_notes": "File Version:2.6 - V.Pack:18_05_2026",
"filament_pre_cooling_temperature": [
"0",
"0"
],
"filament_prime_volume": [
"45"
],
"filament_ramming_travel_time": [
"0",
"0"
],
"filament_ramming_volumetric_speed": [
"-1",
"-1"
],
"filament_retract_before_wipe": [
"nil",
"nil"
],
"filament_retract_restart_extra": [
"nil"
],
"filament_retract_when_changing_layer": [
"nil",
"nil"
],
"filament_retraction_distances_when_cut": [
"nil",
"nil"
],
"filament_retraction_length": [
"nil",
"nil"
],
"filament_retraction_minimum_travel": [
"nil",
"nil"
],
"filament_retraction_speed": [
"nil",
"nil"
],
"filament_scarf_gap": [
"15%"
],
"filament_scarf_height": [
"10%"
],
"filament_scarf_length": [
"10"
],
"filament_scarf_seam_type": [
"none"
],
"filament_settings_id": [
"addnorth PLA Economy"
],
"filament_shrink": [
"100%"
],
"filament_soluble": [
"0"
],
"filament_start_gcode": [
"; filament start gcode {if (bed_temperature[current_extruder] >55)||(bed_temperature_initial_layer[current_extruder] >55)}M106 P3 S200 {elsif(bed_temperature[current_extruder] >50)||(bed_temperature_initial_layer[current_extruder] >50)}M106 P3 S150 {elsif(bed_temperature[current_extruder] >45)||(bed_temperature_initial_layer[current_extruder] >45)}M106 P3 S50 {endif} {if activate_air_filtration[current_extruder] && support_air_filtration} M106 P3 S{during_print_exhaust_fan_speed_num[current_extruder]} {endif}"
],
"filament_type": [
"PLA"
],
"filament_vendor": [
"addnorth"
],
"filament_wipe": [
"nil",
"nil"
],
"filament_wipe_distance": [
"nil",
"nil"
],
"filament_z_hop": [
"nil",
"nil"
],
"filament_z_hop_types": [
"nil",
"nil"
],
"full_fan_speed_layer": [
"0"
],
"hole_coef_1": [
"0"
],
"hole_coef_2": [
"-0.008"
],
"hole_coef_3": [
"0.23415"
],
"hole_limit_max": [
"0.22"
],
"hole_limit_min": [
"0.088"
],
"hot_plate_temp": [
"60"
],
"hot_plate_temp_initial_layer": [
"60"
],
"impact_strength_z": [
"10"
],
"nozzle_temperature": [
"240",
"240"
],
"nozzle_temperature_initial_layer": [
"235",
"235"
],
"nozzle_temperature_range_high": [
"240"
],
"nozzle_temperature_range_low": [
"200"
],
"overhang_fan_speed": [
"100"
],
"overhang_fan_threshold": [
"25%"
],
"overhang_threshold_participating_cooling": [
"95%"
],
"pre_start_fan_time": [
"2"
],
"pressure_advance": [
"0.02"
],
"reduce_fan_stop_start_freq": [
"1"
],
"required_nozzle_HRC": [
"3"
],
"slow_down_for_layer_cooling": [
"1"
],
"slow_down_layer_time": [
"8"
],
"slow_down_min_speed": [
"20"
],
"supertack_plate_temp": [
"45"
],
"supertack_plate_temp_initial_layer": [
"45"
],
"temperature_vitrification": [
"50"
],
"textured_plate_temp": [
"65"
],
"textured_plate_temp_initial_layer": [
"65"
],
"version": "2.0.0.77"
}

Some files were not shown because too many files have changed in this diff Show More