summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDamien George <damien.p.george@gmail.com>2017-01-30 13:01:21 +1100
committerDamien George <damien.p.george@gmail.com>2017-01-30 13:01:21 +1100
commit220abca311063e736489adb675c18a25ff725932 (patch)
tree6697f741c8722ef8d8031e7ef6c9f634675ff12d
parent30beed119f9321c3202be8527d7c31acf873d9e8 (diff)
stmhal: Use LED constants from PYBv4 onwards.
-rw-r--r--stmhal/main.c18
-rw-r--r--stmhal/storage.c4
2 files changed, 11 insertions, 11 deletions
diff --git a/stmhal/main.c b/stmhal/main.c
index 3a0bd7a6b..94b8bd7f7 100644
--- a/stmhal/main.c
+++ b/stmhal/main.c
@@ -72,14 +72,14 @@ mp_vfs_mount_t mp_vfs_mount_flash;
void flash_error(int n) {
for (int i = 0; i < n; i++) {
- led_state(PYB_LED_R1, 1);
- led_state(PYB_LED_R2, 0);
+ led_state(PYB_LED_RED, 1);
+ led_state(PYB_LED_GREEN, 0);
HAL_Delay(250);
- led_state(PYB_LED_R1, 0);
- led_state(PYB_LED_R2, 1);
+ led_state(PYB_LED_RED, 0);
+ led_state(PYB_LED_GREEN, 1);
HAL_Delay(250);
}
- led_state(PYB_LED_R2, 0);
+ led_state(PYB_LED_GREEN, 0);
}
void NORETURN __fatal_error(const char *msg) {
@@ -183,7 +183,7 @@ MP_NOINLINE STATIC void init_flash_fs(uint reset_mode) {
// no filesystem, or asked to reset it, so create a fresh one
// LED on to indicate creation of LFS
- led_state(PYB_LED_R2, 1);
+ led_state(PYB_LED_GREEN, 1);
uint32_t start_tick = HAL_GetTick();
uint8_t working_buf[_MAX_SS];
@@ -218,7 +218,7 @@ MP_NOINLINE STATIC void init_flash_fs(uint reset_mode) {
// keep LED on for at least 200ms
sys_tick_wait_at_least(start_tick, 200);
- led_state(PYB_LED_R2, 0);
+ led_state(PYB_LED_GREEN, 0);
} else if (res == FR_OK) {
// mount sucessful
} else {
@@ -245,7 +245,7 @@ MP_NOINLINE STATIC void init_flash_fs(uint reset_mode) {
// doesn't exist, create fresh file
// LED on to indicate creation of boot.py
- led_state(PYB_LED_R2, 1);
+ led_state(PYB_LED_GREEN, 1);
uint32_t start_tick = HAL_GetTick();
FIL fp;
@@ -257,7 +257,7 @@ MP_NOINLINE STATIC void init_flash_fs(uint reset_mode) {
// keep LED on for at least 200ms
sys_tick_wait_at_least(start_tick, 200);
- led_state(PYB_LED_R2, 0);
+ led_state(PYB_LED_GREEN, 0);
}
}
diff --git a/stmhal/storage.c b/stmhal/storage.c
index c1daad4c2..0a5b50739 100644
--- a/stmhal/storage.c
+++ b/stmhal/storage.c
@@ -149,7 +149,7 @@ static uint8_t *flash_cache_get_addr_for_write(uint32_t flash_addr) {
flash_cache_sector_size = flash_sector_size;
}
flash_flags |= FLASH_FLAG_DIRTY;
- led_state(PYB_LED_R1, 1); // indicate a dirty cache with LED on
+ led_state(PYB_LED_RED, 1); // indicate a dirty cache with LED on
flash_tick_counter_last_write = HAL_GetTick();
return (uint8_t*)CACHE_MEM_START_ADDR + flash_addr - flash_sector_start;
}
@@ -261,7 +261,7 @@ void storage_irq_handler(void) {
// clear the flash flags now that we have a clean cache
flash_flags = 0;
// indicate a clean cache with LED off
- led_state(PYB_LED_R1, 0);
+ led_state(PYB_LED_RED, 0);
}
#endif