diff options
| author | Dan Halbert <halbert@halwitz.org> | 2018-01-04 20:59:59 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-01-04 20:59:59 -0500 |
| commit | 5cb361cf1fd02b48eb28c16e650b57bde1f9745d (patch) | |
| tree | aa3e31548df10772e346042ecd94176520b2092c /lib | |
| parent | 7d3bec46aeb69f68d2dc9fbbbc6d2b72b405b8c6 (diff) | |
| parent | d0cc8abd318169c5c282f519069543985ac88e8a (diff) | |
Merge pull request #510 from dhalbert/3.0_merge_2.2.0
merge from 2.2.0 + fix up board defs
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/libm/nearbyintf.c | 2 | ||||
| -rw-r--r-- | lib/utils/pyexec.c | 7 |
2 files changed, 6 insertions, 3 deletions
diff --git a/lib/libm/nearbyintf.c b/lib/libm/nearbyintf.c index 1bb44aa46..5ac3178b5 100644 --- a/lib/libm/nearbyintf.c +++ b/lib/libm/nearbyintf.c @@ -18,7 +18,7 @@ float nearbyintf(float x) #pragma GCC diagnostic push #pragma GCC diagnostic ignored "-Wfloat-equal" if (y == 0) -#pragma GCC diagnostic pop return s ? -0.0f : 0.0f; +#pragma GCC diagnostic pop return y; } diff --git a/lib/utils/pyexec.c b/lib/utils/pyexec.c index df93614a1..f96deb9e1 100644 --- a/lib/utils/pyexec.c +++ b/lib/utils/pyexec.c @@ -255,7 +255,8 @@ STATIC int pyexec_friendly_repl_process_char(int c) { } else if (ret == CHAR_CTRL_B) { // reset friendly REPL mp_hal_stdout_tx_str("\r\n"); - mp_hal_stdout_tx_str("Adafruit CircuitPython " MICROPY_GIT_TAG " on " MICROPY_BUILD_DATE "; " MICROPY_HW_BOARD_NAME " with " MICROPY_HW_MCU_NAME "\r\n"); + mp_hal_stdout_tx_str(MICROPY_FULL_VERSION_INFO); + mp_hal_stdout_tx_str("\r\n"); // mp_hal_stdout_tx_str("Type \"help()\" for more information.\r\n"); goto input_restart; } else if (ret == CHAR_CTRL_C) { @@ -394,7 +395,9 @@ int pyexec_friendly_repl(void) { #endif friendly_repl_reset: - mp_hal_stdout_tx_str("\r\nAdafruit CircuitPython " MICROPY_GIT_TAG " on " MICROPY_BUILD_DATE "; " MICROPY_HW_BOARD_NAME " with " MICROPY_HW_MCU_NAME "\r\n"); + mp_hal_stdout_tx_str("\r\n"); + mp_hal_stdout_tx_str(MICROPY_FULL_VERSION_INFO); + mp_hal_stdout_tx_str("\r\n"); // mp_hal_stdout_tx_str("Type \"help()\" for more information.\r\n"); // to test ctrl-C |