josh
/
Prusa-Firmware
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

PT1000 Thermistor

This commit is contained in:
DJsupreme98 2025-09-28 11:06:21 +01:00 committed by GitHub
parent f3e0dfd481
commit e07d27e2e0
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 122 additions and 138 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

248
.github/workflows/build.yml vendored
View File

@ -3,13 +3,13 @@ name: ci-build
on: on:
pull_request: pull_request:
branches: branches:
- '*' - '*'
push: push:
branches: [ MK3, MK3_* ] branches: [ MK3, MK3_* ]
tags: tags:
- 'v*' - 'v*'
- 't*' - 't*'
- 'c*' - 'c*'
env: env:
GH_ANNOTATIONS: 1 GH_ANNOTATIONS: 1
@ -18,161 +18,151 @@ jobs:
build: build:
runs-on: ubuntu-latest runs-on: ubuntu-latest
steps: steps:
# setup base required dependencies
# setup base required dependencies - name: Setup dependencies
- name: Setup dependencies run: |
run: |
sudo apt-get update sudo apt-get update
sudo apt-get install cmake ninja-build python3-pyelftools python3-regex python3-polib sudo apt-get install -y cmake ninja-build python3-pyelftools python3-regex python3-polib gcc-avr binutils-avr avr-libc
# Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it # checkout for PRs
- name: Checkout ${{ github.event.pull_request.head.ref }} - name: Checkout ${{ github.event.pull_request.head.ref }}
uses: actions/checkout@v4 uses: actions/checkout@v4
if: ${{ github.event.pull_request }} if: ${{ github.event.pull_request }}
with: with:
ref: ${{ github.event.pull_request.head.sha }} ref: ${{ github.event.pull_request.head.sha }}
submodules: true submodules: true
fetch-depth: 0 fetch-depth: 0
- name: Checkout ${{ github.event.ref }} # checkout for pushes/tags
uses: actions/checkout@v4 - name: Checkout ${{ github.event.ref }}
if: ${{ !github.event.pull_request }} uses: actions/checkout@v4
with: if: ${{ !github.event.pull_request }}
ref: ${{ github.event.ref }} with:
submodules: true ref: ${{ github.event.ref }}
fetch-depth: 0 submodules: true
fetch-depth: 0
- name: Cache Dependencies - name: Cache Dependencies
uses: actions/cache@v4 uses: actions/cache@v4
id: cache-pkgs id: cache-pkgs
with: with:
path: ".dependencies" path: ".dependencies"
key: "build-deps-1_0_0-linux" key: "build-deps-1_0_0-linux"
- name: Setup build dependencies - name: Setup build dependencies
run: | run: ./utils/bootstrap.py
./utils/bootstrap.py
- name: Cache permissions - name: Cache permissions
run: sudo chmod -R 744 .dependencies run: sudo chmod -R 744 .dependencies
- name: Build - name: Build
run: | run: |
mkdir build mkdir -p build
cd build cd build
cmake .. -DCMAKE_TOOLCHAIN_FILE="../cmake/AvrGcc.cmake" -DCMAKE_BUILD_TYPE=Release -G Ninja cmake .. -DCMAKE_TOOLCHAIN_FILE="../cmake/AvrGcc.cmake" -DCMAKE_BUILD_TYPE=Release -G Ninja
ninja ninja
- name: Upload artifacts # NEW: collect any hex produced anywhere under the workspace
if: ${{ !github.event.pull_request }} - name: Collect HEX files
uses: actions/upload-artifact@v4 if: ${{ !github.event.pull_request }}
with: run: |
name: Firmware mkdir -p out
path: build/*.hex # copy top-level build hexes
find build -maxdepth 2 -type f -name "*.hex" -print -exec cp {} out/ \;
# copy any other hexes (fallback)
find . -type f -name "*.hex" -print -exec cp {} out/ \;
ls -l out || true
- name: RELEASE THE KRAKEN - name: Upload artifacts
if: startsWith(github.ref, 'refs/tags/v') || startsWith(github.ref, 'refs/tags/t') || startsWith(github.ref, 'refs/tags/c') if: ${{ !github.event.pull_request }}
uses: "marvinpinto/action-automatic-releases@latest" uses: actions/upload-artifact@v4
with: with:
repo_token: "${{ secrets.GITHUB_TOKEN }}" name: Firmware
automatic_release_tag: ${{ github.ref_name }} path: out/*.hex
draft: true
files: | - name: RELEASE THE KRAKEN
${{ github.workspace }}/build/release/*.hex if: startsWith(github.ref, 'refs/tags/v') || startsWith(github.ref, 'refs/tags/t') || startsWith(github.ref, 'refs/tags/c')
${{ github.workspace }}/build/release/*.zip uses: marvinpinto/action-automatic-releases@latest
with:
repo_token: "${{ secrets.GITHUB_TOKEN }}"
automatic_release_tag: ${{ github.ref_name }}
draft: true
files: |
${{ github.workspace }}/build/release/*.hex
${{ github.workspace }}/build/release/*.zip
check-lang: check-lang:
runs-on: ubuntu-latest runs-on: ubuntu-latest
steps: steps:
# setup base required dependencies - name: Setup dependencies
- name: Setup dependencies run: |
run: |
sudo apt-get update sudo apt-get update
sudo apt-get install gcc-11 g++11 lcov cmake ninja-build python3-pyelftools python3-regex python3-polib sudo apt-get install -y gcc-11 g++-11 lcov cmake ninja-build python3-pyelftools python3-regex python3-polib
- name: Checkout ${{ github.event.pull_request.head.ref }}
# Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it uses: actions/checkout@v4
- name: Checkout ${{ github.event.pull_request.head.ref }} if: ${{ github.event.pull_request }}
uses: actions/checkout@v4 with:
if: ${{ github.event.pull_request }} ref: ${{ github.event.pull_request.head.sha }}
with: submodules: true
ref: ${{ github.event.pull_request.head.sha }} fetch-depth: 0
submodules: true - name: Checkout ${{ github.event.ref }}
fetch-depth: 0 uses: actions/checkout@v4
if: ${{ !github.event.pull_request }}
- name: Checkout ${{ github.event.ref }} with:
uses: actions/checkout@v4 ref: ${{ github.event.ref }}
if: ${{ !github.event.pull_request }} submodules: true
with: fetch-depth: 0
ref: ${{ github.event.ref }} - name: Cache Dependencies
submodules: true uses: actions/cache@v4
fetch-depth: 0 id: cache-pkgs
with:
- name: Cache Dependencies
uses: actions/cache@v4
id: cache-pkgs
with:
path: ".dependencies" path: ".dependencies"
key: "build-deps-1_0_0-linux" key: "build-deps-1_0_0-linux"
- name: Setup build dependencies
- name: Setup build dependencies run: ./utils/bootstrap.py
run: | - name: Cache permissions
./utils/bootstrap.py run: sudo chmod -R 744 .dependencies
- name: Run check
- name: Cache permissions run: |
run: sudo chmod -R 744 .dependencies mkdir -p build
- name: Run check
run: |
mkdir build
cd build cd build
cmake .. -G Ninja -DCMAKE_TOOLCHAIN_FILE="../cmake/AvrGcc.cmake" -DCMAKE_BUILD_TYPE=Release -G Ninja cmake .. -G Ninja -DCMAKE_TOOLCHAIN_FILE="../cmake/AvrGcc.cmake" -DCMAKE_BUILD_TYPE=Release
ninja check_lang ninja check_lang
tests: tests:
runs-on: ubuntu-latest runs-on: ubuntu-latest
steps: steps:
# setup base required dependencies - name: Setup dependencies
- name: Setup dependencies run: |
run: |
sudo apt-get update sudo apt-get update
sudo apt-get install gcc-11 g++11 lcov cmake ninja-build python3-pyelftools python3-regex python3-polib sudo apt-get install -y gcc-11 g++-11 lcov cmake ninja-build python3-pyelftools python3-regex python3-polib
- name: Checkout ${{ github.event.pull_request.head.ref }}
# Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it uses: actions/checkout@v4
- name: Checkout ${{ github.event.pull_request.head.ref }} if: ${{ github.event.pull_request }}
uses: actions/checkout@v4 with:
if: ${{ github.event.pull_request }} ref: ${{ github.event.pull_request.head.sha }}
with: submodules: true
ref: ${{ github.event.pull_request.head.sha }} fetch-depth: 0
submodules: true - name: Checkout ${{ github.event.ref }}
fetch-depth: 0 uses: actions/checkout@v4
if: ${{ !github.event.pull_request }}
- name: Checkout ${{ github.event.ref }} with:
uses: actions/checkout@v4 ref: ${{ github.event.ref }}
if: ${{ !github.event.pull_request }} submodules: true
with: fetch-depth: 0
ref: ${{ github.event.ref }} - name: Cache Dependencies
submodules: true uses: actions/cache@v4
fetch-depth: 0 id: cache-pkgs
with:
- name: Cache Dependencies
uses: actions/cache@v4
id: cache-pkgs
with:
path: ".dependencies" path: ".dependencies"
key: "build-deps-1_0_0-linux" key: "build-deps-1_0_0-linux"
- name: Setup build dependencies
- name: Setup build dependencies run: ./utils/bootstrap.py
run: | - name: Cache permissions
./utils/bootstrap.py run: sudo chmod -R 744 .dependencies
- name: Run check
- name: Cache permissions run: |
run: sudo chmod -R 744 .dependencies mkdir -p build
- name: Run check
run: |
mkdir build
cd build cd build
cmake .. -G Ninja cmake .. -G Ninja
ninja test_run_all ninja test_run_all

12
Firmware/variants/MK3S-E3DREVO.h
View File

@ -599,15 +599,9 @@
// 247 is Pt100 with 4k7 pullup and PT100 Amplifier // 247 is Pt100 with 4k7 pullup and PT100 Amplifier
// 110 is Pt100 with 1k pullup (non standard) // 110 is Pt100 with 1k pullup (non standard)
#if defined(E3D_PT100_EXTRUDER_WITH_AMP) // Revo with PT1000 thermistor on Einsy (4.7k pull-up)
#define TEMP_SENSOR_0 247 #define TEMP_SENSOR_0 1047
#elif defined(E3D_PT100_EXTRUDER_NO_AMP)
#define TEMP_SENSOR_0 148
#else
#define TEMP_SENSOR_0 5
#endif
#if defined(E3D_PT100_BED_WITH_AMP)
#define TEMP_SENSOR_BED 247
#elif defined(E3D_PT100_BED_NO_AMP) #elif defined(E3D_PT100_BED_NO_AMP)
#define TEMP_SENSOR_BED 148 #define TEMP_SENSOR_BED 148
#else #else