summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorScott Shawcroft <scott@tannewt.org>2018-04-12 16:33:48 -0700
committerGitHub <noreply@github.com>2018-04-12 16:33:48 -0700
commit12f1aa25fdca5347c104cd2bbb90c3db5a368d5c (patch)
treea2b6b52b200ef79f086fcf8238fe76c21f1c55f4
parente311d17905ae8d46e2f15a5773628c6c9b27dfbb (diff)
parent5f9b3f2b8756549143346993b7f16d2d4be6b92f (diff)
Merge pull request #757 from tannewt/status_pixel_fix
Fix the status neopixel flashing.
-rw-r--r--main.c1
-rw-r--r--supervisor/shared/rgb_led_status.c4
2 files changed, 2 insertions, 3 deletions
diff --git a/main.c b/main.c
index b88fd735b..62938acf1 100644
--- a/main.c
+++ b/main.c
@@ -75,7 +75,6 @@ static char heap[PORT_HEAP_SIZE];
void reset_mp(void) {
reset_status_led();
- new_status_color(0x8f008f);
autoreload_stop();
// Sync the file systems in case any used RAM from the GC to cache. As soon
diff --git a/supervisor/shared/rgb_led_status.c b/supervisor/shared/rgb_led_status.c
index 5b55c1ba2..8f1b506fe 100644
--- a/supervisor/shared/rgb_led_status.c
+++ b/supervisor/shared/rgb_led_status.c
@@ -97,7 +97,7 @@ void rgb_led_status_init() {
#if defined(MICROPY_HW_NEOPIXEL) || (defined(MICROPY_HW_APA102_MOSI) && defined(MICROPY_HW_APA102_SCK))
// Force a write of the current status color.
uint32_t rgb = current_status_color;
- current_status_color = 0;
+ current_status_color = 0x1000000; // Not a valid color
new_status_color(rgb);
#endif
}
@@ -118,7 +118,7 @@ void new_status_color(uint32_t rgb) {
return;
}
uint32_t rgb_adjusted = color_brightness(rgb, rgb_status_brightness);
- current_status_color = rgb_adjusted;
+ current_status_color = rgb;
#endif
#ifdef MICROPY_HW_NEOPIXEL