LULZBOT_TOUCH_UI: Only use %S on AVR (#15292)
Marcio Teixeira
5 years ago
committed by
Scott Lahteine
parent
ce74e4b3e4
commit
b590ae4875
@ -0,0 +1,89 @@
|
|||||||
|
/*********************
|
||||||
|
* string_format.cpp *
|
||||||
|
*********************/
|
||||||
|
|
||||||
|
/****************************************************************************
|
||||||
|
* Written By Marcio Teixeira 2018 - Aleph Objects, Inc. *
|
||||||
|
* *
|
||||||
|
* 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. *
|
||||||
|
* *
|
||||||
|
* To view a copy of the GNU General Public License, go to the following *
|
||||||
|
* location: <http://www.gnu.org/licenses/>. *
|
||||||
|
****************************************************************************/
|
||||||
|
|
||||||
|
#include "../config.h"
|
||||||
|
|
||||||
|
#if ENABLED(LULZBOT_TOUCH_UI)
|
||||||
|
|
||||||
|
#include "screens.h"
|
||||||
|
|
||||||
|
#define ROUND(val) uint16_t((val)+0.5)
|
||||||
|
|
||||||
|
#pragma GCC diagnostic push
|
||||||
|
#pragma GCC diagnostic ignored "-Wno-format"
|
||||||
|
|
||||||
|
#ifdef __AVR__
|
||||||
|
#define S_FMT "%S"
|
||||||
|
#else
|
||||||
|
#define S_FMT "%s"
|
||||||
|
#endif
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Formats a temperature string (e.g. "100°C")
|
||||||
|
*/
|
||||||
|
void format_temp(char *str, float t1) {
|
||||||
|
sprintf_P(str, PSTR("%3d" S_FMT), ROUND(t1), GET_TEXT(UNITS_C));
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Formats a temperature string for an idle heater (e.g. "100 °C / idle")
|
||||||
|
*/
|
||||||
|
void format_temp_and_idle(char *str, float t1) {
|
||||||
|
sprintf_P(str, PSTR("%3d" S_FMT " / " S_FMT), ROUND(t1), GET_TEXT(UNITS_C), GET_TEXT(TEMP_IDLE));
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Formats a temperature string for an active heater (e.g. "100 / 200°C")
|
||||||
|
*/
|
||||||
|
void format_temp_and_temp(char *str, float t1, float t2) {
|
||||||
|
sprintf_P(str, PSTR("%3d / %3d" S_FMT), ROUND(t1), ROUND(t2), GET_TEXT(UNITS_C));
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Formats a temperature string for a material (e.g. "100°C (PLA)")
|
||||||
|
*/
|
||||||
|
void format_temp_and_material(char *str, float t1, const char *material) {
|
||||||
|
sprintf_P(str, PSTR("%3d" S_FMT " (" S_FMT ")"), ROUND(t1), GET_TEXT(UNITS_C), material);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Formats a position value (e.g. "10 mm")
|
||||||
|
*/
|
||||||
|
void format_position(char *str, float p) {
|
||||||
|
dtostrf(p, 5, 1, str);
|
||||||
|
strcat_P(str, PSTR(" "));
|
||||||
|
strcat_P(str, GET_TEXT(UNITS_MM));
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Formats a position vector (e.g. "10; 20; 30 mm")
|
||||||
|
*/
|
||||||
|
void format_position(char *str, float x, float y, float z) {
|
||||||
|
char num1[7], num2[7], num3[7];
|
||||||
|
dtostrf(x, 4, 2, num1);
|
||||||
|
dtostrf(y, 4, 2, num2);
|
||||||
|
dtostrf(z, 4, 2, num3);
|
||||||
|
sprintf_P(str, PSTR("%s; %s; %s " S_FMT), num1, num2, num3, GET_TEXT(UNITS_MM));
|
||||||
|
}
|
||||||
|
|
||||||
|
#pragma GCC diagnostic pop
|
||||||
|
|
||||||
|
#endif // LULZBOT_TOUCH_UI
|
||||||
@ -0,0 +1,29 @@
|
|||||||
|
/*******************
|
||||||
|
* string_format.h *
|
||||||
|
*******************/
|
||||||
|
|
||||||
|
/****************************************************************************
|
||||||
|
* Written By Marcio Teixeira 2018 - Aleph Objects, Inc. *
|
||||||
|
* *
|
||||||
|
* 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. *
|
||||||
|
* *
|
||||||
|
* To view a copy of the GNU General Public License, go to the following *
|
||||||
|
* location: <http://www.gnu.org/licenses/>. *
|
||||||
|
****************************************************************************/
|
||||||
|
|
||||||
|
#pragma once
|
||||||
|
|
||||||
|
void format_temp(char *str, float t1);
|
||||||
|
void format_temp_and_idle(char *str, float t1);
|
||||||
|
void format_temp_and_temp(char *str, float t1, float t2);
|
||||||
|
void format_temp_and_material(char *str, float t1, const char *material);
|
||||||
|
void format_position(char *str, float p);
|
||||||
|
void format_position(char *str, float x, float y, float z);
|
||||||
Loading…
Reference in New Issue