You need to open these files (VSCode is a good editor to use for this) and resolve the merge conflicts. Essentially, git couldnât figure out how to apply some of the new changes on top of the underlying code.
Once youâre done that, you can run git status on the command line. It will list the âunmerged pathsâ; you should add these to the commit with git add <file paths>. Then you can run git commit to actually do the merge.
If youâd prefer, I can do this for you and leave the result on a branch of lv_micropython.
I really appreciate your help !!!
Youâve probably read my RANTS and now you know why.
Before I waste too much of your valuable time I should learn how to fix these errors on my own.
It looks like you merged it successfully. See if you can compile MicroPython; sometimes git complains about lib/lv_bindings but the build works without problems. If it doesnât work I can give you the steps to fix lib/lv_bindings.
CC ../../lib/lv_bindings/driver/generic/modlvindev.c
In file included from ../../lib/lv_bindings/driver/generic/../include/common.h:4,
from ../../lib/lv_bindings/driver/generic/modlvindev.c:5:
../../lib/lv_bindings/driver/generic/modlvindev.c: In function 'indev_read':
../../lib/lv_bindings/driver/generic/modlvindev.c:131:40: error: passing argument 2 of 'mp_obj_new_exception_msg' from incompatible pointer type [-Werror=incompatible-pointer-types]
&mp_type_RuntimeError, "indev instance needs to be created before callback is called!"));
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
../../py/obj.h:275:35: note: in definition of macro 'MP_OBJ_TO_PTR'
#define MP_OBJ_TO_PTR(o) ((void *)o)
^
../../lib/lv_bindings/driver/generic/modlvindev.c:129:37: note: in expansion of macro 'nlr_raise'
if (!self || (!self->callback)) nlr_raise(
^~~~~~~~~
In file included from ../../lib/lv_bindings/driver/generic/../include/common.h:4,
from ../../lib/lv_bindings/driver/generic/modlvindev.c:5:
../../py/obj.h:734:86: note: expected 'mp_rom_error_text_t' {aka 'struct <anonymous> *'} but argument is of type 'char *'
mp_obj_t mp_obj_new_exception_msg(const mp_obj_type_t *exc_type, mp_rom_error_text_t msg);
~~~~~~~~~~~~~~~~~~~~^~~
cc1: all warnings being treated as errors
../../py/mkrules.mk:64: recipe for target 'build-GENERIC_SPIRAM/lib/lv_bindings/driver/generic/modlvindev.o' failed
make: *** [build-GENERIC_SPIRAM/lib/lv_bindings/driver/generic/modlvindev.o] Error 1
make: Leaving directory '/mnt/c/tpi-dev/lvgl/lv_micropython/ports/esp32'
(bld-lvgl) rich@RG-x360:/mnt/c/tpi-dev/lvgl/lv_micropython$