Add "dhcp" property to turn DHCP on and off

nickzoic · nickzoic · commit b714f5d650b5 · 2018-10-25T11:29:27.000+11:00
diff --git a/shared-bindings/wiznet/wiznet5k.c b/shared-bindings/wiznet/wiznet5k.c
@@ -66,24 +66,54 @@ STATIC mp_obj_t wiznet5k_make_new(const mp_obj_type_t *type, size_t n_args, size
     return wiznet5k_create(args[0], args[1], args[2]);
 }
 
+//| .. attribute:: connected
+//|
+//|   is this device physically connected?
+//|
+
 STATIC mp_obj_t wiznet5k_connected_get_value(mp_obj_t self_in) {
     (void)self_in;
     return mp_obj_new_bool(wizphy_getphylink() == PHY_LINK_ON);
 }
 STATIC MP_DEFINE_CONST_FUN_OBJ_1(wiznet5k_connected_get_value_obj, wiznet5k_connected_get_value);
 
-//| .. attribute:: connected
-//|
-//|   is this device physically connected?
-//|
-
 const mp_obj_property_t wiznet5k_connected_obj = {
     .base.type = &mp_type_property,
     .proxy = {(mp_obj_t)&wiznet5k_connected_get_value_obj,
               (mp_obj_t)&mp_const_none_obj,
               (mp_obj_t)&mp_const_none_obj},
 };
 
+//| .. attribute:: dhcp
+//|
+//|   is DHCP active on this device? (set to true to activate DHCP, false to turn it off)
+//|
+
+STATIC mp_obj_t wiznet5k_dhcp_get_value(mp_obj_t self_in) {
+    (void)self_in;
+    return mp_obj_new_bool(wiznet5k_check_dhcp());
+}
+
+STATIC MP_DEFINE_CONST_FUN_OBJ_1(wiznet5k_dhcp_get_value_obj, wiznet5k_dhcp_get_value);
+
+STATIC mp_obj_t wiznet5k_dhcp_set_value(mp_obj_t self_in, mp_obj_t value) {
+    (void)self_in;
+    if (mp_obj_is_true(value)) {
+        wiznet5k_start_dhcp();
+    } else {
+        wiznet5k_stop_dhcp();
+    }
+    return mp_const_none;
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_2(wiznet5k_dhcp_set_value_obj, wiznet5k_dhcp_set_value);
+
+const mp_obj_property_t wiznet5k_dhcp_obj = {
+    .base.type = &mp_type_property,
+    .proxy = {(mp_obj_t)&wiznet5k_dhcp_get_value_obj,
+              (mp_obj_t)&wiznet5k_dhcp_set_value_obj,
+              (mp_obj_t)&mp_const_none_obj},
+};
+
 //| .. method:: ifconfig(...)
 //|
 //|   Called without parameters, returns a tuple of
@@ -121,6 +151,7 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(wiznet5k_ifconfig_obj, 1, 2, wiznet5k
 STATIC const mp_rom_map_elem_t wiznet5k_locals_dict_table[] = {
     { MP_ROM_QSTR(MP_QSTR_ifconfig), MP_ROM_PTR(&wiznet5k_ifconfig_obj) },
     { MP_ROM_QSTR(MP_QSTR_connected), MP_ROM_PTR(&wiznet5k_connected_obj) },
+    { MP_ROM_QSTR(MP_QSTR_dhcp), MP_ROM_PTR(&wiznet5k_dhcp_obj) },
 };
 
 STATIC MP_DEFINE_CONST_DICT(wiznet5k_locals_dict, wiznet5k_locals_dict_table);
diff --git a/shared-module/wiznet/wiznet5k.c b/shared-module/wiznet/wiznet5k.c
@@ -324,7 +324,7 @@ void wiznet5k_socket_timer_tick(mod_network_socket_obj_t *socket) {
     }
 }
 
-static void wiznet5k_start_dhcp(void) {
+void wiznet5k_start_dhcp(void) {
     static DHCP_INIT_BUFFER_TYPE dhcp_buf[DHCP_INIT_BUFFER_SIZE];
 
     if (!wiznet5k_obj.dhcp_active) {
@@ -335,15 +335,17 @@ static void wiznet5k_start_dhcp(void) {
     }
 }
 
-#if 0
-static void wiznet5k_stop_dhcp(void) {
+void wiznet5k_stop_dhcp(void) {
     if (wiznet5k_obj.dhcp_active) {
         wiznet5k_obj.dhcp_active = 0;
         DHCP_stop();
         WIZCHIP_EXPORT(close)(0);
     }
 }
-#endif
+
+bool wiznet5k_check_dhcp(void) {
+    return wiznet5k_obj.dhcp_active;
+}
 
 /// Create and return a WIZNET5K object.
 mp_obj_t wiznet5k_create(mp_obj_t spi_in, mp_obj_t cs_in, mp_obj_t rst_in) {
diff --git a/shared-module/wiznet/wiznet5k.h b/shared-module/wiznet/wiznet5k.h
@@ -60,6 +60,10 @@ void wiznet5k_socket_timer_tick(mod_network_socket_obj_t *socket);
 mp_obj_t wiznet5k_socket_disconnect(mp_obj_t self_in);
 mp_obj_t wiznet5k_create(mp_obj_t spi_in, mp_obj_t cs_in, mp_obj_t rst_in);
 
+void wiznet5k_start_dhcp(void);
+void wiznet5k_stop_dhcp(void);
+bool wiznet5k_check_dhcp(void);
+
 extern const mod_network_nic_type_t mod_network_nic_type_wiznet5k;
 
 #endif // MICROPY_INCLUDED_SHARED_MODULE_WIZNET_WIZNET5K_H

Original file line number	Diff line number	Diff line change
`@@ -324,7 +324,7 @@ void wiznet5k_socket_timer_tick(mod_network_socket_obj_t *socket) {`
`324`	`324`	`}`
`325`	`325`	`}`
`326`	`326`
`327`		`-static void wiznet5k_start_dhcp(void) {`
	`327`	`+void wiznet5k_start_dhcp(void) {`
`328`	`328`	`static DHCP_INIT_BUFFER_TYPE dhcp_buf[DHCP_INIT_BUFFER_SIZE];`
`329`	`329`
`330`	`330`	`if (!wiznet5k_obj.dhcp_active) {`
`@@ -335,15 +335,17 @@ static void wiznet5k_start_dhcp(void) {`
`335`	`335`	`}`
`336`	`336`	`}`
`337`	`337`
`338`		`-#if 0`
`339`		`-static void wiznet5k_stop_dhcp(void) {`
	`338`	`+void wiznet5k_stop_dhcp(void) {`
`340`	`339`	`if (wiznet5k_obj.dhcp_active) {`
`341`	`340`	`wiznet5k_obj.dhcp_active = 0;`
`342`	`341`	`DHCP_stop();`
`343`	`342`	`WIZCHIP_EXPORT(close)(0);`
`344`	`343`	`}`
`345`	`344`	`}`
`346`		`-#endif`
	`345`	`+`
	`346`	`+bool wiznet5k_check_dhcp(void) {`
	`347`	`+ return wiznet5k_obj.dhcp_active;`
	`348`	`+}`
`347`	`349`
`348`	`350`	`/// Create and return a WIZNET5K object.`
`349`	`351`	`mp_obj_t wiznet5k_create(mp_obj_t spi_in, mp_obj_t cs_in, mp_obj_t rst_in) {`