diff options
author | Damien George <damien.p.george@gmail.com> | 2014-12-07 17:03:47 +0000 |
---|---|---|
committer | Damien George <damien.p.george@gmail.com> | 2014-12-07 17:03:47 +0000 |
commit | d0caaadaeea48e8f76dca3125a2dea3465a58416 (patch) | |
tree | 487534121492922cdaa320708bc1929168c50585 /stmhal/modusocket.c | |
parent | 1f8a2f662369c0f51cfa8720d9a11cd187948bf6 (diff) | |
download | micropython-d0caaadaeea48e8f76dca3125a2dea3465a58416.tar.gz micropython-d0caaadaeea48e8f76dca3125a2dea3465a58416.zip |
stmhal: Allow network, uselect, usocket mods to be used by other ports.
Remove include of stm32f4xx_hal.h, replace by include of MICROPY_HAL_H
where needed, and make it compile without float support. This makes
these 3 modules much more generic and usable by other ports.
Diffstat (limited to 'stmhal/modusocket.c')
-rw-r--r-- | stmhal/modusocket.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/stmhal/modusocket.c b/stmhal/modusocket.c index d705636c1a..c2246b3c4d 100644 --- a/stmhal/modusocket.c +++ b/stmhal/modusocket.c @@ -29,8 +29,6 @@ #include <string.h> #include <errno.h> -#include "stm32f4xx_hal.h" - #include "mpconfig.h" #include "nlr.h" #include "misc.h" @@ -321,7 +319,11 @@ STATIC mp_obj_t socket_settimeout(mp_obj_t self_in, mp_obj_t timeout_in) { if (timeout_in == mp_const_none) { timeout = -1; } else { + #if MICROPY_PY_BUILTIN_FLOAT timeout = 1000 * mp_obj_get_float(timeout_in); + #else + timeout = 1000 * mp_obj_get_int(timeout_in); + #endif } int _errno; if (self->nic_type->settimeout(self, timeout, &_errno) != 0) { |