Skip to content
This repository was archived by the owner on Sep 16, 2024. It is now read-only.

Add espnow #483

Open
wants to merge 23 commits into
base: Dev
Choose a base branch
from
Open

Add espnow #483

Changes from 1 commit
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
f1e4590
Add esp_espnow.c to /mods
Oct 18, 2019
320255e
Compiles espnow
rodgergr Oct 21, 2019
ebe46d8
Add recv_queue_handler
rodgergr Oct 21, 2019
ce2c433
Fix missing link in mpconfigport
Oct 22, 2019
1772e00
First successful compile & build as a Class
Oct 25, 2019
403ec46
Added self_in to methods
Oct 25, 2019
d628cbc
Fix wrong function name error in recv_queue_handler
Mar 8, 2020
e9c7fc4
Save makefile changes
Dec 6, 2020
ef65a7d
Synch to Pycom Dev
Dec 6, 2020
26c0899
Enable -jN Switch
Dec 6, 2020
189735e
Merge branch 'Dev' into espnow_class
Dec 6, 2020
8a816e3
Compiles under 1.20.2.r2
Dec 6, 2020
71f9a74
Make a singleton
rodgergr Dec 12, 2020
38e352b
Modify framebuf to rotate
Jan 17, 2021
f1843e3
Merge branch 'espnow_class' of https://github.com/rodgergr/pycom-micr…
Jan 17, 2021
95b8bd1
Merge branch 'espnow_class' of https://github.com/rodgergr/pycom-micr…
Jan 17, 2021
9402d9f
Revert framebuf
Jan 19, 2021
0e34221
Fix extra #endifs from merge
Jan 19, 2021
912d361
First espnow build success
Jan 22, 2021
94093f3
Merge new ESPNow by glenn20
Feb 8, 2021
c44eb81
Update .gitignore
Feb 8, 2021
6ea03c7
Tidy
Feb 12, 2021
06bff87
Merge branch 'espnow_g20_dev' into espnow_class
Feb 12, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
First successful compile & build as a Class
  • Loading branch information
rodgergr authored and rodgergr committed Oct 25, 2019
commit 1772e00b498155c89bd41eb8e091857c6eadb7d2
56 changes: 36 additions & 20 deletions esp32/mods/esp_espnow.c
View file
Original file line number Diff line number Diff line change
@@ -48,6 +48,12 @@
#include "modnetwork.h"
#include "mpirq.h"

typedef struct _mp_obj_espnow_t {
mp_obj_base_t base;
mp_obj_t buf_obj; // need to store this to prevent GC from reclaiming buf
uint8_t number;
} mp_obj_espnow_t;

NORETURN void _esp_espnow_exceptions(esp_err_t e) {
switch (e) {
case ESP_ERR_ESPNOW_NOT_INIT:
@@ -124,25 +130,22 @@ STATIC void IRAM_ATTR recv_cb(const uint8_t *macaddr, const uint8_t *data, int l
}
}

static int initialized = 0;

STATIC mp_obj_t espnow_init() {
if (!initialized) {
ESPNOW_EXCEPTIONS(esp_now_init());
initialized = 1;

ESPNOW_EXCEPTIONS(esp_now_register_recv_cb(recv_cb));
ESPNOW_EXCEPTIONS(esp_now_register_send_cb(send_cb));
}
return mp_const_none;
STATIC mp_obj_t espnow_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *args) {
mp_obj_espnow_t *self = m_new_obj(mp_obj_espnow_t);
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think it would be better if this class would be "singleton", like e.g. CoAp module. As I understand instantiating again this class would result that esp_now is re-initialized which may ruin the already ongoing former instances.

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

OK - I agree - perhaps like this??

// A static pointer to the espnow singleton
STATIC mp_obj_espnow_t *espnow_singleton = NULL;

STATIC mp_obj_t espnow_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *args) {

    if (espnow_singleton != NULL) {
        return espnow_singleton;
    } 

    mp_obj_espnow_t *self = m_new_obj(mp_obj_espnow_t);
    self->base.type = type;
    self->number = 0;
    
    ESPNOW_EXCEPTIONS(esp_now_init());  
    ESPNOW_EXCEPTIONS(esp_now_register_recv_cb(recv_cb));
    ESPNOW_EXCEPTIONS(esp_now_register_send_cb(send_cb));

    espnow_singleton = self;

    return MP_OBJ_FROM_PTR(self);
}

l

self->base.type = type;
self->number = 0;

ESPNOW_EXCEPTIONS(esp_now_init());
ESPNOW_EXCEPTIONS(esp_now_register_recv_cb(recv_cb));
ESPNOW_EXCEPTIONS(esp_now_register_send_cb(send_cb));

return MP_OBJ_FROM_PTR(self);
}
STATIC MP_DEFINE_CONST_FUN_OBJ_0(espnow_init_obj, espnow_init);

STATIC mp_obj_t espnow_deinit() {
if (initialized) {
ESPNOW_EXCEPTIONS(esp_now_deinit());
initialized = 0;
}
ESPNOW_EXCEPTIONS(esp_now_deinit());

return mp_const_none;
}
STATIC MP_DEFINE_CONST_FUN_OBJ_0(espnow_deinit_obj, espnow_deinit);
@@ -319,9 +322,8 @@ STATIC mp_obj_t espnow_version() {
}
STATIC MP_DEFINE_CONST_FUN_OBJ_0(espnow_version_obj, espnow_version);

STATIC const mp_rom_map_elem_t espnow_globals_dict_table[] = {
STATIC const mp_rom_map_elem_t espnow_locals_dict_table[] = {
{ MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_espnow) },
{ MP_ROM_QSTR(MP_QSTR_init), MP_ROM_PTR(&espnow_init_obj) },
{ MP_ROM_QSTR(MP_QSTR_deinit), MP_ROM_PTR(&espnow_deinit_obj) },
{ MP_ROM_QSTR(MP_QSTR_pmk), MP_ROM_PTR(&espnow_pmk_obj) },
{ MP_ROM_QSTR(MP_QSTR_lmk), MP_ROM_PTR(&espnow_lmk_obj) },
@@ -333,9 +335,23 @@ STATIC const mp_rom_map_elem_t espnow_globals_dict_table[] = {
{ MP_ROM_QSTR(MP_QSTR_peer_count), MP_ROM_PTR(&espnow_peer_count_obj) },
{ MP_ROM_QSTR(MP_QSTR_version), MP_ROM_PTR(&espnow_version_obj) },
};
STATIC MP_DEFINE_CONST_DICT(espnow_globals_dict, espnow_globals_dict_table);
STATIC MP_DEFINE_CONST_DICT(espnow_locals_dict, espnow_locals_dict_table);

STATIC const mp_obj_type_t mp_type_espnow = {
{ &mp_type_type },
.name = MP_QSTR_EspNow,
.make_new = espnow_make_new,
.locals_dict = (mp_obj_dict_t*)&espnow_locals_dict,
};

STATIC const mp_rom_map_elem_t espnow_module_globals_table[] = {
{ MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_espnow) },
{ MP_ROM_QSTR(MP_QSTR_EspNow), MP_ROM_PTR(&mp_type_espnow) },
};

STATIC MP_DEFINE_CONST_DICT(espnow_module_globals, espnow_module_globals_table);

const mp_obj_module_t mp_module_esp_espnow = {
.base = { &mp_type_module },
.globals = (mp_obj_dict_t *)&espnow_globals_dict,
.globals = (mp_obj_dict_t *)&espnow_module_globals,
};