mirror of
https://github.com/portapack-mayhem/mayhem-firmware.git
synced 2026-09-12 17:49:31 +00:00
remove const temp measurement from core to the ext app. we don't need it (#3259)
This commit is contained in:
@@ -8,14 +8,12 @@ using namespace portapack;
|
||||
namespace ui::external_app::mcu_temperature {
|
||||
|
||||
void McuTemperatureWidget::paint(Painter& painter) {
|
||||
const auto logger = portapack::temperature_logger;
|
||||
|
||||
const auto rect = screen_rect();
|
||||
const Color color_background{0, 0, 64};
|
||||
const Color color_foreground = Theme::getInstance()->fg_green->foreground;
|
||||
const Color color_reticle{128, 128, 128};
|
||||
|
||||
const auto graph_width = static_cast<int>(logger.capacity()) * bar_width;
|
||||
const auto graph_width = static_cast<int>(temperature_logger.capacity()) * bar_width;
|
||||
const Rect graph_rect{
|
||||
rect.left() + (rect.width() - graph_width) / 2, rect.top() + 8,
|
||||
graph_width, rect.height()};
|
||||
@@ -25,7 +23,7 @@ void McuTemperatureWidget::paint(Painter& painter) {
|
||||
painter.draw_rectangle(frame_rect, color_reticle);
|
||||
painter.fill_rectangle(graph_rect, color_background);
|
||||
|
||||
const auto history = logger.history();
|
||||
const auto history = temperature_logger.history();
|
||||
for (size_t i = 0; i < history.size(); i++) {
|
||||
const Coord x = graph_rect.right() - (history.size() - i) * bar_width;
|
||||
const auto sample = history[i];
|
||||
|
||||
@@ -32,7 +32,7 @@
|
||||
#include "portapack.hpp"
|
||||
#include "memory_map.hpp"
|
||||
#include "irq_controls.hpp"
|
||||
|
||||
#include "temperature_logger.hpp"
|
||||
#include <functional>
|
||||
#include <utility>
|
||||
|
||||
@@ -43,14 +43,25 @@ class McuTemperatureWidget : public Widget {
|
||||
explicit McuTemperatureWidget(
|
||||
Rect parent_rect)
|
||||
: Widget{parent_rect} {
|
||||
signal_token_tick_second = rtc_time::signal_tick_second += [this]() {
|
||||
this->on_tick_second();
|
||||
};
|
||||
}
|
||||
~McuTemperatureWidget() {
|
||||
rtc_time::signal_tick_second -= signal_token_tick_second;
|
||||
}
|
||||
void on_tick_second() {
|
||||
temperature_logger.second_tick();
|
||||
set_dirty();
|
||||
}
|
||||
|
||||
void paint(Painter& painter) override;
|
||||
|
||||
private:
|
||||
TemperatureLogger temperature_logger{};
|
||||
|
||||
using sample_t = uint32_t;
|
||||
using temperature_t = int32_t;
|
||||
|
||||
SignalToken signal_token_tick_second{};
|
||||
temperature_t temperature(const sample_t sensor_value) const;
|
||||
Coord screen_y(const temperature_t temperature, const Rect& screen_rect) const;
|
||||
|
||||
|
||||
@@ -0,0 +1,73 @@
|
||||
/*
|
||||
* Copyright (C) 2015 Jared Boone, ShareBrained Technology, Inc.
|
||||
*
|
||||
* This file is part of PortaPack.
|
||||
*
|
||||
* 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 2, 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; see the file COPYING. If not, write to
|
||||
* the Free Software Foundation, Inc., 51 Franklin Street,
|
||||
* Boston, MA 02110-1301, USA.
|
||||
*/
|
||||
|
||||
#include "temperature_logger.hpp"
|
||||
|
||||
#include "radio.hpp"
|
||||
|
||||
#include <algorithm>
|
||||
|
||||
namespace ui::external_app::mcu_temperature {
|
||||
|
||||
void TemperatureLogger::second_tick() {
|
||||
sample_phase++;
|
||||
if (sample_phase >= sample_interval) {
|
||||
push_sample(read_sample());
|
||||
}
|
||||
}
|
||||
|
||||
size_t TemperatureLogger::size() const {
|
||||
return std::min(capacity(), samples_count);
|
||||
}
|
||||
|
||||
size_t TemperatureLogger::capacity() const {
|
||||
return samples.size();
|
||||
}
|
||||
|
||||
std::vector<TemperatureLogger::sample_t> TemperatureLogger::history() const {
|
||||
std::vector<sample_t> result;
|
||||
|
||||
const auto n = size();
|
||||
result.resize(n);
|
||||
|
||||
// Copy the last N samples from the buffer, since new samples are added at the end.
|
||||
std::copy(samples.cend() - n, samples.cend(), result.data());
|
||||
|
||||
return result;
|
||||
}
|
||||
|
||||
TemperatureLogger::sample_t TemperatureLogger::read_sample() {
|
||||
// MAX2837 does not return a valid temperature if in "shutdown" mode.
|
||||
return radio::debug::second_if::temp_sense();
|
||||
}
|
||||
|
||||
void TemperatureLogger::push_sample(const TemperatureLogger::sample_t sample) {
|
||||
// Started out building a pseudo-FIFO, then got lazy.
|
||||
|
||||
// Shift samples: samples[1:] -> samples[0:-1]
|
||||
// New sample goes into samples[-1]
|
||||
std::copy(samples.cbegin() + 1, samples.cend(), samples.begin());
|
||||
samples.back() = sample;
|
||||
samples_count++;
|
||||
sample_phase = 0;
|
||||
}
|
||||
|
||||
} // namespace ui::external_app::mcu_temperature
|
||||
@@ -0,0 +1,56 @@
|
||||
/*
|
||||
* Copyright (C) 2015 Jared Boone, ShareBrained Technology, Inc.
|
||||
*
|
||||
* This file is part of PortaPack.
|
||||
*
|
||||
* 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 2, 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; see the file COPYING. If not, write to
|
||||
* the Free Software Foundation, Inc., 51 Franklin Street,
|
||||
* Boston, MA 02110-1301, USA.
|
||||
*/
|
||||
|
||||
#ifndef __TEMPERATURE_LOGGER_H__
|
||||
#define __TEMPERATURE_LOGGER_H__
|
||||
|
||||
#include <cstddef>
|
||||
#include <cstdint>
|
||||
#include <array>
|
||||
#include <vector>
|
||||
|
||||
namespace ui::external_app::mcu_temperature {
|
||||
|
||||
class TemperatureLogger {
|
||||
public:
|
||||
using sample_t = int8_t;
|
||||
|
||||
void second_tick();
|
||||
|
||||
size_t size() const;
|
||||
size_t capacity() const;
|
||||
|
||||
std::vector<sample_t> history() const;
|
||||
|
||||
private:
|
||||
std::array<sample_t, 128> samples{};
|
||||
|
||||
static constexpr size_t sample_interval = 5;
|
||||
size_t sample_phase = 0;
|
||||
size_t samples_count = 0;
|
||||
|
||||
sample_t read_sample();
|
||||
void push_sample(const sample_t sample);
|
||||
};
|
||||
|
||||
} // namespace ui::external_app::mcu_temperature
|
||||
|
||||
#endif /*__TEMPERATURE_LOGGER_H__*/
|
||||
Reference in New Issue
Block a user