Skip to content

Commit a76d4d5

Browse files
committed
messing about with making the color addon use integer math
1 parent 9d7001e commit a76d4d5

File tree

2 files changed

+4
-3
lines changed

2 files changed

+4
-3
lines changed

ext_mod/lvgl_addons/src/color_addons.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ void lv_conical_gradient(uint8_t *buf, uint16_t radius, const lv_grad_dsc_t *gra
3333
dsc.stops_count = grad->stops_count;
3434

3535
lv_grad_t * gradient = lv_gradient_get(&dsc, circumference, 1);
36-
uint32_t grad_size = (uint32_t)gradient->size;
36+
uint32_t grad_size = (uint32_t)gradient->size * 1000;
3737

3838
int64_t twst = twist * 1000;
3939

@@ -66,7 +66,7 @@ void lv_conical_gradient(uint8_t *buf, uint16_t radius, const lv_grad_dsc_t *gra
6666
t = floormod(t, TWO_PI);
6767
t *= INV_TWO_PI;
6868

69-
step = (uint32_t)(t * grad_size) / 1000;
69+
step = (uint32_t)((t * grad_size) / 1000);
7070

7171
color = gradient->color_map[step];
7272
opa = gradient->opa_map[step];

micropython.cmake

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ file(GLOB_RECURSE LVGL_HEADERS ${CMAKE_CURRENT_LIST_DIR}/lib/lvgl/src/*.h ${CMAK
2525
if(${SECOND_BUILD_ENV} EQUAL "0")
2626
execute_process(
2727
COMMAND
28-
${Python3_EXECUTABLE} ${CMAKE_CURRENT_LIST_DIR}/gen/$ENV{GEN_SCRIPT}_api_gen_mpy.py ${LV_CFLAGS} --output=${CMAKE_BINARY_DIR}/lv_mp.c --include=${CMAKE_CURRENT_LIST_DIR} --include=${CMAKE_CURRENT_LIST_DIR}/include --include=${CMAKE_CURRENT_LIST_DIR}/lvgl --board=$ENV{LV_PORT} --module_name=lvgl --module_prefix=lv --metadata=${CMAKE_BINARY_DIR}/lv_mp.c.json --header_file=${LVGL_HEADER}
28+
${Python3_EXECUTABLE} ${CMAKE_CURRENT_LIST_DIR}/gen/$ENV{GEN_SCRIPT}_api_gen_mpy.py ${LV_CFLAGS} --output=${CMAKE_BINARY_DIR}/lv_mp.c --include=${CMAKE_CURRENT_LIST_DIR} --include=${CMAKE_CURRENT_LIST_DIR}/include --include=${CMAKE_CURRENT_LIST_DIR}/lib/lvgl --board=$ENV{LV_PORT} --module_name=lvgl --module_prefix=lv --metadata=${CMAKE_BINARY_DIR}/lv_mp.c.json --header_file=${LVGL_HEADER}
2929
WORKING_DIRECTORY
3030
${CMAKE_CURRENT_LIST_DIR}
3131

@@ -54,6 +54,7 @@ set(LVGL_MPY_INCLUDES
5454
${CMAKE_CURRENT_LIST_DIR}/lib/micropython
5555
${CMAKE_CURRENT_LIST_DIR}
5656
${CMAKE_CURRENT_LIST_DIR}/include
57+
${CMAKE_CURRENT_LIST_DIR}/lib/lvgl
5758
)
5859

5960
add_library(usermod_lvgl INTERFACE)

0 commit comments

Comments
 (0)