Fix scrolling in can log

UOSupermileage · Sep 26, 2023 · ad03e0f · ad03e0f
1 parent 76c9036
commit ad03e0f
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 4 deletions.
diff --git a/UOSM-Dashboard/Core/Src/main.c b/UOSM-Dashboard/Core/Src/main.c
@@ -144,8 +144,8 @@ int main(void) {
     // Init the screen
     tft_init();
     touchpad_init();
-
-    DataAggregatorWrapper* wrapper = DataAggregator_Create(10, 10, 10, 10, 10, 10);
+#define N_CAN_MESSAGES_IN_LOG 8
+    DataAggregatorWrapper* wrapper = DataAggregator_Create(10, 10, 10, 10, 10, N_CAN_MESSAGES_IN_LOG);
     CAN_SetAggregator(wrapper);
     Application_Create(wrapper);
 

diff --git a/UOSM-Dashboard/Core/UI/LogView.cpp b/UOSM-Dashboard/Core/UI/LogView.cpp
@@ -6,6 +6,7 @@
 #include "StylesManager.hpp"
 
 #define LOG_VIEW_N_COLUMNS 1
+#define LOG_VIEW_PADDING 5
 
 LogView::LogView(lv_obj_t* parent, DataAggregator& aggregator) : View(parent, aggregator) {
     Styles* styles = StylesManager::GetStyles();
@@ -19,7 +20,7 @@ LogView::LogView(lv_obj_t* parent, DataAggregator& aggregator) : View(parent, ag
     table = lv_table_create(container);
 
     lv_table_set_col_cnt(table, LOG_VIEW_N_COLUMNS);
-    lv_table_set_col_width(table, 0, lv_obj_get_width(container));
+    lv_table_set_col_width(table, 0, lv_obj_get_width(container) - LOG_VIEW_PADDING);
 
     // The number of rows is equal to the theoretical max size of the can logs entry buffer. In practice, this buffer is almost always full.
     lv_table_set_row_cnt(table, getDataAggregator().canLogEntries.getSize());

diff --git a/UOSM-Dashboard/Core/UI/application.cpp b/UOSM-Dashboard/Core/UI/application.cpp
@@ -81,7 +81,7 @@ void Application_Create(DataAggregatorWrapper* aggregatorWrapper) {
     lv_obj_set_size(statsView->getContainer(), SCREEN_WIDTH, SCREEN_HEIGHT);
 
     logView = new LogView(nullptr, aggregator);
-    lv_obj_set_size(logView->getContainer(), SCREEN_WIDTH / 2, SCREEN_HEIGHT);
+    lv_obj_set_size(logView->getContainer(), SCREEN_WIDTH, SCREEN_HEIGHT);
 
     lv_scr_load(homeView->getContainer());