Merge branch 'examples' into beta

lv_examples/1_1_hello_world/lv_ex_hello_world.c

@@ -1,5 +1,5 @@
 /**
- * @file lv_hello_world.c
+ * @file lv_ex_hello_world.c
  *
  */
 
@@ -14,7 +14,7 @@
 /*********************
  *      INCLUDES
  *********************/
-#include "lv_hello_world.h"
+#include "lv_ex_hello_world.h"
 #if USE_LV_EXAMPLE != 0
 
 #include "lvgl/lvgl.h"
@@ -46,7 +46,7 @@
 /**
  * Create a simple 'Hello world!' label
  */
-void lv_hello_world_init(void)
+void lv_ex_hello_world(void)
 {
     /*Create a Label on the current screen*/
     lv_obj_t * label1 =  lv_label_create(lv_scr_act(), NULL);

lv_examples/1_1_hello_world/lv_ex_hello_world.h

@@ -0,0 +1,42 @@
+/**
+ * @file lv_ex_hello_world.h
+ *
+ */
+
+#ifndef LV_EX_HELLO_WORLD_H
+#define LV_EX_HELLO_WORLD_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/*********************
+ *      INCLUDES
+ *********************/
+#include "lv_conf.h"
+#if USE_LV_EXAMPLE != 0
+
+/*********************
+ *      DEFINES
+ *********************/
+
+/**********************
+ *      TYPEDEFS
+ **********************/
+
+/**********************
+ * GLOBAL PROTOTYPES
+ **********************/
+void lv_ex_hello_world(void);
+
+/**********************
+ *      MACROS
+ **********************/
+
+#endif /*USE_LV_EXAMPLE != 0*/
+
+#ifdef __cplusplus
+} /* extern "C" */
+#endif
+
+#endif /*LV_HELLO_WORLD_H*/

lv_examples/1_2_objects/lv_ex_objects.c

@@ -0,0 +1,218 @@
+/**
+ * @file lv_hello_world.c
+ *
+ */
+
+/*
+ * The basic building blocks (components or widgets) in LittlevGL are the graphical objects.
+ * For example:
+ *  - Buttons
+ *  - Labels
+ *  - Charts
+ *  - Sliders etc
+ *
+ * In this part you can learn the basics of the objects like creating, positioning, sizing etc.
+ * You will also meet some different object types and their attributes.
+ *
+ * Regardless to the object type the 'lv_obj_t' variable type is used stores the objects
+ * and you can refer to an object with an lv_obj_t pointer (lv_obj_t *)
+ *
+ * INHERITANCE
+ * -------------
+ * Similarly to object oriented languages some kind of inheritance is used
+ * among the object types.
+ *
+ * Every object is derived from the 'Basic object'. (lv_obj)
+ *
+ * The types are backward compatible which means a type can use all the ancestor
+ * attributes/functions too.
+ *
+ * For example a 'Button' is derived from 'Container'  which is derived from 'Basic objects'.
+ * Therefore a button can use container attributes like automatically fit size to the content.
+ *
+ * PARENT-CHILD
+ * -------------
+ * A parent can be considered as the container of its children.
+ * Every object has exactly one parent object (except screens).
+ * A parent can have unlimited number of children.
+ * There is no limitation for the type of the parent.
+ *
+ * The children are visible only on their parent. The parts outside will be cropped (not displayed)
+ *
+ * If the parent is moved the children will be moved with it.
+ *
+ * The earlier created object (and its children) will drawn earlier.
+ * Using this layers can be built.
+ *
+ * LEARN MORE
+ * -------------
+ * - General overview: http://www.gl.littlev.hu/objects
+ * - Detailed description of types: http://www.gl.littlev.hu/object-types
+ *
+ * NOTES
+ * -------------
+ * - Be sure 'LV_OBJ_FREE_P' is enabled in 'lv_conf.h'
+ */
+
+/*********************
+ *      INCLUDES
+ *********************/
+#include "lv_ex_objects.h"
+#if USE_LV_EXAMPLE != 0
+
+#include "lvgl/lvgl.h"
+
+/*********************
+ *      DEFINES
+ *********************/
+
+/**********************
+ *      TYPEDEFS
+ **********************/
+
+/**********************
+ *  STATIC PROTOTYPES
+ **********************/
+static  lv_action_res_t btn_rel_action(lv_obj_t * btn, lv_dispi_t * dispi);
+static  lv_action_res_t ddlist_action(lv_obj_t * ddlist, lv_dispi_t * dispi);
+
+/**********************
+ *  STATIC VARIABLES
+ **********************/
+
+/**********************
+ *      MACROS
+ **********************/
+
+/**********************
+ *   GLOBAL FUNCTIONS
+ **********************/
+
+/**
+ * Initialize the Object usage example
+ */
+void lv_ex_objects(void)
+{
+
+    /********************
+     * CREATE A SCREEN
+     *******************/
+
+    /* Create a new screen and load it
+     * Screen can be created from any type object
+     * Now a Page is used which is an objects with scrollable content*/
+    lv_obj_t * scr = lv_page_create(NULL, NULL);
+    lv_scr_load(scr);
+
+
+    /****************
+     * ADD A TITLE
+     ****************/
+    lv_obj_t * label = lv_label_create(scr, NULL);  /*First parameters (scr) is the parent*/
+    lv_label_set_text(label, "Object usage demo");  /*Set the text*/
+    lv_obj_set_x(label, 50);       /*Labels are inherited from Basic object so 'lv_obj_...' functions can be used*/
+
+
+    /********************
+     * CREATE TWO BUTTONS
+     ********************/
+
+    /*Create a button*/
+    lv_obj_t * btn1 = lv_btn_create(lv_scr_act(), NULL);    /*Create a button on the currently loaded screen*/
+    lv_btn_set_rel_action(btn1, btn_rel_action);            /*Set function to call when the button is released*/
+    lv_obj_align(btn1, label, LV_ALIGN_OUT_BOTTOM_LEFT, 0, 20); /*Align below the label*/
+    label = lv_label_create(btn1, NULL);                    /*Create a label on the button (the 'label' variable can be reused)*/
+    lv_label_set_text(label, "Button 1");
+
+    /*Copy the previous button*/
+    lv_obj_t * btn2 = lv_btn_create(lv_scr_act(), btn1);    /*Second parameter is an object to copy*/
+    lv_obj_align(btn2, btn1, LV_ALIGN_OUT_RIGHT_MID, 50, 0);/*Align next to the prev. button.*/
+    label = lv_label_create(btn2, NULL);                     /*Create a label on the button*/
+    lv_label_set_text(label, "Button 2");
+
+
+    /****************
+     * ADD A SLIDER
+     ****************/
+
+    /*Add a slider (inheritance: lv_obj -> lv_bar -> lv_slider)*/
+    lv_obj_t * slider = lv_slider_create(scr, NULL);                            /*Create a slider*/
+    lv_obj_set_size(slider, lv_obj_get_width(lv_scr_act())  / 3, LV_DPI / 3);   /*Set the size*/
+    lv_obj_align(slider, btn1, LV_ALIGN_OUT_BOTTOM_LEFT, 0, 20);                /*Align below the first button*/
+    lv_bar_set_value(slider, 30);                                               /*Slider is a 'bar' so set its value like a 'bar'*/
+
+
+    /***********************
+     * ADD A DROP DOWN LIST
+     ************************/
+
+    lv_obj_t * ddlist = lv_ddlist_create(lv_scr_act(), NULL);
+    lv_obj_align(ddlist, slider, LV_ALIGN_OUT_RIGHT_TOP, 20, 0);        /*Align next to the slider*/
+    lv_obj_set_free_p(ddlist, slider);                                  /*Save the pointer of the slider in the ddlist (used in 'ddlist_action()')*/
+    lv_ddlist_set_options_str(ddlist, "None\nLittle\nHalf\nA lot\nAll");    /*Set the options*/
+    lv_ddlist_set_action(ddlist, ddlist_action);                        /*Set function to call on new option choose*/
+    lv_obj_set_top(ddlist, true);                                       /*Enable the drop down list always be on the top*/
+
+
+    /****************
+     * CREATE A CHART
+     ****************/
+    lv_obj_t * chart = lv_chart_create(lv_scr_act(), NULL);         /*Craete the chart*/
+    lv_obj_set_size(chart, lv_obj_get_width(scr) / 2, lv_obj_get_width(scr) / 4);   /*Set the size*/
+    lv_obj_align(chart, slider, LV_ALIGN_OUT_BOTTOM_LEFT, 0, 20);   /*Align below the slider*/
+    lv_chart_set_dl_width(chart, 3 * LV_DOWNSCALE);                 /*Set the line width (LV_DOWNSCALE compensates anti-aliasing if enabled)*/
+
+    /*Add a RED data line and set some points*/
+    lv_chart_dl_t * dl1 = lv_chart_add_data_line(chart, COLOR_RED);
+    lv_chart_set_next(chart, dl1, 10);
+    lv_chart_set_next(chart, dl1, 25);
+    lv_chart_set_next(chart, dl1, 45);
+    lv_chart_set_next(chart, dl1, 80);
+
+    /*Add a BLUE data line and set some points*/
+    lv_chart_dl_t * dl2 = lv_chart_add_data_line(chart, COLOR_MAKE(0x40, 0x70, 0xC0));
+    lv_chart_set_next(chart, dl2, 10);
+    lv_chart_set_next(chart, dl2, 25);
+    lv_chart_set_next(chart, dl2, 45);
+    lv_chart_set_next(chart, dl2, 80);
+    lv_chart_set_next(chart, dl2, 75);
+    lv_chart_set_next(chart, dl2, 505);
+
+}
+
+/**********************
+ *   STATIC FUNCTIONS
+ **********************/
+
+/**
+ * Called when a button is released
+ * @param btn pointer to the released button
+ * @param dispi pointer to caller display input (e.g. touchpad)
+ * @return LV_ACTION_RES_OK because the object is not deleted in this function
+ */
+static  lv_action_res_t btn_rel_action(lv_obj_t * btn, lv_dispi_t * dispi)
+{
+    /*Increase the button width*/
+    cord_t width = lv_obj_get_width(btn);
+    lv_obj_set_width(btn, width + 20);
+
+    return LV_ACTION_RES_OK;
+}
+
+/**
+ * Called when a new option is chosen in the drop down list
+ * @param ddlist pointer to the drop down list
+ * @param dispi pointer to caller display input (e.g. touchpad)
+ * @return LV_ACTION_RES_OK because the object is not deleted in this function
+ */
+static  lv_action_res_t ddlist_action(lv_obj_t * ddlist, lv_dispi_t * dispi)
+{
+    uint16_t opt = lv_ddlist_get_selected(ddlist);      /*Get the id of selected option*/
+
+    lv_obj_t * slider = lv_obj_get_free_p(ddlist);      /*Get the saved slider*/
+    lv_bar_set_value(slider, (opt * 100) / 4);          /*Modify the slider value according to the selection*/
+
+    return LV_ACTION_RES_OK;
+}
+
+#endif /*USE_LV_EXAMPLE != 0*/

lv_examples/1_2_objects/lv_ex_objects.h

@@ -0,0 +1,42 @@
+/**
+ * @file lv_ex_objects.h
+ *
+ */
+
+#ifndef LV_EX_OBJECTS_H
+#define LV_EX_OBJECTS_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/*********************
+ *      INCLUDES
+ *********************/
+#include "lv_conf.h"
+#if USE_LV_EXAMPLE != 0
+
+/*********************
+ *      DEFINES
+ *********************/
+
+/**********************
+ *      TYPEDEFS
+ **********************/
+
+/**********************
+ * GLOBAL PROTOTYPES
+ **********************/
+void lv_ex_objects(void);
+
+/**********************
+ *      MACROS
+ **********************/
+
+#endif /*USE_LV_EXAMPLE != 0*/
+
+#ifdef __cplusplus
+} /* extern "C" */
+#endif
+
+#endif /*LV_OBJ_USAGE_H*/

lv_examples/1_3_styles/lv_ex_styles.c

@@ -0,0 +1,161 @@
+/**
+ * @file lv_ex_styles.h
+ *
+ */
+
+/*
+ * You can modify the appearance of the graphical objects with styles.
+ * A style is simple 'lv_style_t' variable.
+ * Objects save the address of this variable so it has to be 'static or 'global'.
+ *
+ * A style contains various attributes to describe rectangle, image or text like
+ * objects at same time. To know which attribute is used by an object see:
+ * http://www.gl.littlev.hu/object-types
+ *
+ * To set a new style for an object use: 'lv_obj_set_style(obj, &style);
+ * If NULL is set as style then the object will inherit the parents style.
+ * For example is you create a style for button the label appearance can be defined there as well.
+ *
+ * You can use built-in styles. 'lv_style_get(LV_STYLE_... , &copy)' will give you a pointer to built in style
+ * and copy it to variable (second parameter) if it is not NULL.
+ * By default the objects use the built-in styles.
+ * The built-in styles can be modified in run time to give a new default skin to your GUI.
+ *
+ * Learn more here: http://www.gl.littlev.hu/objects#style
+ * */
+
+/*********************
+ *      INCLUDES
+ *********************/
+#include "lv_ex_styles.h"
+
+#if USE_LV_EXAMPLE != 0
+
+#include "lvgl/lvgl.h"
+
+/*********************
+ *      DEFINES
+ *********************/
+
+/**********************
+ *      TYPEDEFS
+ **********************/
+
+/**********************
+ *  STATIC PROTOTYPES
+ **********************/
+
+/**********************
+ *  STATIC VARIABLES
+ **********************/
+
+/**********************
+ *      MACROS
+ **********************/
+
+/**********************
+ *   GLOBAL FUNCTIONS
+ **********************/
+
+/**
+ * Create a simple 'Hello world!' label
+ */
+void lv_ex_styles(void)
+{
+
+    /****************************************
+     * BASE OBJECT + LABEL WITH DEFAULT STYLE
+     ****************************************/
+
+    lv_obj_t * obj1;
+    obj1 = lv_obj_create(lv_scr_act(), NULL);           /*Create a simple objects*/
+    lv_obj_set_pos(obj1, 10, 10);
+    lv_obj_t * label = lv_label_create(obj1, NULL);
+
+    /*Add a label to the object*/
+    lv_label_set_text(label, "Default");
+    lv_obj_align(label, NULL, LV_ALIGN_CENTER, 0, 0);
+
+    /****************************************
+     * BASE OBJECT WITH PRETTY COLOR STYLE
+     ****************************************/
+
+    lv_obj_t * obj2;
+    obj2 = lv_obj_create(lv_scr_act(), NULL);
+    lv_obj_align(obj2, obj1, LV_ALIGN_OUT_RIGHT_MID, 20, 0);            /*Align next to the previous object*/
+    lv_obj_set_style(obj2, lv_style_get(LV_STYLE_PRETTY_COLOR, NULL));  /*Set built in style*/
+    label = lv_label_create(obj2, NULL);
+
+    /* Add a label to the object.
+     * Labels by default inherit the parent's style */
+    lv_label_set_text(label, "Pretty\ncolor");
+    lv_obj_align(label, NULL, LV_ALIGN_CENTER, 0, 0);
+
+    /*****************************
+     * BASE OBJECT WITH NEW STYLE
+     *****************************/
+
+    /* Create a new style */
+    static lv_style_t style_new;                       /*Styles can't be local variables*/
+    lv_style_get(LV_STYLE_PRETTY_COLOR, &style_new);   /*Copy a built-in style as a starting point*/
+    style_new.radius = LV_RADIUS_CIRCLE;               /*Fully round corners*/
+    style_new.swidth = 8;                              /*8 px shadow*/
+    style_new.bwidth = 2;                              /*2 px border width*/
+    style_new.mcolor = COLOR_WHITE;                    /*White main color*/
+    style_new.gcolor = color_mix(COLOR_BLUE, COLOR_WHITE, OPA_40);     /*light blue gradient color*/
+    style_new.scolor = COLOR_MAKE(0xa0, 0xa0, 0xa0);    /*Light gray shadow color*/
+    style_new.ccolor = color_mix(COLOR_BLUE, COLOR_WHITE, OPA_90);  /*Blue content color (text color)*/
+    style_new.letter_space = 10;                       /*10 px letter space*/
+    style_new.txt_align = LV_TXT_ALIGN_MID;            /*Middel text align*/
+
+    /*Create a base object and apply the new style*/
+    lv_obj_t * obj3;
+    obj3 = lv_obj_create(lv_scr_act(), NULL);
+    lv_obj_align(obj3, obj2, LV_ALIGN_OUT_RIGHT_MID, 20, 0);
+    lv_obj_set_style(obj3, &style_new);
+
+    /* Add a label to the object.
+     * Labels by default inherit the parent's style */
+    label = lv_label_create(obj3, NULL);
+    lv_label_set_text(label, "New\nstyle");
+    lv_obj_align(label, NULL, LV_ALIGN_CENTER, 0, 0);
+
+
+    /************************
+     * CREATE A STYLED LED
+     ***********************/
+
+    /*Create a style for the LED*/
+    static lv_style_t style_led;
+    lv_style_get(LV_STYLE_PRETTY_COLOR, &style_led);
+    style_led.swidth = 15;
+    style_led.radius = LV_RADIUS_CIRCLE;
+    style_led.bwidth = 3;
+    style_led.bopa = OPA_30;
+    style_led.mcolor = COLOR_MAKE(0xb5, 0x0f, 0x04);
+    style_led.gcolor = COLOR_MAKE(0x50, 0x07, 0x02);
+    style_led.bcolor = COLOR_MAKE(0xfa, 0x0f, 0x00);
+    style_led.scolor = COLOR_MAKE(0xb5, 0x0f, 0x04);
+
+    /*Create a LED and switch it ON*/
+    lv_obj_t * led1  = lv_led_create(lv_scr_act(), NULL);
+    lv_obj_set_style(led1, &style_led);
+    lv_obj_align_us(led1, obj1, LV_ALIGN_OUT_BOTTOM_MID, 0, 40);
+    lv_led_on(led1);
+
+    /*Copy the previous LED and set a brightness*/
+    lv_obj_t * led2  = lv_led_create(lv_scr_act(), led1);
+    lv_obj_align_us(led2, obj2, LV_ALIGN_OUT_BOTTOM_MID, 0, 40);
+    lv_led_set_bright(led2, 190);
+
+    /*Copy the previous LED and switch it OFF*/
+    lv_obj_t * led3  = lv_led_create(lv_scr_act(), led1);
+    lv_obj_align_us(led3, obj3, LV_ALIGN_OUT_BOTTOM_MID, 0, 40);
+    lv_led_off(led3);
+}
+
+/**********************
+ *   STATIC FUNCTIONS
+ **********************/
+
+#endif /*USE_LV_EXAMPLE != 0*/

lv_examples/1_3_styles/lv_ex_styles.h

@@ -1,10 +1,10 @@
 /**
- * @file lv_hello_world.h
+ * @file style_usage.h
  *
  */
 
-#ifndef LV_HELLO_WORLD_H
-#define LV_HELLO_WORLD_H
+#ifndef STYLE_USAGE_H
+#define STYLE_USAGE_H
 
 #ifdef __cplusplus
 extern "C" {
@@ -27,7 +27,7 @@ extern "C" {
 /**********************
  * GLOBAL PROTOTYPES
  **********************/
-void lv_hello_world_init(void);
+void lv_ex_styles(void);
 
 /**********************
  *      MACROS

lv_examples/1_5_animations/animations.c

@@ -1,28 +0,0 @@
-/*
- *
-    static lv_style_t s1;
-    lv_style_get(LV_STYLE_BTN_REL, &s1);
-
-    static lv_style_t s2;
-    lv_style_get(LV_STYLE_BTN_REL, &s2);
-    s2.radius = 30;
-    s2.mcolor = COLOR_RED;
-    s2.bwidth = 8;
-    s2.opa = 50;
-    s2.hpad = 80;
-    //s2.font = font_get(FONT_DEJAVU_60);
-
-
-    lv_style_anim_t a;
-    a.act_time = -1000;
-    a.time = 1000;
-    a.playback = 1;
-    a.playback_pause = 300;
-    a.repeat = 1;
-    a.repeat_pause = 300;
-    a.end_cb = NULL;
-    a.style_anim = lv_style_get(LV_STYLE_BTN_REL, NULL);
-    a.style_start = &s1;
-    a.style_end = &s2;
-    lv_style_anim_create(&a);
- */

lv_examples/1_5_animations/lv_ex_animations.c

@@ -0,0 +1 @@
+

lv_examples/2_2_encoder_ctrl/lv_ex_encoder_ctrl.c

@@ -1,5 +1,5 @@
 /**
- * @file encoder_ctrl.c
+ * @file lv_ex_encoder_ctrl.c
  *
  */
 
@@ -33,7 +33,7 @@
 /*********************
  *      INCLUDES
  *********************/
-#include "encoder_ctrl.h"
+#include "lv_ex_encoder_ctrl.h"
 #if USE_LV_EXAMPLE != 0
 
 #include "lvgl/lvgl.h"
@@ -78,7 +78,7 @@ static lv_group_t * g;              /*An Object Group*/
 /**
  * Create a simple GUI to demonstrate encoder control capability
  */
-void encoder_ctrl_init(void)
+void lv_ex_encoder_ctrl(void)
 {
     /* Create a Page screen (to make it scrollable)
      * and use Pretty layout to make the content responsive.

lv_examples/2_2_encoder_ctrl/lv_ex_encoder_ctrl.h

@@ -1,10 +1,10 @@
 /**
- * @file encoder_ctrl.h
+ * @file lv_ex_encoder_ctrl.h
  *
  */
 
-#ifndef ENCODER_CTRL_H
-#define ENCODER_CTRL_H
+#ifndef LV_EX_ENCODER_CTRL_H
+#define LV_EX_ENCODER_CTRL_H
 
 #ifdef __cplusplus
 extern "C" {
@@ -27,7 +27,7 @@ extern "C" {
 /**********************
  * GLOBAL PROTOTYPES
  **********************/
-void encoder_ctrl_init(void);
+void lv_ex_encoder_ctrl(void);
 
 /**********************
  *      MACROS