Skip to content

Fix build after temperature type changes #164

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

Merged
NeroBurner merged 1 commit into from
Nov 12, 2024
Merged

Fix build after temperature type changes #164

Show file tree
Hide file tree
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
2 changes: 1 addition & 1 deletion InfiniTime
Open in desktop
Submodule InfiniTime updated 6 files
+12 −12 src/components/ble/SimpleWeatherService.cpp
+38 −13 src/components/ble/SimpleWeatherService.h
+3 −3 src/displayapp/screens/WatchFaceDigital.cpp
+3 −4 src/displayapp/screens/WatchFacePineTimeStyle.cpp
+31 −32 src/displayapp/screens/Weather.cpp
+1 −1 src/displayapp/screens/settings/Settings.h
21 changes: 13 additions & 8 deletions main.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -854,7 +854,7 @@ class Framework {
void set_forecast(
uint64_t timestamp,
std::array<
Pinetime::Controllers::SimpleWeatherService::Forecast::Day,
std::optional<Pinetime::Controllers::SimpleWeatherService::Forecast::Day>,
Pinetime::Controllers::SimpleWeatherService::MaxNbForecastDays> days)
{
std::array<uint8_t, 36> dataBuffer {};
Expand All @@ -871,10 +871,13 @@ class Framework {
dataBuffer.at(10) = static_cast<uint8_t>(days.size());
for (int i = 0; i < days.size(); i++)
{
const Pinetime::Controllers::SimpleWeatherService::Forecast::Day &day = days.at(i);
write_int16(data.subspan(11+(i*5)), day.minTemperature);
write_int16(data.subspan(13+(i*5)), day.maxTemperature);
dataBuffer.at(15+(i*5)) = static_cast<uint8_t>(day.iconId);
const std::optional<Pinetime::Controllers::SimpleWeatherService::Forecast::Day> &day = days.at(i);
if (!day.has_value()) {
continue;
}
write_int16(data.subspan(11+(i*5)), day->minTemperature.PreciseCelsius());
write_int16(data.subspan(13+(i*5)), day->maxTemperature.PreciseCelsius());
dataBuffer.at(15+(i*5)) = static_cast<uint8_t>(day->iconId);
}
// send Forecast to SimpleWeatherService
systemTask.nimble().weather().OnCommand(&ctxt);
Expand All @@ -883,7 +886,7 @@ class Framework {
void generate_weather_data(bool clear) {
if (clear) {
set_current_weather(0, 0, 0);
std::array<Pinetime::Controllers::SimpleWeatherService::Forecast::Day, Pinetime::Controllers::SimpleWeatherService::MaxNbForecastDays> days;
std::array<std::optional<Pinetime::Controllers::SimpleWeatherService::Forecast::Day>, Pinetime::Controllers::SimpleWeatherService::MaxNbForecastDays> days;
set_forecast(0, days);
return;
}
Expand All @@ -895,10 +898,12 @@ class Framework {
set_current_weather((uint64_t)timestamp, temperature, rand() % 9);

// Generate forecast data
std::array<Pinetime::Controllers::SimpleWeatherService::Forecast::Day, Pinetime::Controllers::SimpleWeatherService::MaxNbForecastDays> days;
std::array<std::optional<Pinetime::Controllers::SimpleWeatherService::Forecast::Day>, Pinetime::Controllers::SimpleWeatherService::MaxNbForecastDays> days;
for (int i = 0; i < Pinetime::Controllers::SimpleWeatherService::MaxNbForecastDays; i++) {
days[i] = Pinetime::Controllers::SimpleWeatherService::Forecast::Day {
(int16_t)(temperature - rand() % 10 * 100), (int16_t)(temperature + rand() % 10 * 100), Pinetime::Controllers::SimpleWeatherService::Icons(rand() % 9)
Pinetime::Controllers::SimpleWeatherService::Temperature(temperature - rand() % 10 * 100),
Pinetime::Controllers::SimpleWeatherService::Temperature(temperature + rand() % 10 * 100),
Pinetime::Controllers::SimpleWeatherService::Icons(rand() % 9),
};
}
set_forecast((uint64_t)timestamp, days);
Expand Down