From 1451fac2ace17940d3b7fa7c7d2258f5e0e1f216 Mon Sep 17 00:00:00 2001 From: masatake aoki Date: Wed, 21 May 2025 17:47:38 +0900 Subject: [PATCH 1/2] map write read BugFix --- uROS_STEP12_micromouse/SPIFFS.ino | 8 ++++---- uROS_STEP8_micromouse/SPIFFS.ino | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/uROS_STEP12_micromouse/SPIFFS.ino b/uROS_STEP12_micromouse/SPIFFS.ino index 3a8e044..be076d2 100644 --- a/uROS_STEP12_micromouse/SPIFFS.ino +++ b/uROS_STEP12_micromouse/SPIFFS.ino @@ -30,8 +30,8 @@ void mapWrite(void) Serial.println("- failed to open file for writing"); return; } - for (int i = 0; i < 16; i++) { - for (int j = 0; j < 16; j++) { + for (int i = 0; i < MAZESIZE_X; i++) { + for (int j = 0; j < MAZESIZE_Y; j++) { data_temp = g_map_control.getWallData(i, j, north) + (g_map_control.getWallData(i, j, east) << 2) + (g_map_control.getWallData(i, j, south) << 4) + @@ -63,8 +63,8 @@ void copyMap(void) Serial.println("- failed to open file for reading"); return; } - for (int i = 0; i < 16; i++) { - for (int j = 0; j < 16; j++) { + for (int i = 0; i < MAZESIZE_X; i++) { + for (int j = 0; j < MAZESIZE_Y; j++) { if (file.available()) { read_data = file.read(); g_map_control.setWallData(i, j, north, read_data & 0x03); diff --git a/uROS_STEP8_micromouse/SPIFFS.ino b/uROS_STEP8_micromouse/SPIFFS.ino index 3a8e044..be076d2 100644 --- a/uROS_STEP8_micromouse/SPIFFS.ino +++ b/uROS_STEP8_micromouse/SPIFFS.ino @@ -30,8 +30,8 @@ void mapWrite(void) Serial.println("- failed to open file for writing"); return; } - for (int i = 0; i < 16; i++) { - for (int j = 0; j < 16; j++) { + for (int i = 0; i < MAZESIZE_X; i++) { + for (int j = 0; j < MAZESIZE_Y; j++) { data_temp = g_map_control.getWallData(i, j, north) + (g_map_control.getWallData(i, j, east) << 2) + (g_map_control.getWallData(i, j, south) << 4) + @@ -63,8 +63,8 @@ void copyMap(void) Serial.println("- failed to open file for reading"); return; } - for (int i = 0; i < 16; i++) { - for (int j = 0; j < 16; j++) { + for (int i = 0; i < MAZESIZE_X; i++) { + for (int j = 0; j < MAZESIZE_Y; j++) { if (file.available()) { read_data = file.read(); g_map_control.setWallData(i, j, north, read_data & 0x03); From 5270c5fc95db662e346bcaa742c25e6d75d99748 Mon Sep 17 00:00:00 2001 From: masatake aoki Date: Wed, 21 May 2025 18:32:52 +0900 Subject: [PATCH 2/2] step2 clang-format mod --- uROS_STEP2_SWITCH/uROS_STEP2_SWITCH.ino | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/uROS_STEP2_SWITCH/uROS_STEP2_SWITCH.ino b/uROS_STEP2_SWITCH/uROS_STEP2_SWITCH.ino index fb762fc..37e3f1b 100644 --- a/uROS_STEP2_SWITCH/uROS_STEP2_SWITCH.ino +++ b/uROS_STEP2_SWITCH/uROS_STEP2_SWITCH.ino @@ -49,7 +49,7 @@ void loop() } if (digitalRead(SW_C) == 0) { digitalWrite(LED2, (++g_state_c) & 0x01); - digitalWrite(LED1, (g_state_c)&0x01); + digitalWrite(LED1, g_state_c & 0x01); } if (digitalRead(SW_L) == 0) { digitalWrite(LED0, (++g_state_l) & 0x01);