summaryrefslogtreecommitdiff
path: root/shared-module
diff options
context:
space:
mode:
authorNick Moore <nick@zoic.org>2019-05-07 18:41:53 +1000
committerNick Moore <nick@zoic.org>2019-05-07 18:41:53 +1000
commit264fc2b07041a55aaf607c1839914acf056b1513 (patch)
tree3ffe5b1e0dcdc797dc5e5e2a1a1f36945dc603b0 /shared-module
parent24934a1e8abbe51809c47b94fa5657d21ac783fb (diff)
Make wiznet5k RST pin optional adafruit/circuitpython#1800
Diffstat (limited to 'shared-module')
-rw-r--r--shared-module/wiznet/wiznet5k.c16
1 files changed, 9 insertions, 7 deletions
diff --git a/shared-module/wiznet/wiznet5k.c b/shared-module/wiznet/wiznet5k.c
index 237f67887..847a13484 100644
--- a/shared-module/wiznet/wiznet5k.c
+++ b/shared-module/wiznet/wiznet5k.c
@@ -364,8 +364,6 @@ mp_obj_t wiznet5k_create(mp_obj_t spi_in, mp_obj_t cs_in, mp_obj_t rst_in) {
wiznet5k_obj.base.type = (mp_obj_type_t*)&mod_network_nic_type_wiznet5k;
wiznet5k_obj.cris_state = 0;
wiznet5k_obj.spi = MP_OBJ_TO_PTR(spi_in);
- common_hal_digitalio_digitalinout_construct(&wiznet5k_obj.cs, cs_in);
- common_hal_digitalio_digitalinout_construct(&wiznet5k_obj.rst, rst_in);
wiznet5k_obj.socket_used = 0;
wiznet5k_obj.dhcp_socket = -1;
@@ -380,13 +378,17 @@ mp_obj_t wiznet5k_create(mp_obj_t spi_in, mp_obj_t cs_in, mp_obj_t rst_in) {
8 // 8 BITS
);
+ common_hal_digitalio_digitalinout_construct(&wiznet5k_obj.cs, cs_in);
common_hal_digitalio_digitalinout_switch_to_output(&wiznet5k_obj.cs, 1, DRIVE_MODE_PUSH_PULL);
- common_hal_digitalio_digitalinout_switch_to_output(&wiznet5k_obj.rst, 1, DRIVE_MODE_PUSH_PULL);
- common_hal_digitalio_digitalinout_set_value(&wiznet5k_obj.rst, 0);
- mp_hal_delay_us(10); // datasheet says 2us
- common_hal_digitalio_digitalinout_set_value(&wiznet5k_obj.rst, 1);
- mp_hal_delay_ms(160); // datasheet says 150ms
+ if (rst_in) {
+ common_hal_digitalio_digitalinout_construct(&wiznet5k_obj.rst, rst_in);
+ common_hal_digitalio_digitalinout_switch_to_output(&wiznet5k_obj.rst, 1, DRIVE_MODE_PUSH_PULL);
+ common_hal_digitalio_digitalinout_set_value(&wiznet5k_obj.rst, 0);
+ mp_hal_delay_us(10); // datasheet says 2us
+ common_hal_digitalio_digitalinout_set_value(&wiznet5k_obj.rst, 1);
+ mp_hal_delay_ms(160); // datasheet says 150ms
+ }
reg_wizchip_cris_cbfunc(wiz_cris_enter, wiz_cris_exit);
reg_wizchip_cs_cbfunc(wiz_cs_select, wiz_cs_deselect);