Skip to content

Commit fe875f4

Browse files
0x1abin0x1abin
committed
update i2s module
1 parent 5c9453e commit fe875f4

5 files changed

Lines changed: 4 additions & 1145 deletions

File tree

‎MicroPython_BUILD/components/micropython/esp32/machine_i2s.c‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@
2727
#include "py/obj.h"
2828
#include "py/objstr.h"
2929
#include "driver/i2s.h"
30-
// #include "machine_i2s.h"
3130
#include "py/runtime.h"
3231
#include "py/mperrno.h"
3332

‎MicroPython_BUILD/components/micropython/esp32/moddisplay.c‎

Lines changed: 4 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1558,8 +1558,6 @@ STATIC mp_obj_t display_tft_send_cmd_data(mp_obj_t self_in, mp_obj_t cmd_in, mp_
15581558
}
15591559
STATIC MP_DEFINE_CONST_FUN_OBJ_3(display_tft_send_cmd_data_obj, display_tft_send_cmd_data);
15601560

1561-
<<<<<<< HEAD
1562-
=======
15631561
//--------------------------------------------------
15641562
STATIC mp_obj_t display_tft_get_bg(mp_obj_t self_in)
15651563
{
@@ -1595,7 +1593,6 @@ STATIC mp_obj_t display_tft_set_fg(mp_obj_t self_in, mp_obj_t color_in)
15951593
STATIC MP_DEFINE_CONST_FUN_OBJ_2(display_tft_set_fg_obj, display_tft_set_fg);
15961594

15971595

1598-
>>>>>>> master
15991596
//================================================================
16001597
STATIC const mp_rom_map_elem_t display_tft_locals_dict_table[] = {
16011598
// instance methods
@@ -1631,7 +1628,10 @@ STATIC const mp_rom_map_elem_t display_tft_locals_dict_table[] = {
16311628
{ MP_ROM_QSTR(MP_QSTR_restorewin), MP_ROM_PTR(&display_tft_restoreclipwin_obj) },
16321629
{ MP_ROM_QSTR(MP_QSTR_screensize), MP_ROM_PTR(&display_tft_getSize_obj) },
16331630
{ MP_ROM_QSTR(MP_QSTR_winsize), MP_ROM_PTR(&display_tft_getWinSize_obj) },
1634-
<<<<<<< HEAD
1631+
{ MP_ROM_QSTR(MP_QSTR_get_fg), MP_ROM_PTR(&display_tft_get_fg_obj) },
1632+
{ MP_ROM_QSTR(MP_QSTR_get_bg), MP_ROM_PTR(&display_tft_get_bg_obj) },
1633+
{ MP_ROM_QSTR(MP_QSTR_set_fg), MP_ROM_PTR(&display_tft_set_fg_obj) },
1634+
{ MP_ROM_QSTR(MP_QSTR_set_bg), MP_ROM_PTR(&display_tft_set_bg_obj) },
16351635
// { MP_ROM_QSTR(MP_QSTR_setCalib), MP_ROM_PTR(&display_tft_setCalib_obj) },
16361636
// { MP_ROM_QSTR(MP_QSTR_getCalib), MP_ROM_PTR(&display_tft_getCalib_obj) },
16371637
// { MP_ROM_QSTR(MP_QSTR_backlight), MP_ROM_PTR(&display_tft_backlight_obj) },
@@ -1644,16 +1644,6 @@ STATIC const mp_rom_map_elem_t display_tft_locals_dict_table[] = {
16441644
{ MP_ROM_QSTR(MP_QSTR_setCursor), MP_ROM_PTR(&display_tft_setCursor_obj) },
16451645
{ MP_ROM_QSTR(MP_QSTR_getCursor), MP_ROM_PTR(&display_tft_getCursor_obj) },
16461646
{ MP_ROM_QSTR(MP_QSTR_setBrightness), MP_ROM_PTR(&display_tft_setBrightness_obj) },
1647-
=======
1648-
{ MP_ROM_QSTR(MP_QSTR_setCalib), MP_ROM_PTR(&display_tft_setCalib_obj) },
1649-
{ MP_ROM_QSTR(MP_QSTR_getCalib), MP_ROM_PTR(&display_tft_getCalib_obj) },
1650-
{ MP_ROM_QSTR(MP_QSTR_backlight), MP_ROM_PTR(&display_tft_backlight_obj) },
1651-
{ MP_ROM_QSTR(MP_QSTR_getTouchType), MP_ROM_PTR(&display_tft_touch_type_obj) },
1652-
{ MP_ROM_QSTR(MP_QSTR_get_fg), MP_ROM_PTR(&display_tft_get_fg_obj) },
1653-
{ MP_ROM_QSTR(MP_QSTR_get_bg), MP_ROM_PTR(&display_tft_get_bg_obj) },
1654-
{ MP_ROM_QSTR(MP_QSTR_set_fg), MP_ROM_PTR(&display_tft_set_fg_obj) },
1655-
{ MP_ROM_QSTR(MP_QSTR_set_bg), MP_ROM_PTR(&display_tft_set_bg_obj) },
1656-
>>>>>>> master
16571647

16581648
{ MP_ROM_QSTR(MP_QSTR_tft_setspeed), MP_ROM_PTR(&display_tft_set_speed_obj) },
16591649
{ MP_ROM_QSTR(MP_QSTR_tft_select), MP_ROM_PTR(&display_tft_select_obj) },

‎MicroPython_BUILD/components/micropython/esp32/modmachine.c‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -894,7 +894,6 @@ STATIC const mp_rom_map_elem_t machine_module_globals_table[] = {
894894
{ MP_OBJ_NEW_QSTR(MP_QSTR_Neopixel), MP_ROM_PTR(&machine_neopixel_type) },
895895
{ MP_OBJ_NEW_QSTR(MP_QSTR_DHT), MP_ROM_PTR(&machine_dht_type) },
896896
{ MP_OBJ_NEW_QSTR(MP_QSTR_Onewire), MP_ROM_PTR(&machine_onewire_type) },
897-
<<<<<<< HEAD
898897

899898
// Constants
900899
{ MP_ROM_QSTR(MP_QSTR_LOG_NONE), MP_ROM_INT(ESP_LOG_NONE) },
@@ -906,9 +905,6 @@ STATIC const mp_rom_map_elem_t machine_module_globals_table[] = {
906905
{ MP_ROM_QSTR(MP_QSTR_EXT1_ANYHIGH), MP_ROM_INT(ESP_EXT1_WAKEUP_ANY_HIGH) },
907906
{ MP_ROM_QSTR(MP_QSTR_EXT1_ALLLOW), MP_ROM_INT(ESP_EXT1_WAKEUP_ALL_LOW) },
908907
{ MP_ROM_QSTR(MP_QSTR_EXT1_ANYLOW), MP_ROM_INT(EXT1_WAKEUP_ALL_HIGH) },
909-
=======
910-
{ MP_OBJ_NEW_QSTR(MP_QSTR_I2S), MP_ROM_PTR(&machine_i2s_type) },
911-
>>>>>>> i2s
912908
};
913909
STATIC MP_DEFINE_CONST_DICT(machine_module_globals, machine_module_globals_table);
914910

‎MicroPython_BUILD/components/micropython/extmod/vfs_native.c‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -655,11 +655,7 @@ STATIC void checkBoot_py()
655655
if (fd != NULL) {
656656
char buf[128] = {'\0'};
657657
// sprintf(buf, "# This file is executed on every boot (including wake-boot from deepsleep)\nimport sys\nsys.path[1] = '/flash/lib'\n");
658-
<<<<<<< HEAD
659-
sprintf(buf, "import inisetup\n");
660-
=======
661658
sprintf(buf, "import inisetup\n");
662-
>>>>>>> i2s
663659
int len = strlen(buf);
664660
int res = fwrite(buf, 1, len, fd);
665661
if (res != len) {

0 commit comments

Comments
 (0)