1
0
Fork 0

SimpleWeatherService: Generate random weather data

Add a new simulation key handler for weather data:
- 'w' will generate new weather, cycling through the various conditions
- 'W' will clear the weather data
This commit is contained in:
Victor Kareh 2024-01-11 12:52:44 -05:00
parent 3ba07f574e
commit bb18300c9e
4 changed files with 32 additions and 0 deletions

View file

@ -146,6 +146,8 @@ Using the keyboard the following events can be triggered:
- `H` ... stop heartrate - `H` ... stop heartrate
- `i` ... take screenshot - `i` ... take screenshot
- `I` ... start/stop Gif screen capture - `I` ... start/stop Gif screen capture
- `w` ... generate weather data
- `W` ... clear weather data
Additionally using the arrow keys the respective swipe gesture can be triggered. Additionally using the arrow keys the respective swipe gesture can be triggered.
For example pressing the UP key triggers a `SwipeUp` gesture. For example pressing the UP key triggers a `SwipeUp` gesture.

View file

@ -678,6 +678,7 @@ public:
debounce('s', 'S', state[SDL_SCANCODE_S], key_handled_s); debounce('s', 'S', state[SDL_SCANCODE_S], key_handled_s);
debounce('h', 'H', state[SDL_SCANCODE_H], key_handled_h); debounce('h', 'H', state[SDL_SCANCODE_H], key_handled_h);
debounce('i', 'I', state[SDL_SCANCODE_I], key_handled_i); debounce('i', 'I', state[SDL_SCANCODE_I], key_handled_i);
debounce('w', 'W', state[SDL_SCANCODE_W], key_handled_w);
// screen switcher buttons // screen switcher buttons
debounce('1', '!'+1, state[SDL_SCANCODE_1], key_handled_1); debounce('1', '!'+1, state[SDL_SCANCODE_1], key_handled_1);
debounce('2', '!'+2, state[SDL_SCANCODE_2], key_handled_2); debounce('2', '!'+2, state[SDL_SCANCODE_2], key_handled_2);
@ -780,6 +781,10 @@ public:
} else { } else {
gif_manager.close(); gif_manager.close();
} }
} else if (key == 'w') {
generate_weather_data(false);
} else if (key == 'W') {
generate_weather_data(true);
} else if (key >= '0' && key <= '9') { } else if (key >= '0' && key <= '9') {
this->switch_to_screen(key-'0'); this->switch_to_screen(key-'0');
} else if (key >= '!'+0 && key <= '!'+9) { } else if (key >= '!'+0 && key <= '!'+9) {
@ -796,6 +801,22 @@ public:
batteryController.voltage = batteryController.percentRemaining * 50; batteryController.voltage = batteryController.percentRemaining * 50;
} }
void generate_weather_data(bool clear) {
static int iconId = -1;
if (clear) {
systemTask.nimble().weather().SetCurrentWeather(0, 0, 0);
return;
}
auto timestamp = std::chrono::system_clock::to_time_t(std::chrono::system_clock::now());
srand((int)timestamp);
int temperature = (rand() % 81 - 40) * 100;
iconId++;
if (iconId > 8) {
iconId = 0;
}
systemTask.nimble().weather().SetCurrentWeather((uint64_t)timestamp, temperature, iconId);
}
void handle_touch_and_button() { void handle_touch_and_button() {
int x, y; int x, y;
uint32_t buttons = SDL_GetMouseState(&x, &y); uint32_t buttons = SDL_GetMouseState(&x, &y);
@ -958,6 +979,7 @@ private:
bool key_handled_s = false; // s ... increase step count, S ... decrease step count bool key_handled_s = false; // s ... increase step count, S ... decrease step count
bool key_handled_h = false; // h ... set heartrate running, H ... stop heartrate bool key_handled_h = false; // h ... set heartrate running, H ... stop heartrate
bool key_handled_i = false; // i ... take screenshot, I ... start/stop Gif screen capture bool key_handled_i = false; // i ... take screenshot, I ... start/stop Gif screen capture
bool key_handled_w = false; // w ... generate weather data, W ... clear weather data
// numbers from 0 to 9 to switch between screens // numbers from 0 to 9 to switch between screens
bool key_handled_1 = false; bool key_handled_1 = false;
bool key_handled_2 = false; bool key_handled_2 = false;

View file

@ -70,6 +70,13 @@ void SimpleWeatherService::Init() {
//ble_gatts_add_svcs(serviceDefinition); //ble_gatts_add_svcs(serviceDefinition);
} }
void SimpleWeatherService::SetCurrentWeather(uint64_t timestamp, int16_t temperature, int iconId) {
SimpleWeatherService::Location cityName;
cityName[32] = '\0';
currentWeather = SimpleWeatherService::CurrentWeather((uint64_t)timestamp, temperature, temperature, temperature, SimpleWeatherService::Icons(iconId), std::move(cityName));
printf("currentWeather: timestamp=%d, temperature=%d, icon=%d\n", currentWeather->timestamp, currentWeather->temperature, currentWeather->iconId);
}
int SimpleWeatherService::OnCommand(struct ble_gatt_access_ctxt* ctxt) { int SimpleWeatherService::OnCommand(struct ble_gatt_access_ctxt* ctxt) {
return 0; return 0;

View file

@ -27,6 +27,7 @@ public:
explicit SimpleWeatherService(const DateTime& dateTimeController); explicit SimpleWeatherService(const DateTime& dateTimeController);
void Init(); void Init();
void SetCurrentWeather(uint64_t timestamp, int16_t temperature, int iconId);
int OnCommand(struct ble_gatt_access_ctxt* ctxt); int OnCommand(struct ble_gatt_access_ctxt* ctxt);