Skip to content

prusalink: Add mcu/board/sandwich/splitter temperature values to PrusaLink #4780

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
bkerler wants to merge 1 commit into
base: master
Choose a base branch
from
Open

prusalink: Add mcu/board/sandwich/splitter temperature values to PrusaLink #4780

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
47 changes: 45 additions & 2 deletions lib/WUI/link_content/basic_gets.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,9 @@
#include <cstring>
#include <cstdio>
#include "printers.h"
#include "puppies/modular_bed.hpp"
#include <option/has_mmu2.h>
#include <common/adc.hpp>

using namespace json;
using namespace marlin_server;
Expand Down Expand Up @@ -138,6 +140,10 @@ JsonResult get_printer(size_t resume_point, JsonOutput &output) {
busy = printing = error = true;
}

#if BOARD_IS_XLBUDDY()
buddy::puppies::Dwarf &dwarf = prusa_toolchanger.getActiveToolOrFirst();
#endif

// Keep the indentation of the JSON in here!
// clang-format off
JSON_START;
Expand All @@ -160,9 +166,46 @@ JsonResult get_printer(size_t resume_point, JsonOutput &output) {
JSON_FIELD_FFIXED("display", vars.hotend(0).display_nozzle, 1) JSON_COMMA;
JSON_FIELD_INT("offset", 0);
JSON_OBJ_END JSON_COMMA;
#if HAS_TEMP_BOARD
JSON_FIELD_OBJ("board");
JSON_FIELD_FFIXED("actual", static_cast<double>(thermalManager.degBoard()), 1);
JSON_OBJ_END JSON_COMMA;
#endif
#if HAS_TEMP_CHAMBER
JSON_FIELD_OBJ("chamber");
JSON_FIELD_FFIXED("actual", static_cast<double>(thermalManager.degChamber()), 1);
JSON_OBJ_END JSON_COMMA;
#endif
#if BOARD_IS_XLBUDDY()
JSON_FIELD_OBJ("sandwich");
JSON_FIELD_INT("actual", AdcGet::sandwichTemp());
JSON_OBJ_END JSON_COMMA;
JSON_FIELD_OBJ("splitter");
JSON_FIELD_INT("actual", AdcGet::splitterTemp());
JSON_OBJ_END JSON_COMMA;
JSON_FIELD_OBJ("dwarf_mcu");
JSON_FIELD_FFIXED("actual", dwarf.get_mcu_temperature(), 1);
JSON_OBJ_END JSON_COMMA;
JSON_FIELD_OBJ("dwarf_board");
JSON_FIELD_FFIXED("actual", dwarf.get_board_temperature(), 1);
JSON_OBJ_END JSON_COMMA;
#endif
#if XL_ENCLOSURE_SUPPORT()
JSON_FIELD_OBJ("mcu_modular_bed");
JSON_FIELD_INT("actual", buddy::puppies::modular_bed.get_mcu_temperature());
JSON_OBJ_END JSON_COMMA;
#endif
#if PRINTER_IS_PRUSA_iX()
JSON_FIELD_OBJ("psu");
JSON_FIELD_FFIXED("actual", static_cast<double>(thermalManager.deg_psu()), 1);
JSON_OBJ_END JSON_COMMA;
JSON_FIELD_OBJ("ambient");
JSON_FIELD_FFIXED("actual", static_cast<double>(thermalManager.deg_ambient()), 1);
JSON_OBJ_END JSON_COMMA;
#endif
JSON_FIELD_OBJ("bed");
JSON_FIELD_FFIXED("actual", vars.temp_bed, 1) JSON_COMMA;
JSON_FIELD_FFIXED("target", vars.target_bed, 1) JSON_COMMA;
JSON_FIELD_FFIXED("actual", static_cast<double>(vars.temp_bed), 1) JSON_COMMA;
JSON_FIELD_FFIXED("target", static_cast<double>(vars.target_bed), 1) JSON_COMMA;
JSON_FIELD_INT("offset", 0);
JSON_OBJ_END;
JSON_OBJ_END JSON_COMMA;
Expand Down