align main.c with Eclipse sim version

main/src/main.c

@@ -10,15 +10,15 @@
 #define _DEFAULT_SOURCE /* needed for usleep() */
 #include <stdlib.h>
 #include <unistd.h>
-#define SDL_MAIN_HANDLED /*To fix SDL's "undefined reference to WinMain" \
+#define SDL_MAIN_HANDLED /*To fix SDL's "undefined reference to WinMain" issue*/
-                            issue*/
 #include <SDL2/SDL.h>
 #include "lvgl/lvgl.h"
+#include "lvgl/examples/lv_examples.h"
+#include "lv_examples/lv_demo.h"
 #include "lv_drivers/display/monitor.h"
 #include "lv_drivers/indev/mouse.h"
 #include "lv_drivers/indev/keyboard.h"
 #include "lv_drivers/indev/mousewheel.h"
-#include "lv_examples/lv_demo.h"
 
 /*********************
  *      DEFINES
@@ -37,12 +37,6 @@ static int tick_thread(void *data);
 /**********************
  *  STATIC VARIABLES
  **********************/
-lv_disp_draw_buf_t disp_buf1;
-lv_color_t buf1_1[MONITOR_HOR_RES * 120];
-lv_disp_drv_t disp_drv;
-lv_indev_drv_t mouse_drv;
-lv_indev_drv_t keyb_drv;
-lv_indev_drv_t enc_drv;
 
 /**********************
  *      MACROS
@@ -52,6 +46,26 @@ lv_indev_drv_t enc_drv;
  *   GLOBAL FUNCTIONS
  **********************/
 
+/*********************
+ *      DEFINES
+ *********************/
+
+/**********************
+ *      TYPEDEFS
+ **********************/
+
+/**********************
+ *      VARIABLES
+ **********************/
+
+/**********************
+ *  STATIC PROTOTYPES
+ **********************/
+
+/**********************
+ *   GLOBAL FUNCTIONS
+ **********************/
+
 int main(int argc, char **argv)
 {
   (void)argc; /*Unused*/
@@ -63,6 +77,24 @@ int main(int argc, char **argv)
   /*Initialize the HAL (display, input devices, tick) for LVGL*/
   hal_init();
 
+//  lv_example_switch_1();
+//  lv_example_calendar_1();
+//  lv_example_btnmatrix_2();
+//  lv_example_checkbox_1();
+//  lv_example_colorwheel_1();
+//  lv_example_chart_6();
+//  lv_example_table_2();
+//  lv_example_scroll_2();
+//  lv_example_textarea_1();
+//  lv_example_msgbox_1();
+//  lv_example_dropdown_2();
+//  lv_example_btn_1();
+//  lv_example_scroll_1();
+//  lv_example_tabview_1();
+//  lv_example_tabview_1();
+//  lv_example_flex_3();
+//  lv_example_label_1();
+
   lv_demo_widgets();
 //  lv_demo_keypad_encoder();
 //  lv_demo_benchmark();
@@ -72,7 +104,7 @@ int main(int argc, char **argv)
   while(1) {
     /* Periodically call the lv_task handler.
      * It could be done in a timer interrupt or an OS task too.*/
-    lv_task_handler();
+    lv_timer_handler();
     usleep(5 * 1000);
   }
 
@@ -84,58 +116,73 @@ int main(int argc, char **argv)
  **********************/
 
 /**
- * Initialize the Hardware Abstraction Layer (HAL) for the Littlev graphics
+ * Initialize the Hardware Abstraction Layer (HAL) for the LVGL graphics
  * library
  */
-static void hal_init(void) {
+static void hal_init(void)
+{
   /* Use the 'monitor' driver which creates window on PC's monitor to simulate a display*/
   monitor_init();
+  /* Tick init.
+   * You have to call 'lv_tick_inc()' in periodically to inform LittelvGL about
+   * how much time were elapsed Create an SDL thread to do this*/
+  SDL_CreateThread(tick_thread, "tick", NULL);
 
   /*Create a display buffer*/
-  lv_disp_draw_buf_init(&disp_buf1, buf1_1, NULL, MONITOR_HOR_RES * 120);
+  static lv_disp_draw_buf_t disp_buf1;
+  static lv_color_t buf1_1[MONITOR_HOR_RES * 100];
+  static lv_color_t buf1_2[MONITOR_HOR_RES * 100];
+  lv_disp_draw_buf_init(&disp_buf1, buf1_1, buf1_2, MONITOR_HOR_RES * 100);
 
   /*Create a display*/
+  static lv_disp_drv_t disp_drv;
   lv_disp_drv_init(&disp_drv); /*Basic initialization*/
   disp_drv.draw_buf = &disp_buf1;
   disp_drv.flush_cb = monitor_flush;
   disp_drv.hor_res = MONITOR_HOR_RES;
   disp_drv.ver_res = MONITOR_VER_RES;
-  lv_disp_drv_register(&disp_drv);
+  disp_drv.antialiasing = 1;
+
+  lv_disp_t * disp = lv_disp_drv_register(&disp_drv);
+
+  lv_theme_t * th = lv_theme_default_init(disp, lv_palette_main(LV_PALETTE_BLUE), lv_palette_main(LV_PALETTE_RED), LV_THEME_DEFAULT_DARK, LV_FONT_DEFAULT);
+  lv_disp_set_theme(disp, th);
+
+  lv_group_t * g = lv_group_create();
+  lv_group_set_default(g);
 
   /* Add the mouse as input device
    * Use the 'mouse' driver which reads the PC's mouse*/
   mouse_init();
-  lv_indev_drv_init(&mouse_drv); /*Basic initialization*/
+  static lv_indev_drv_t indev_drv_1;
-  mouse_drv.type = LV_INDEV_TYPE_POINTER;
+  lv_indev_drv_init(&indev_drv_1); /*Basic initialization*/
+  indev_drv_1.type = LV_INDEV_TYPE_POINTER;
 
   /*This function will be called periodically (by the library) to get the mouse position and state*/
-  mouse_drv.read_cb = mouse_read;
+  indev_drv_1.read_cb = mouse_read;
-  lv_indev_t *mouse_indev = lv_indev_drv_register(&mouse_drv);
+  lv_indev_t *mouse_indev = lv_indev_drv_register(&indev_drv_1);
+
+  keyboard_init();
+  static lv_indev_drv_t indev_drv_2;
+  lv_indev_drv_init(&indev_drv_2); /*Basic initialization*/
+  indev_drv_2.type = LV_INDEV_TYPE_KEYPAD;
+  indev_drv_2.read_cb = keyboard_read;
+  lv_indev_t *kb_indev = lv_indev_drv_register(&indev_drv_2);
+  lv_indev_set_group(kb_indev, g);
+  mousewheel_init();
+  static lv_indev_drv_t indev_drv_3;
+  lv_indev_drv_init(&indev_drv_3); /*Basic initialization*/
+  indev_drv_3.type = LV_INDEV_TYPE_ENCODER;
+  indev_drv_3.read_cb = mousewheel_read;
+
+  lv_indev_t * enc_indev = lv_indev_drv_register(&indev_drv_3);
+  lv_indev_set_group(enc_indev, g);
 
   /*Set a cursor for the mouse*/
   LV_IMG_DECLARE(mouse_cursor_icon); /*Declare the image file.*/
   lv_obj_t * cursor_obj = lv_img_create(lv_scr_act()); /*Create an image object for the cursor */
   lv_img_set_src(cursor_obj, &mouse_cursor_icon);           /*Set the image source*/
   lv_indev_set_cursor(mouse_indev, cursor_obj);             /*Connect the image  object to the driver*/
-
-  /* Add the keyboard as input device
-   * Use the 'keyboard' driver which reads the PC's keyboard*/
-  lv_indev_drv_init(&keyb_drv);
-  keyb_drv.type = LV_INDEV_TYPE_KEYPAD;
-  keyb_drv.read_cb = keyboard_read;
-  lv_indev_drv_register(&keyb_drv);
-
-  /* Add the mouse wheel as input device (encoder type)
-   * Use the 'mousewheel' driver which reads the PC's mouse wheel*/
-  lv_indev_drv_init(&enc_drv);
-  enc_drv.type = LV_INDEV_TYPE_ENCODER;
-  enc_drv.read_cb = mousewheel_read;
-  lv_indev_drv_register(&enc_drv);
-
-  /* Tick init.
-   * You have to call 'lv_tick_inc()' in periodically to inform LittelvGL about
-   * how much time were elapsed Create an SDL thread to do this*/
-  SDL_CreateThread(tick_thread, "tick", NULL);
 }
 
 /**
@@ -147,7 +194,7 @@ static int tick_thread(void *data) {
   (void)data;
 
   while(1) {
-    SDL_Delay(5);   /*Sleep for 5 millisecond*/
+    SDL_Delay(5);
     lv_tick_inc(5); /*Tell LittelvGL that 5 milliseconds were elapsed*/
   }