From f3592b1326e7771b892b0ce12aac4c34a189e34e Mon Sep 17 00:00:00 2001 From: Stephan Hadinger Date: Tue, 14 Sep 2021 22:29:27 +0200 Subject: [PATCH] Change berry class from `Serial` to `serial` --- lib/libesp32/Berry/default/be_serial_lib.c | 4 ++-- lib/libesp32/Berry/generate/be_const_strtab.h | 2 +- lib/libesp32/Berry/generate/be_const_strtab_def.h | 6 +++--- .../Berry/generate/be_fixed_be_class_tasmota_serial.h | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/lib/libesp32/Berry/default/be_serial_lib.c b/lib/libesp32/Berry/default/be_serial_lib.c index 3cbcbb0bf..4f1c4b577 100644 --- a/lib/libesp32/Berry/default/be_serial_lib.c +++ b/lib/libesp32/Berry/default/be_serial_lib.c @@ -21,13 +21,13 @@ extern int b_serial_flush(bvm *vm); void be_load_serial_lib(bvm *vm) { be_pushntvclass(vm, &be_class_tasmota_serial); - be_setglobal(vm, "Serial"); + be_setglobal(vm, "serial"); be_pop(vm, 1); } /* @const_object_info_begin -class be_class_tasmota_serial (scope: global, name: Serial) { +class be_class_tasmota_serial (scope: global, name: serial) { .p, var SERIAL_5N1, int(SERIAL_5N1) diff --git a/lib/libesp32/Berry/generate/be_const_strtab.h b/lib/libesp32/Berry/generate/be_const_strtab.h index c9bcb0e43..3008f5901 100644 --- a/lib/libesp32/Berry/generate/be_const_strtab.h +++ b/lib/libesp32/Berry/generate/be_const_strtab.h @@ -449,7 +449,6 @@ extern const bcstring be_const_str_remove_cmd; extern const bcstring be_const_str_TUYA_RX; extern const bcstring be_const_str_VL53L0X_XSHUT1; extern const bcstring be_const_str_WE517_RX; -extern const bcstring be_const_str_Serial; extern const bcstring be_const_str_open; extern const bcstring be_const_str_target_search; extern const bcstring be_const_str_clear; @@ -498,6 +497,7 @@ extern const bcstring be_const_str_find_key_i; extern const bcstring be_const_str_PZEM016_RX; extern const bcstring be_const_str_save; extern const bcstring be_const_str_SSD1351_DC; +extern const bcstring be_const_str_serial; extern const bcstring be_const_str__get_cb; extern const bcstring be_const_str_ROT1A; extern const bcstring be_const_str_I2S_OUT_DATA; diff --git a/lib/libesp32/Berry/generate/be_const_strtab_def.h b/lib/libesp32/Berry/generate/be_const_strtab_def.h index b5829772b..6e5038cd8 100644 --- a/lib/libesp32/Berry/generate/be_const_strtab_def.h +++ b/lib/libesp32/Berry/generate/be_const_strtab_def.h @@ -449,7 +449,6 @@ be_define_const_str(remove_cmd, "remove_cmd", 3832315702u, 0, 10, NULL); be_define_const_str(TUYA_RX, "TUYA_RX", 1609397679u, 0, 7, &be_const_str_VL53L0X_XSHUT1); be_define_const_str(VL53L0X_XSHUT1, "VL53L0X_XSHUT1", 2341134183u, 0, 14, &be_const_str_WE517_RX); be_define_const_str(WE517_RX, "WE517_RX", 4096577879u, 0, 8, NULL); -be_define_const_str(Serial, "Serial", 143954585u, 0, 6, &be_const_str_open); be_define_const_str(open, "open", 3546203337u, 0, 4, &be_const_str_target_search); be_define_const_str(target_search, "target_search", 1947846553u, 0, 13, NULL); be_define_const_str(clear, "clear", 1550717474u, 0, 5, &be_const_str_find); @@ -497,7 +496,8 @@ be_define_const_str(SERIAL_5E2, "SERIAL_5E2", 1180552854u, 0, 10, &be_const_str_ be_define_const_str(find_key_i, "find_key_i", 850136726u, 0, 10, NULL); be_define_const_str(PZEM016_RX, "PZEM016_RX", 1004012055u, 0, 10, NULL); be_define_const_str(save, "save", 3439296072u, 0, 4, NULL); -be_define_const_str(SSD1351_DC, "SSD1351_DC", 84950353u, 0, 10, NULL); +be_define_const_str(SSD1351_DC, "SSD1351_DC", 84950353u, 0, 10, &be_const_str_serial); +be_define_const_str(serial, "serial", 3687697785u, 0, 6, NULL); be_define_const_str(_get_cb, "_get_cb", 1448849122u, 0, 7, NULL); be_define_const_str(ROT1A, "ROT1A", 759599716u, 0, 5, NULL); be_define_const_str(I2S_OUT_DATA, "I2S_OUT_DATA", 1176288293u, 0, 12, NULL); @@ -928,7 +928,7 @@ static const bstring* const m_string_table[] = { (const bstring *)&be_const_str_remove_cmd, (const bstring *)&be_const_str_TUYA_RX, NULL, - (const bstring *)&be_const_str_Serial, + (const bstring *)&be_const_str_open, (const bstring *)&be_const_str_clear, (const bstring *)&be_const_str_content_flush, (const bstring *)&be_const_str_RF_SENSOR, diff --git a/lib/libesp32/Berry/generate/be_fixed_be_class_tasmota_serial.h b/lib/libesp32/Berry/generate/be_fixed_be_class_tasmota_serial.h index 6e89d6fc0..630b45973 100644 --- a/lib/libesp32/Berry/generate/be_fixed_be_class_tasmota_serial.h +++ b/lib/libesp32/Berry/generate/be_fixed_be_class_tasmota_serial.h @@ -43,5 +43,5 @@ BE_EXPORT_VARIABLE be_define_const_class( be_class_tasmota_serial, 1, NULL, - Serial + serial );