Revert "Delete specific cxx macroy since mpy 1.26.0. supports cxx"

This reverts commit 7cfafe9.

Author: cnadler86

src/esp_cat_detector.cpp

@@ -39,7 +39,7 @@ static mp_obj_t cat_detector_del(mp_obj_t self_in) {
     self->model = nullptr;
     return mp_const_none;
 }
-static MP_DEFINE_CONST_FUN_OBJ_1(cat_detector_del_obj, cat_detector_del);
+static MP_DEFINE_CONST_FUN_OBJ_1_CXX(cat_detector_del_obj, cat_detector_del);
 
 // Get and set methods
 static void cat_detector_attr(mp_obj_t self_in, qstr attr, mp_obj_t *dest){
@@ -71,7 +71,7 @@ static mp_obj_t cat_detector_detect(mp_obj_t self_in, mp_obj_t framebuffer_obj)
     }
     return list;
 }
-static MP_DEFINE_CONST_FUN_OBJ_2(cat_detector_detect_obj, cat_detector_detect);
+static MP_DEFINE_CONST_FUN_OBJ_2_CXX(cat_detector_detect_obj, cat_detector_detect);
 
 // Local dict
 static const mp_rom_map_elem_t cat_detector_locals_dict_table[] = {

src/esp_coco_detector.cpp

@@ -39,7 +39,7 @@ static mp_obj_t coco_detector_del(mp_obj_t self_in) {
     self->model = nullptr;
     return mp_const_none;
 }
-static MP_DEFINE_CONST_FUN_OBJ_1(coco_detector_del_obj, coco_detector_del);
+static MP_DEFINE_CONST_FUN_OBJ_1_CXX(coco_detector_del_obj, coco_detector_del);
 
 // Get and set methods
 static void coco_detector_attr(mp_obj_t self_in, qstr attr, mp_obj_t *dest){
@@ -72,7 +72,7 @@ static mp_obj_t coco_detector_detect(mp_obj_t self_in, mp_obj_t framebuffer_obj)
     }
     return list;
 }
-static MP_DEFINE_CONST_FUN_OBJ_2(coco_detector_detect_obj, coco_detector_detect);
+static MP_DEFINE_CONST_FUN_OBJ_2_CXX(coco_detector_detect_obj, coco_detector_detect);
 
 // Local dict
 static const mp_rom_map_elem_t coco_detector_locals_dict_table[] = {

src/esp_face_detector.cpp

@@ -38,7 +38,7 @@ static mp_obj_t face_detector_del(mp_obj_t self_in) {
     self->model = nullptr;
     return mp_const_none;
 }
-static MP_DEFINE_CONST_FUN_OBJ_1(face_detector_del_obj, face_detector_del);
+static MP_DEFINE_CONST_FUN_OBJ_1_CXX(face_detector_del_obj, face_detector_del);
 
 // Get and set methods
 static void face_detector_attr(mp_obj_t self_in, qstr attr, mp_obj_t *dest){
@@ -80,7 +80,7 @@ static mp_obj_t face_detector_detect(mp_obj_t self_in, mp_obj_t framebuffer_obj)
     }
     return list;
 }
-static MP_DEFINE_CONST_FUN_OBJ_2(face_detector_detect_obj, face_detector_detect);
+static MP_DEFINE_CONST_FUN_OBJ_2_CXX(face_detector_detect_obj, face_detector_detect);
 
 // Local dict
 static const mp_rom_map_elem_t face_detector_locals_dict_table[] = {

src/esp_face_recognition.cpp

@@ -80,7 +80,7 @@ static mp_obj_t face_recognizer_del(mp_obj_t self_in) {
     self->FaceRecognizer = nullptr;
     return mp_const_none;
 }
-static MP_DEFINE_CONST_FUN_OBJ_1(face_recognizer_del_obj, face_recognizer_del);
+static MP_DEFINE_CONST_FUN_OBJ_1_CXX(face_recognizer_del_obj, face_recognizer_del);
 
 // Get and set methods
 static void face_recognizer_attr(mp_obj_t self_in, qstr attr, mp_obj_t *dest) {
@@ -133,7 +133,7 @@ static mp_obj_t face_recognizer_enroll(size_t n_args, const mp_obj_t *pos_args,
 
     return mp_obj_new_int(new_id);
 }
-static MP_DEFINE_CONST_FUN_OBJ_KW(face_recognizer_enroll_obj, 2, face_recognizer_enroll);
+static MP_DEFINE_CONST_FUN_OBJ_KW_CXX(face_recognizer_enroll_obj, 2, face_recognizer_enroll);
 
 // Delete feature method
 static mp_obj_t face_recognizer_delete_feature(mp_obj_t self_in, mp_obj_t id) {
@@ -144,7 +144,7 @@ static mp_obj_t face_recognizer_delete_feature(mp_obj_t self_in, mp_obj_t id) {
     }
     return mp_const_none;
 }
-static MP_DEFINE_CONST_FUN_OBJ_2(face_recognizer_delete_feature_obj, face_recognizer_delete_feature);
+static MP_DEFINE_CONST_FUN_OBJ_2_CXX(face_recognizer_delete_feature_obj, face_recognizer_delete_feature);
 
 // Recognize method
 static mp_obj_t face_recognizer_recognize(mp_obj_t self_in, mp_obj_t framebuffer_obj) {
@@ -201,15 +201,15 @@ static mp_obj_t face_recognizer_recognize(mp_obj_t self_in, mp_obj_t framebuffer
     }
     return list;
 }
-static MP_DEFINE_CONST_FUN_OBJ_2(face_recognizer_recognize_obj, face_recognizer_recognize);
+static MP_DEFINE_CONST_FUN_OBJ_2_CXX(face_recognizer_recognize_obj, face_recognizer_recognize);
 
 // Print Database
 static mp_obj_t face_recognizer_print_database(mp_obj_t self_in) {
     MP_FaceRecognizer *self = static_cast<MP_FaceRecognizer *>(MP_OBJ_TO_PTR(self_in));
     self->FaceRecognizer->print();
     return mp_const_none;
 }
-static MP_DEFINE_CONST_FUN_OBJ_1(face_recognizer_print_database_obj, face_recognizer_print_database);
+static MP_DEFINE_CONST_FUN_OBJ_1_CXX(face_recognizer_print_database_obj, face_recognizer_print_database);
 
 // Local dict
 static const mp_rom_map_elem_t face_recognizer_locals_dict_table[] = {

src/esp_human_detector.cpp

@@ -37,7 +37,7 @@ static mp_obj_t human_detector_del(mp_obj_t self_in) {
     self->model = nullptr;
     return mp_const_none;
 }
-static MP_DEFINE_CONST_FUN_OBJ_1(human_detector_del_obj, human_detector_del);
+static MP_DEFINE_CONST_FUN_OBJ_1_CXX(human_detector_del_obj, human_detector_del);
 
 // Get and set methods
 static void human_detector_attr(mp_obj_t self_in, qstr attr, mp_obj_t *dest) {
@@ -69,7 +69,7 @@ static mp_obj_t human_detector_detect(mp_obj_t self_in, mp_obj_t framebuffer_obj
     }
     return list;
 }
-static MP_DEFINE_CONST_FUN_OBJ_2(human_detector_detect_obj, human_detector_detect);
+static MP_DEFINE_CONST_FUN_OBJ_2_CXX(human_detector_detect_obj, human_detector_detect);
 
 // Local dict
 static const mp_rom_map_elem_t human_detector_locals_dict_table[] = {

src/esp_imagenet_cls.cpp

@@ -36,7 +36,7 @@ static mp_obj_t image_net_del(mp_obj_t self_in) {
     self->model = nullptr;
     return mp_const_none;
 }
-static MP_DEFINE_CONST_FUN_OBJ_1(image_net_del_obj, image_net_del);
+static MP_DEFINE_CONST_FUN_OBJ_1_CXX(image_net_del_obj, image_net_del);
 
 // Get and set methods
 static void image_net_attr(mp_obj_t self_in, qstr attr, mp_obj_t *dest) {
@@ -60,7 +60,7 @@ static mp_obj_t image_net_classify(mp_obj_t self_in, mp_obj_t framebuffer_obj) {
     }
     return list;
 }
-static MP_DEFINE_CONST_FUN_OBJ_2(image_net_classify_obj, image_net_classify);
+static MP_DEFINE_CONST_FUN_OBJ_2_CXX(image_net_classify_obj, image_net_classify);
 
 // Local dict
 static const mp_rom_map_elem_t image_net_locals_dict_table[] = {

src/mp_esp_dl.hpp

@@ -16,6 +16,28 @@ extern const mp_obj_type_t mp_face_recognizer_type;
 extern const mp_obj_type_t mp_coco_detector_type;
 extern const mp_obj_type_t mp_cat_detector_type;
 
+#define MP_DEFINE_CONST_FUN_OBJ_0_CXX(obj_name, fun_name) \
+    const mp_obj_fun_builtin_fixed_t obj_name = {.base = &mp_type_fun_builtin_0, .fun = {._0 = fun_name }}
+
+#define MP_DEFINE_CONST_FUN_OBJ_1_CXX(obj_name, fun_name) \
+    const mp_obj_fun_builtin_fixed_t obj_name = { .base = &mp_type_fun_builtin_1, .fun = {._1 = fun_name }}
+
+#define MP_DEFINE_CONST_FUN_OBJ_2_CXX(obj_name, fun_name) \
+    const mp_obj_fun_builtin_fixed_t obj_name = { .base = &mp_type_fun_builtin_2, .fun = {._2 = fun_name }}
+
+#define MP_DEFINE_CONST_FUN_OBJ_3_CXX(obj_name, fun_name) \
+    const mp_obj_fun_builtin_fixed_t obj_name = { .base = &mp_type_fun_builtin_3, .fun = {._3 = fun_name }}
+
+#define MP_DEFINE_CONST_FUN_OBJ_VAR_CXX(obj_name, n_args_min, fun_name) \
+    const mp_obj_fun_builtin_var_t obj_name = \
+    {.base = {.type = &mp_type_fun_builtin_var}, .sig = MP_OBJ_FUN_MAKE_SIG(n_args_min, MP_OBJ_FUN_ARGS_MAX, false), .fun = {.var = fun_name}}
+#define MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN_CXX(obj_name, n_args_min, n_args_max, fun_name) \
+    const mp_obj_fun_builtin_var_t obj_name = \
+    {.base = {.type = &mp_type_fun_builtin_var}, .sig = MP_OBJ_FUN_MAKE_SIG(n_args_min, n_args_max, false), .fun = {.var = fun_name}}
+#define MP_DEFINE_CONST_FUN_OBJ_KW_CXX(obj_name, n_args_min, fun_name) \
+    const mp_obj_fun_builtin_var_t obj_name = \
+    {.base = {.type = &mp_type_fun_builtin_var}, .sig = MP_OBJ_FUN_MAKE_SIG(n_args_min, MP_OBJ_FUN_ARGS_MAX, true), .fun = {.kw = fun_name}}
+
 #ifdef __cplusplus
 }
 #endif