projects_leo/ttgo_smartwatch_prox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #14 from bwagstaff/master

Browse Source 
Display MAC and IPv4 addresses
This commit is contained in:
Dirk Broßwick
2020-07-29 08:14:42 +02:00
committed by GitHub
parent 2afad2dfcc 4238229a4a
commit b344f90754
8 changed files with 212 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/gui/mainbar/setup_tile/wlan_settings/wlan_settings.cpp
View File

@@ -150,6 +150,12 @@ void wlan_password_tile_setup( lv_obj_t *tile, lv_style_t *style, lv_coord_t hre
lv_obj_align( wlan_password_pass_textfield, wlan_password_tile1, LV_ALIGN_IN_TOP_LEFT, 0, 75);
lv_obj_set_event_cb( wlan_password_pass_textfield, wlan_password_event_cb );
lv_obj_t *mac_label = lv_label_create( wlan_password_tile1, NULL);
lv_obj_add_style( mac_label, LV_IMGBTN_PART_MAIN, style);
lv_obj_set_width( mac_label, LV_HOR_RES);
lv_obj_align( mac_label, wlan_password_tile1, LV_ALIGN_IN_BOTTOM_LEFT, 0, 0);
lv_label_set_text_fmt( mac_label, "MAC: %s", WiFi.macAddress().c_str());
lv_obj_t *apply_btn = lv_imgbtn_create( wlan_password_tile1, NULL);
lv_imgbtn_set_src( apply_btn, LV_BTN_STATE_RELEASED, &check_32px);
lv_imgbtn_set_src( apply_btn, LV_BTN_STATE_PRESSED, &check_32px);

4
src/gui/statusbar.cpp
View File

@@ -222,7 +222,9 @@ void statusbar_wifi_set_state( bool state, const char *wifiname ) {
else {
lv_imgbtn_set_state( statusbar_wifi, LV_BTN_STATE_CHECKED_RELEASED );
}
lv_label_set_text( statusbar_wifilabel, wifiname );
lv_label_set_long_mode( statusbar_wifilabel, LV_LABEL_LONG_SROLL_CIRC);
lv_obj_set_width( statusbar_wifilabel, LV_HOR_RES);
lv_label_set_text( statusbar_wifilabel, wifiname);
lv_obj_align( statusbar_wifilabel, statusbar_wifi, LV_ALIGN_OUT_BOTTOM_MID, 0, 0);
statusbar_refresh();
}

76
src/gui/widget/weather/weather.cpp
View File

@@ -46,6 +46,7 @@ lv_tile_number weather_widget_setup_tile_num = NO_TILE;
lv_obj_t *weather_widget_cont = NULL;
lv_obj_t *weather_widget_condition_img = NULL;
lv_obj_t *weather_widget_temperature_label = NULL;
lv_obj_t *weather_widget_wind_label = NULL;
static void enter_weather_widget_event_cb( lv_obj_t * obj, lv_event_t event );
LV_IMG_DECLARE(owm_01d_64px);
@@ -80,6 +81,17 @@ void weather_app_setup( void ) {
lv_obj_reset_style_list( weather_widget_temperature_label, LV_OBJ_PART_MAIN );
lv_obj_align( weather_widget_temperature_label, weather_widget_cont, LV_ALIGN_IN_BOTTOM_MID, 0, 0);
weather_widget_wind_label = lv_label_create( weather_widget_cont , NULL);
lv_label_set_text( weather_widget_wind_label, "");
lv_obj_reset_style_list( weather_widget_wind_label, LV_OBJ_PART_MAIN );
lv_obj_align( weather_widget_wind_label, weather_widget_cont, LV_ALIGN_IN_BOTTOM_MID, 0, 0);
if( weather_config.showWind)
{
lv_obj_align( weather_widget_temperature_label, weather_widget_cont, LV_ALIGN_IN_BOTTOM_MID, 0, -20);
lv_obj_align( weather_widget_wind_label, weather_widget_cont, LV_ALIGN_IN_BOTTOM_MID, 0, +5);
}
// regster callback for wifi sync
WiFi.onEvent( [](WiFiEvent_t event, WiFiEventInfo_t info) {
weather_widget_sync_request();
@@ -139,7 +151,19 @@ void weather_widget_sync_Task( void * pvParameters ) {
lv_imgbtn_set_src( weather_widget_condition_img, LV_BTN_STATE_PRESSED, resolve_owm_icon( weather_today.icon ) );
lv_imgbtn_set_src( weather_widget_condition_img, LV_BTN_STATE_CHECKED_RELEASED, resolve_owm_icon( weather_today.icon ) );
lv_imgbtn_set_src( weather_widget_condition_img, LV_BTN_STATE_CHECKED_PRESSED, resolve_owm_icon( weather_today.icon ) );
lv_obj_align( weather_widget_temperature_label, weather_widget_cont, LV_ALIGN_IN_BOTTOM_MID, 0, 0);
if (weather_config.showWind)
{
lv_label_set_text( weather_widget_wind_label, weather_today.wind);
lv_obj_align( weather_widget_temperature_label, weather_widget_cont, LV_ALIGN_IN_BOTTOM_MID, 0, -22);
lv_obj_align( weather_widget_wind_label, weather_widget_cont, LV_ALIGN_IN_BOTTOM_MID, 0, 0);
}
else
{
lv_label_set_text( weather_widget_wind_label, "");
lv_obj_align( weather_widget_temperature_label, weather_widget_cont, LV_ALIGN_IN_BOTTOM_MID, 0, 0);
lv_obj_align( weather_widget_wind_label, weather_widget_cont, LV_ALIGN_IN_BOTTOM_MID, 0, 0);
}
}
}
xEventGroupClearBits( weather_widget_event_handle, WEATHER_WIDGET_SYNC_REQUEST );
@@ -175,13 +199,51 @@ void weather_load_config( void ) {
Serial.printf( __FILE__ "Can't open file: %s\r\n", WEATHER_CONFIG_FILE );
}
else {
int filesize = file.size();
if ( filesize > sizeof( weather_config ) ) {
Serial.printf( __FILE__ "Failed to read configfile. Wrong filesize!\r\n" );
size_t filesize = file.size();
// Special case, convert V1 of the file to a versioned V2 format
if (filesize == sizeof(weather_config_t_v1))
{
log_i("Reading weather config v1");
weather_config_t_v1 v1Config;
weather_config_t_v2 &v2Config = weather_config; // For now, V2 is current.
file.read((uint8_t *)&v1Config, filesize);
log_i("Converting weather config v1 to v2");
v2Config.version = 2;
memcpy(&v2Config.apikey[0], &v1Config, sizeof(weather_config_t_v1));
v2Config.autosync = v1Config.autosync;
v2Config.showWind = false;
}
else {
file.read( (uint8_t *)&weather_config, filesize );
else if ( filesize > 0)
{
// Read version number, then verify and catch up as needed
uint8_t version = 0;
file.read(&version, 1);
file.seek(0, fs::SeekSet);
log_v("Reading weather config version: %d", version);
if ( version > currentConfigVersion)
{
log_e( "Unexpected weather config version. Expected at most %d found %d", currentConfigVersion, version);
}
if ( version == 2 )
{
if (filesize != sizeof(weather_config_t_v2))
{
log_e( "Failed to read weather config file. Wrong filesize! Expected %d found %d", sizeof(weather_config_t_v2), filesize);
}
else
{
file.read((uint8_t *)&weather_config, filesize);
}
}
}
else
{
log_e( "Failed to read weather config file. File size is %d", filesize);
}
file.close();
}
}
}

21
src/gui/widget/weather/weather.h
View File

@@ -28,12 +28,28 @@
#define WEATHER_WIDGET_SYNC_REQUEST _BV(0)
typedef struct {
constexpr uint8_t currentConfigVersion = 2;
typedef struct
{
char apikey[64] = "";
char lon[16] = "";
char lat[16] = "";
bool autosync = true;
} weather_config_t;
} weather_config_t_v1;
typedef struct {
char version = 2;
char apikey[64] = "";
char lon[16] = "";
char lat[16] = "";
char autosync : 1;
char showWind : 1;
} weather_config_t_v2;
typedef weather_config_t_v2 weather_config_t;
typedef struct {
bool valide = false;
@@ -43,6 +59,7 @@
char humidity[8] = "";
char name[32] = "";
char icon[8] = "";
char wind[8] = "";
} weather_forcast_t;
void weather_app_setup( void );

50
src/gui/widget/weather/weather_fetch.cpp
View File

@@ -31,6 +31,9 @@
#include "hardware/powermgm.h"
/* Utility function to convert numbers to directions */
static void weather_wind_to_string( weather_forcast_t* container, int speed, int directionDegree);
uint32_t weather_fetch_today( weather_config_t *weather_config, weather_forcast_t *weather_today ) {
WiFiClient today_client;
@@ -113,6 +116,10 @@ uint32_t weather_fetch_today( weather_config_t *weather_config, weather_forcast_
strcpy( weather_today->icon, doc["weather"][0]["icon"] );
strcpy( weather_today->name, doc["name"] );
int directionDegree = doc["wind"]["deg"].as<int>();
int speed = doc["wind"]["speed"].as<int>();
weather_wind_to_string( weather_today, speed, directionDegree );
doc.clear();
free( json );
return( retval );
@@ -199,9 +206,52 @@ uint32_t weather_fetch_forecast( weather_config_t *weather_config, weather_forca
snprintf( weather_forecast[ i ].pressure, sizeof( weather_forecast[ i ].pressure ),"%fpha", doc["list"][i]["main"]["pressure"].as<float>() );
strcpy( weather_forecast[ i ].icon, doc["list"][i]["weather"][0]["icon"] );
strcpy( weather_forecast[ i ].name, doc["city"]["name"] );
int directionDegree = doc["list"][i]["wind"]["deg"].as<int>();
int speed = doc["list"][i]["wind"]["speed"].as<int>();
weather_wind_to_string( &weather_forecast[i], speed, directionDegree );
}
doc.clear();
free( json );
return( 200 );
}
void weather_wind_to_string( weather_forcast_t* container, int speed, int directionDegree )
{
const char *dir = "N";
if ( directionDegree > 348 )
; // already set to "N"
else if ( directionDegree > 326 )
dir = "NNW";
else if ( directionDegree > 303 )
dir = "NW";
else if ( directionDegree > 281 )
dir = "WNW";
else if ( directionDegree > 258 )
dir = "W";
else if ( directionDegree > 236 )
dir = "WSW";
else if ( directionDegree > 213 )
dir = "SW";
else if ( directionDegree > 191 )
dir = "SSW";
else if ( directionDegree > 168 )
dir = "S";
else if ( directionDegree > 146 )
dir = "SSE";
else if ( directionDegree > 123 )
dir = "SE";
else if ( directionDegree > 101 )
dir = "ESE";
else if ( directionDegree > 78 )
dir = "E";
else if ( directionDegree > 56 )
dir = "ENE";
else if ( directionDegree > 33 )
dir = "NE";
else if ( directionDegree > 11 )
dir = "NNE";
snprintf( container->wind, sizeof(container->wind), "%d %s", speed, dir);
return;
}

19
src/gui/widget/weather/weather_forecast.cpp
View File

@@ -44,6 +44,7 @@ lv_obj_t *weather_forecast_update_label = NULL;
lv_obj_t *weather_forecast_time_label[ WEATHER_MAX_FORECAST ];
lv_obj_t *weather_forecast_icon_imgbtn[ WEATHER_MAX_FORECAST ];
lv_obj_t *weather_forecast_temperature_label[ WEATHER_MAX_FORECAST ];
lv_obj_t *weather_forecast_wind_label[ WEATHER_MAX_FORECAST ];
lv_style_t weather_widget_style;
weather_forcast_t weather_forecast[ WEATHER_MAX_FORECAST ];
@@ -114,6 +115,11 @@ void weather_tile_setup( lv_obj_t *tile, lv_style_t *style, lv_coord_t hres, lv_
lv_obj_reset_style_list( weather_forecast_temperature_label[ i ], LV_OBJ_PART_MAIN );
lv_obj_align( weather_forecast_temperature_label[ i ], weather_forecast_icon_imgbtn[ i ], LV_ALIGN_OUT_BOTTOM_MID, 0, 0);
weather_forecast_wind_label[ i ] = lv_label_create( weater_forecast_cont , NULL);
lv_label_set_text( weather_forecast_wind_label[i], "");
lv_obj_reset_style_list( weather_forecast_wind_label[i], LV_OBJ_PART_MAIN);
lv_obj_align( weather_forecast_wind_label[i], weather_forecast_icon_imgbtn[i], LV_ALIGN_OUT_BOTTOM_MID, 0, 0);
weather_forecast_time_label[ i ] = lv_label_create( weater_forecast_cont , NULL);
lv_label_set_text( weather_forecast_time_label[ i ], "n/a");
lv_obj_reset_style_list( weather_forecast_time_label[ i ], LV_OBJ_PART_MAIN );
@@ -196,7 +202,18 @@ void weather_forecast_sync_Task( void * pvParameters ) {
lv_imgbtn_set_src( weather_forecast_icon_imgbtn[ i ], LV_BTN_STATE_CHECKED_PRESSED, resolve_owm_icon( weather_forecast[ i * 2 ].icon ) );
lv_label_set_text( weather_forecast_temperature_label[ i ], weather_forecast[ i * 2 ].temp );
lv_obj_align( weather_forecast_temperature_label[ i ], weather_forecast_icon_imgbtn[ i ], LV_ALIGN_OUT_BOTTOM_MID, 0, 0);
if(weather_config->showWind)
{
lv_obj_align(weather_forecast_temperature_label[i], weather_forecast_icon_imgbtn[i], LV_ALIGN_OUT_BOTTOM_MID, 0, -22);
lv_label_set_text(weather_forecast_wind_label[i], weather_forecast[i * 2].wind);
lv_obj_align(weather_forecast_wind_label[i], weather_forecast_icon_imgbtn[i], LV_ALIGN_OUT_BOTTOM_MID, 0, 0);
}
else
{
lv_obj_align(weather_forecast_temperature_label[i], weather_forecast_icon_imgbtn[i], LV_ALIGN_OUT_BOTTOM_MID, 0, 0);
lv_label_set_text(weather_forecast_wind_label[i], "");
}
localtime_r( &weather_forecast[ i * 2 ].timestamp, &info );
strftime( buf, sizeof(buf), "%H:%M", &info );

48
src/gui/widget/weather/weather_setup.cpp
View File

@@ -35,6 +35,7 @@ lv_obj_t *weather_apikey_textfield = NULL;
lv_obj_t *weather_lat_textfield = NULL;
lv_obj_t *weather_lon_textfield = NULL;
lv_obj_t *weather_autosync_onoff = NULL;
lv_obj_t *weather_wind_onoff = NULL;
lv_style_t weather_widget_setup_style;
LV_IMG_DECLARE(exit_32px);
@@ -42,6 +43,7 @@ LV_IMG_DECLARE(exit_32px);
static void weather_apikey_event_cb( lv_obj_t * obj, lv_event_t event );
static void exit_weather_widget_setup_event_cb( lv_obj_t * obj, lv_event_t event );
static void weather_autosync_onoff_event_handler( lv_obj_t * obj, lv_event_t event );
static void weather_wind_onoff_event_handler( lv_obj_t *obj, lv_event_t event );
void weather_setup_tile_setup( lv_obj_t *tile, lv_style_t *style, lv_coord_t hres, lv_coord_t vres ) {
@@ -128,20 +130,37 @@ void weather_setup_tile_setup( lv_obj_t *tile, lv_style_t *style, lv_coord_t hre
lv_obj_t *weather_autosync_cont = lv_obj_create( weather_widget_setup_tile, NULL );
lv_obj_set_size( weather_autosync_cont, hres , 40);
lv_obj_add_style( weather_autosync_cont, LV_OBJ_PART_MAIN, style );
lv_obj_align( weather_autosync_cont, weather_lat_cont, LV_ALIGN_OUT_BOTTOM_LEFT, 0, 0 );
lv_obj_align( weather_autosync_cont, weather_lat_cont, LV_ALIGN_OUT_BOTTOM_LEFT, 0, -5 );
weather_autosync_onoff = lv_switch_create( weather_autosync_cont, NULL );
lv_switch_off( weather_autosync_onoff, LV_ANIM_ON );
lv_obj_align( weather_autosync_onoff, weather_autosync_cont, LV_ALIGN_IN_RIGHT_MID, -5, 0 );
lv_obj_align( weather_autosync_onoff, weather_autosync_cont, LV_ALIGN_IN_RIGHT_MID, -5, -5 );
lv_obj_set_event_cb( weather_autosync_onoff, weather_autosync_onoff_event_handler );
lv_obj_t *weather_autosync_label = lv_label_create( weather_autosync_cont, NULL);
lv_obj_add_style( weather_autosync_label, LV_OBJ_PART_MAIN, style );
lv_label_set_text( weather_autosync_label, "sync if wifi connected");
lv_obj_align( weather_autosync_label, weather_autosync_cont, LV_ALIGN_IN_LEFT_MID, 5, 0 );
if ( weather_config->autosync )
lv_switch_on( weather_autosync_onoff, LV_ANIM_OFF );
lv_label_set_text( weather_autosync_label, "Sync if wifi connected");
lv_obj_align( weather_autosync_label, weather_autosync_cont, LV_ALIGN_IN_LEFT_MID, 5, -5 );
if (weather_config->autosync)
lv_switch_on(weather_autosync_onoff, LV_ANIM_OFF);
else
lv_switch_off( weather_autosync_onoff, LV_ANIM_OFF );
lv_switch_off(weather_autosync_onoff, LV_ANIM_OFF);
lv_obj_t *weather_wind_cont = lv_obj_create(weather_widget_setup_tile, NULL);
lv_obj_set_size(weather_wind_cont, hres, 40);
lv_obj_add_style(weather_wind_cont, LV_OBJ_PART_MAIN, style);
lv_obj_align(weather_wind_cont, weather_lat_cont, LV_ALIGN_OUT_BOTTOM_LEFT, 0, 10);
weather_wind_onoff = lv_switch_create(weather_wind_cont, NULL);
lv_switch_off(weather_wind_onoff, LV_ANIM_ON);
lv_obj_align(weather_wind_onoff, weather_wind_cont, LV_ALIGN_IN_RIGHT_MID, -5, 10);
lv_obj_set_event_cb(weather_wind_onoff, weather_wind_onoff_event_handler);
lv_obj_t *weather_wind_label = lv_label_create(weather_wind_cont, NULL);
lv_obj_add_style(weather_wind_label, LV_OBJ_PART_MAIN, style);
lv_label_set_text(weather_wind_label, "Display wind");
lv_obj_align(weather_wind_label, weather_wind_cont, LV_ALIGN_IN_LEFT_MID, 5, 10);
if ( weather_config->showWind )
lv_switch_on( weather_wind_onoff, LV_ANIM_OFF );
else
lv_switch_off( weather_wind_onoff, LV_ANIM_OFF );
log_e("Display wind currently set to %d", weather_config->showWind);
}
static void weather_apikey_event_cb( lv_obj_t * obj, lv_event_t event ) {
@@ -173,4 +192,17 @@ static void exit_weather_widget_setup_event_cb( lv_obj_t * obj, lv_event_t event
weather_jump_to_forecast();
break;
}
}
static void weather_wind_onoff_event_handler(lv_obj_t *obj, lv_event_t event)
{
switch (event)
{
case (LV_EVENT_CLICKED):
weather_config_t *weather_config = weather_get_config();
weather_config->showWind = lv_switch_get_state( weather_wind_onoff);
weather_save_config();
weather_jump_to_forecast();
break;
}
}

8
src/hardware/wifictl.cpp
View File

@@ -98,7 +98,13 @@ void wifictl_setup( void ) {
powermgm_clear_event( POWERMGM_WIFI_OFF_REQUEST | POWERMGM_WIFI_ON_REQUEST | POWERMGM_WIFI_SCAN );
statusbar_style_icon( STATUSBAR_WIFI, STATUSBAR_STYLE_WHITE );
statusbar_show_icon( STATUSBAR_WIFI );
statusbar_wifi_set_state( true, wifiname );
String label(wifiname);
label.concat(' ');
label.concat(WiFi.localIP().toString());
//If you want to see your IPv6 address too, uncomment this.
// label.concat('\n');
// label.concat(WiFi.localIPv6().toString());
statusbar_wifi_set_state( true, label.c_str() );
asyncwebserver_setup();
}, WiFiEvent_t::SYSTEM_EVENT_STA_GOT_IP );