From 8f3e20ff960a116d074bda3a160419d23231ebe2 Mon Sep 17 00:00:00 2001 From: Dan Halbert Date: Sun, 26 Feb 2023 23:18:59 -0500 Subject: [PATCH 1/2] Merge pull request #7652 from xorbit/fix_soft_reboot_marker Fix print of "soft reboot" when the user presses ^D --- main.c | 1 + 1 file changed, 1 insertion(+) diff --git a/main.c b/main.c index d70e718b6d..16353678d2 100644 --- a/main.c +++ b/main.c @@ -1012,6 +1012,7 @@ int __attribute__((used)) main(void) { if (!simulate_reset) { serial_write_compressed(translate("soft reboot\n")); } + simulate_reset = false; if (pyexec_mode_kind == PYEXEC_MODE_FRIENDLY_REPL) { // If code.py did a fake deep sleep, pretend that we // are running code.py for the first time after a hard From 9b2f1abeab0cf57173e31f6be34b8bff8c5ea5e7 Mon Sep 17 00:00:00 2001 From: Dan Halbert Date: Mon, 27 Feb 2023 20:56:14 -0500 Subject: [PATCH 2/2] update frozen libraries and get smaller RFM69 library --- frozen/Adafruit_CircuitPython_Display_Text | 2 +- frozen/Adafruit_CircuitPython_DotStar | 2 +- frozen/Adafruit_CircuitPython_IS31FL3731 | 2 +- frozen/Adafruit_CircuitPython_LIS3DH | 2 +- frozen/Adafruit_CircuitPython_Motor | 2 +- frozen/Adafruit_CircuitPython_RFM69 | 2 +- frozen/Adafruit_CircuitPython_Requests | 2 +- frozen/Adafruit_CircuitPython_SSD1680 | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/frozen/Adafruit_CircuitPython_Display_Text b/frozen/Adafruit_CircuitPython_Display_Text index 1590d81f7d..911201504a 160000 --- a/frozen/Adafruit_CircuitPython_Display_Text +++ b/frozen/Adafruit_CircuitPython_Display_Text @@ -1 +1 @@ -Subproject commit 1590d81f7d1474b25aed6a0cb793c7e6dc7634ec +Subproject commit 911201504a269dbfc49b04ca59bc54adabd4716a diff --git a/frozen/Adafruit_CircuitPython_DotStar b/frozen/Adafruit_CircuitPython_DotStar index d645fc2ade..187279a95e 160000 --- a/frozen/Adafruit_CircuitPython_DotStar +++ b/frozen/Adafruit_CircuitPython_DotStar @@ -1 +1 @@ -Subproject commit d645fc2aded3606e5b0c17689e9f29e7e56bb612 +Subproject commit 187279a95e5cdd634d233af59352558cea4c1227 diff --git a/frozen/Adafruit_CircuitPython_IS31FL3731 b/frozen/Adafruit_CircuitPython_IS31FL3731 index 8e0f081a0f..5433ba3760 160000 --- a/frozen/Adafruit_CircuitPython_IS31FL3731 +++ b/frozen/Adafruit_CircuitPython_IS31FL3731 @@ -1 +1 @@ -Subproject commit 8e0f081a0fcc94053b8ef480a916b10855a3c0d5 +Subproject commit 5433ba3760ca605267223de883a44cb8394f40a5 diff --git a/frozen/Adafruit_CircuitPython_LIS3DH b/frozen/Adafruit_CircuitPython_LIS3DH index 61ca58788a..240fe51935 160000 --- a/frozen/Adafruit_CircuitPython_LIS3DH +++ b/frozen/Adafruit_CircuitPython_LIS3DH @@ -1 +1 @@ -Subproject commit 61ca58788aabd53558e10c32064a1304aa7454f2 +Subproject commit 240fe51935f4a9def33ef347d40b13862a60b7ac diff --git a/frozen/Adafruit_CircuitPython_Motor b/frozen/Adafruit_CircuitPython_Motor index f26bead58d..9c3de3abce 160000 --- a/frozen/Adafruit_CircuitPython_Motor +++ b/frozen/Adafruit_CircuitPython_Motor @@ -1 +1 @@ -Subproject commit f26bead58d3c4036eced586d275396816e92e80a +Subproject commit 9c3de3abce00b50ba936f4f8daad0a8a6bee34a6 diff --git a/frozen/Adafruit_CircuitPython_RFM69 b/frozen/Adafruit_CircuitPython_RFM69 index 96b4a05c8a..af1cba8a7e 160000 --- a/frozen/Adafruit_CircuitPython_RFM69 +++ b/frozen/Adafruit_CircuitPython_RFM69 @@ -1 +1 @@ -Subproject commit 96b4a05c8a225ad7ddc392be7fb69efebe151981 +Subproject commit af1cba8a7e4e3950fcc5367e9c55a024d9ab9f64 diff --git a/frozen/Adafruit_CircuitPython_Requests b/frozen/Adafruit_CircuitPython_Requests index 203d0b1489..558fff7223 160000 --- a/frozen/Adafruit_CircuitPython_Requests +++ b/frozen/Adafruit_CircuitPython_Requests @@ -1 +1 @@ -Subproject commit 203d0b1489cb90a39f8a780570287f1a5bd610a0 +Subproject commit 558fff7223178eae6228e5262f3a08d3a4101394 diff --git a/frozen/Adafruit_CircuitPython_SSD1680 b/frozen/Adafruit_CircuitPython_SSD1680 index 168624262c..91b6867aca 160000 --- a/frozen/Adafruit_CircuitPython_SSD1680 +++ b/frozen/Adafruit_CircuitPython_SSD1680 @@ -1 +1 @@ -Subproject commit 168624262c18f5ee80ec392c0844d6a4c6548760 +Subproject commit 91b6867aca2b0511571fed14ab051d37f1f1544c