ports/esp32/machine_wdt.c: micropython#98 (comment)

MrSurly · MrSurly · commit 50df9533457d · 2017-10-10T08:35:54.000-07:00
ports/esp8266/machine_wdt.c: micropython#98 (comment)
diff --git a/ports/esp32/machine_wdt.c b/ports/esp32/machine_wdt.c
@@ -4,6 +4,7 @@
  * The MIT License (MIT)
  *
  * Copyright (c) 2016 Paul Sokolovsky
+ * Copyright (c) 2017 Eric Poulsen
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -49,10 +50,11 @@ STATIC mp_obj_t machine_wdt_make_new(const mp_obj_type_t *type_in, size_t n_args
     }
 
     switch (id) {
-    case 0:
-        return &wdt_default;
-    default:
-        mp_raise_ValueError("");
+        case 0:
+            esp_task_wdt_feed();
+            return &wdt_default;
+        default:
+            mp_raise_ValueError("");
     }
 }
 
@@ -63,16 +65,9 @@ STATIC mp_obj_t machine_wdt_feed(mp_obj_t self_in) {
 }
 STATIC MP_DEFINE_CONST_FUN_OBJ_1(machine_wdt_feed_obj, machine_wdt_feed);
 
-STATIC mp_obj_t machine_wdt_deinit(mp_obj_t self_in) {
-    (void)self_in;
-    esp_task_wdt_delete();
-    return mp_const_none;
-}
-STATIC MP_DEFINE_CONST_FUN_OBJ_1(machine_wdt_deinit_obj, machine_wdt_deinit);
 
 STATIC const mp_map_elem_t machine_wdt_locals_dict_table[] = {
     { MP_OBJ_NEW_QSTR(MP_QSTR_feed), (mp_obj_t)&machine_wdt_feed_obj },
-    { MP_OBJ_NEW_QSTR(MP_QSTR_deinit), (mp_obj_t)&machine_wdt_deinit_obj },
 };
 STATIC MP_DEFINE_CONST_DICT(machine_wdt_locals_dict, machine_wdt_locals_dict_table);
 
diff --git a/ports/esp8266/machine_wdt.c b/ports/esp8266/machine_wdt.c
@@ -4,6 +4,7 @@
  * The MIT License (MIT)
  *
  * Copyright (c) 2016 Paul Sokolovsky
+ * Copyright (c) 2017 Eric Poulsen
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -51,6 +52,7 @@ STATIC mp_obj_t machine_wdt_make_new(const mp_obj_type_t *type_in, size_t n_args
 
     switch (id) {
     case 0:
+        system_soft_wdt_feed();
         return &wdt_default;
     default:
         mp_raise_ValueError("");
@@ -64,16 +66,8 @@ STATIC mp_obj_t machine_wdt_feed(mp_obj_t self_in) {
 }
 STATIC MP_DEFINE_CONST_FUN_OBJ_1(machine_wdt_feed_obj, machine_wdt_feed);
 
-STATIC mp_obj_t machine_wdt_deinit(mp_obj_t self_in) {
-    (void)self_in;
-    ets_wdt_disable();
-    return mp_const_none;
-}
-STATIC MP_DEFINE_CONST_FUN_OBJ_1(machine_wdt_deinit_obj, machine_wdt_deinit);
-
 STATIC const mp_rom_map_elem_t machine_wdt_locals_dict_table[] = {
     { MP_ROM_QSTR(MP_QSTR_feed), MP_ROM_PTR(&machine_wdt_feed_obj) },
-    { MP_ROM_QSTR(MP_QSTR_deinit), MP_ROM_PTR(&machine_wdt_deinit_obj) },
 };
 STATIC MP_DEFINE_CONST_DICT(machine_wdt_locals_dict, machine_wdt_locals_dict_table);
 

Original file line number	Diff line number	Diff line change
`@@ -4,6 +4,7 @@`
`4`	`4`	`* The MIT License (MIT)`
`5`	`5`	`*`
`6`	`6`	`* Copyright (c) 2016 Paul Sokolovsky`
	`7`	`+ * Copyright (c) 2017 Eric Poulsen`
`7`	`8`	`*`
`8`	`9`	`* Permission is hereby granted, free of charge, to any person obtaining a copy`
`9`	`10`	`* of this software and associated documentation files (the "Software"), to deal`
`@@ -49,10 +50,11 @@ STATIC mp_obj_t machine_wdt_make_new(const mp_obj_type_t *type_in, size_t n_args`
`49`	`50`	`}`
`50`	`51`
`51`	`52`	`switch (id) {`
`52`		`- case 0:`
`53`		`- return &wdt_default;`
`54`		`- default:`
`55`		`- mp_raise_ValueError("");`
	`53`	`+ case 0:`
	`54`	`+ esp_task_wdt_feed();`
	`55`	`+ return &wdt_default;`
	`56`	`+ default:`
	`57`	`+ mp_raise_ValueError("");`
`56`	`58`	`}`
`57`	`59`	`}`
`58`	`60`
`@@ -63,16 +65,9 @@ STATIC mp_obj_t machine_wdt_feed(mp_obj_t self_in) {`
`63`	`65`	`}`
`64`	`66`	`STATIC MP_DEFINE_CONST_FUN_OBJ_1(machine_wdt_feed_obj, machine_wdt_feed);`
`65`	`67`
`66`		`-STATIC mp_obj_t machine_wdt_deinit(mp_obj_t self_in) {`
`67`		`- (void)self_in;`
`68`		`- esp_task_wdt_delete();`
`69`		`- return mp_const_none;`
`70`		`-}`
`71`		`-STATIC MP_DEFINE_CONST_FUN_OBJ_1(machine_wdt_deinit_obj, machine_wdt_deinit);`
`72`	`68`
`73`	`69`	`STATIC const mp_map_elem_t machine_wdt_locals_dict_table[] = {`
`74`	`70`	`{ MP_OBJ_NEW_QSTR(MP_QSTR_feed), (mp_obj_t)&machine_wdt_feed_obj },`
`75`		`- { MP_OBJ_NEW_QSTR(MP_QSTR_deinit), (mp_obj_t)&machine_wdt_deinit_obj },`
`76`	`71`	`};`
`77`	`72`	`STATIC MP_DEFINE_CONST_DICT(machine_wdt_locals_dict, machine_wdt_locals_dict_table);`
`78`	`73`