admin/CYD_Bad
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

V1.3.1 - MQTT published BME-Werte

Browse Source
This commit is contained in:
rxf
2024-07-22 18:03:22 +02:00
parent ad9d426a23
commit bcba2bc319
6 changed files with 112 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
src/grafik.cpp
View File

@@ -132,7 +132,7 @@ void lv_create_main_gui(void)
// Text als Überschrift an die Axen
lv_obj_t *feuchte_label = lv_label_create(lv_screen_active());
lv_label_set_text(feuchte_label, "Feuchte");
lv_obj_align(feuchte_label, LV_ALIGN_RIGHT_MID, -3, 20);
lv_obj_align(feuchte_label, LV_ALIGN_RIGHT_MID, -3, 15);
// Set font type and font size. More information: https://docs.lvgl.io/master/overview/font.html
static lv_style_t style_feuchte_label;
@@ -142,7 +142,7 @@ void lv_create_main_gui(void)
lv_obj_t *temp_label = lv_label_create(lv_screen_active());
lv_label_set_text(temp_label, "Temperatur");
lv_obj_align(temp_label, LV_ALIGN_LEFT_MID, 3, 20);
lv_obj_align(temp_label, LV_ALIGN_LEFT_MID, 3, 15);
// Set font type and font size. More information: https://docs.lvgl.io/master/overview/font.html
static lv_style_t style_temp_label;
@@ -192,7 +192,7 @@ void setValuetoArc(ARC arc, float value)
}
}
#define CONTAINER_WIDTH SCREEN_WIDTH
#define CONTAINER_HEIGHT SCREEN_HEIGHT - 145
#define CONTAINER_HEIGHT SCREEN_HEIGHT - 140
#define LEFTAXIS_WIDTH 25
#define RIGHTAXIS_WIDTH 15
#define CHART_WIDTH (CONTAINER_WIDTH - LEFTAXIS_WIDTH - RIGHTAXIS_WIDTH - 40)
@@ -222,7 +222,7 @@ void drawChart()
lv_obj_set_size(scaleT, 30, 75);
lv_scale_set_mode(scaleT, LV_SCALE_MODE_VERTICAL_LEFT);
static const char *scaleT_labels[5] = {"10°C", "15°C", "20°C", "25°C", "30°C"};
static const char *scaleT_labels[6] = {"15°C", "20°C", "25°C", "30°C", "35°C"};
lv_scale_set_text_src(scaleT, scaleT_labels);
lv_scale_set_label_show(scaleT, true);
@@ -234,7 +234,7 @@ void drawChart()
lv_obj_set_style_line_width(scaleT, 0, LV_PART_ITEMS);
lv_obj_set_style_line_width(scaleT, 0, LV_PART_INDICATOR);
lv_obj_set_style_line_width(scaleT, 0, LV_PART_MAIN);
lv_scale_set_range(scaleT, 10, 30);
lv_scale_set_range(scaleT, 15, 35);
static lv_style_t style_scaleT;
lv_style_init(&style_scaleT);
@@ -251,7 +251,7 @@ void drawChart()
lv_chart_set_point_count(chart, MAXREADINGS);
lv_chart_set_div_line_count(chart, 5, 5);
lv_chart_set_range(chart, LV_CHART_AXIS_SECONDARY_Y, 40, 100);
lv_chart_set_range(chart, LV_CHART_AXIS_PRIMARY_Y, 10, 30);
lv_chart_set_range(chart, LV_CHART_AXIS_PRIMARY_Y, 15, 35);
lv_obj_set_style_size(chart, 0, 0, LV_PART_INDICATOR); // No points on line
lv_obj_set_scrollbar_mode(chart, LV_SCROLLBAR_MODE_OFF);
lv_obj_set_style_border_width(chart, 0, LV_PART_MAIN); // No border
@@ -302,21 +302,38 @@ void drawChart()
lv_style_set_text_font(&style_unitxAx_label, &lv_font_montserrat_12);
lv_obj_add_style(unitxAx_label, &style_unitxAx_label, 0);
*/
/* ganz rechts unten die Version anzeigen */
lv_obj_t *version_label = lv_label_create(chart);
/* ganz unten etwas Info anzeigen */
// Style dafür
static lv_style_t style_info_label;
lv_style_init(&style_info_label);
lv_style_set_text_font(&style_info_label, &lv_font_montserrat_8);
lv_style_set_text_color(&style_info_label, LV_COLOR_MAKE(0x40, 0x40, 0x40));
// Versionsnummer und Datum
lv_obj_t *version_label = lv_label_create(lv_screen_active());
char ver[20];
sprintf(ver, "V %s %s", VERSION, VDATE);
lv_label_set_text(version_label, ver);
lv_obj_align(version_label, LV_ALIGN_BOTTOM_RIGHT, 0, 9);
lv_obj_align(version_label, LV_ALIGN_BOTTOM_RIGHT, -10, 0);
lv_obj_add_style(version_label, &style_info_label, LV_PART_MAIN);
// Set font type and font size. More information: https://docs.lvgl.io/master/overview/font.html
static lv_style_t style_version_label;
lv_style_init(&style_version_label);
lv_style_set_text_font(&style_version_label, &lv_font_montserrat_8);
lv_style_set_text_color(&style_version_label, lv_palette_main(LV_PALETTE_GREY));
lv_obj_add_style(version_label, &style_version_label, LV_PART_MAIN);
// links davon die Abtastrate
bmr_label = lv_label_create(lv_screen_active());
char rate[20];
sprintf(rate, "Rate: %ds", updateTime / 1000);
lv_label_set_text(bmr_label, rate);
lv_obj_align(bmr_label, LV_ALIGN_BOTTOM_LEFT, 10, 0);
lv_obj_add_style(bmr_label, &style_info_label, LV_PART_MAIN);
}
void showRate(int r) {
char rate[20];
sprintf(rate, "Rate: %ds", r);
lv_label_set_text(bmr_label, rate);
}
void updatechartData(float value, float humvalue)
{
int i = 0;