Skip to content

Restore original prototype of mp_sched_schedule #252

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Restore original prototype of mp_sched_schedule #252

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
586ba25
Restore original prototype of `mp_sched_schedule`. This is important …
amirgon Dec 16, 2018
f2c9648
fixed modmqtt.c to use mp_sched_schedule_ex
amirgon Dec 16, 2018
File filter

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
fixed modmqtt.c to use mp_sched_schedule_ex
  • Loading branch information
@amirgon
amirgon committed Dec 16, 2018
commit f2c9648d32ea4b395aebf43b1ff5b9a4c88e47df
14 changes: 7 additions & 7 deletions MicroPython_BUILD/components/micropython/esp32/modmqtt.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ STATIC void connected_cb(mqtt_obj_t *self)
mp_sched_carg_t *carg = make_cargs(MP_SCHED_CTYPE_SINGLE);
if (!carg) return;
if (!make_carg_entry(carg, 0, MP_SCHED_ENTRY_TYPE_STR, strlen(self->name), (const uint8_t *)self->name, NULL)) return;
mp_sched_schedule(self->mpy_connected_cb, mp_const_none, carg);
mp_sched_schedule_ex(self->mpy_connected_cb, mp_const_none, carg);
}
}

Expand All @@ -100,7 +100,7 @@ STATIC void disconnected_cb(mqtt_obj_t *self)
mp_sched_carg_t *carg = make_cargs(MP_SCHED_CTYPE_SINGLE);
if (!carg) return;
if (!make_carg_entry(carg, 0, MP_SCHED_ENTRY_TYPE_STR, strlen(self->name), (const uint8_t *)self->name, NULL)) return;
mp_sched_schedule(self->mpy_disconnected_cb, mp_const_none, carg);
mp_sched_schedule_ex(self->mpy_disconnected_cb, mp_const_none, carg);
}
}

Expand All @@ -117,7 +117,7 @@ STATIC void subscribed_cb(mqtt_obj_t *self, const char *topic)
else {
if (!make_carg_entry(carg, 1, MP_SCHED_ENTRY_TYPE_STR, 1, (const uint8_t *)"?", NULL)) return;
}
mp_sched_schedule(self->mpy_subscribed_cb, mp_const_none, carg);
mp_sched_schedule_ex(self->mpy_subscribed_cb, mp_const_none, carg);
}
}

Expand All @@ -134,7 +134,7 @@ STATIC void unsubscribed_cb(mqtt_obj_t *self, const char *topic)
else {
if (!make_carg_entry(carg, 1, MP_SCHED_ENTRY_TYPE_STR, 1, (const uint8_t *)"?", NULL)) return;
}
mp_sched_schedule(self->mpy_unsubscribed_cb, mp_const_none, carg);
mp_sched_schedule_ex(self->mpy_unsubscribed_cb, mp_const_none, carg);
}
}

Expand All @@ -152,7 +152,7 @@ STATIC void published_cb(mqtt_obj_t *self, const char *topic, int type)
if (!make_carg_entry(carg, 1, MP_SCHED_ENTRY_TYPE_STR, 1, (const uint8_t *)"?", NULL)) return;
}
if (!make_carg_entry(carg, 2, MP_SCHED_ENTRY_TYPE_INT, type, NULL, NULL)) return;
mp_sched_schedule(self->mpy_published_cb, mp_const_none, carg);
mp_sched_schedule_ex(self->mpy_published_cb, mp_const_none, carg);
}
}

Expand Down Expand Up @@ -196,7 +196,7 @@ STATIC void data_cb(mqtt_obj_t *self, void *params)
if (!make_carg_entry(carg, 0, MP_SCHED_ENTRY_TYPE_STR, strlen(self->name), (const uint8_t *)self->name, NULL)) return;
if (!make_carg_entry(carg, 1, MP_SCHED_ENTRY_TYPE_STR, event->topic_len, (const uint8_t *)event->topic, NULL)) return;
if (!make_carg_entry(carg, 2, MP_SCHED_ENTRY_TYPE_STR, event->data_len, (const uint8_t *)event->data, NULL)) return;
mp_sched_schedule(self->mpy_data_cb, mp_const_none, carg);
mp_sched_schedule_ex(self->mpy_data_cb, mp_const_none, carg);
}
}
else {
Expand All @@ -212,7 +212,7 @@ STATIC void data_cb(mqtt_obj_t *self, void *params)
if (!make_carg_entry(carg, 0, MP_SCHED_ENTRY_TYPE_STR, strlen(self->name), (const uint8_t *)self->name, NULL)) goto freebufs;
if (!make_carg_entry(carg, 1, MP_SCHED_ENTRY_TYPE_STR, strlen((const char *)self->topicbuf), self->topicbuf, NULL)) goto freebufs;
if (!make_carg_entry(carg, 2, MP_SCHED_ENTRY_TYPE_STR, event->total_data_len, self->msgbuf, NULL)) goto freebufs;
mp_sched_schedule(self->mpy_data_cb, mp_const_none, carg);
mp_sched_schedule_ex(self->mpy_data_cb, mp_const_none, carg);
freebufs:
// Free the buffers
free(self->msgbuf);
Expand Down