STEP8とSTEP13のリファクタリング (#13)

* STEP8とSTEP13のstraight関数の引数名を修正

* SPIFFSからlistdir関数を削除

Author: Shota Aoki

uROS_STEP13_micromouse/SPIFFS.ino

@@ -12,38 +12,6 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-void listDir(fs::FS & fs, const char * dirname, uint8_t levels)
-{
-  Serial.printf("Listing directory: %s\r\n", dirname);
-
-  File root = fs.open(dirname);
-  if (!root) {
-    Serial.println("- failed to open directory");
-    return;
-  }
-  if (!root.isDirectory()) {
-    Serial.println(" - not a directory");
-    return;
-  }
-
-  File file = root.openNextFile();
-  while (file) {
-    if (file.isDirectory()) {
-      Serial.print("  DIR : ");
-      Serial.println(file.name());
-      if (levels) {
-        listDir(fs, file.name(), levels - 1);
-      }
-    } else {
-      Serial.print("  FILE: ");
-      Serial.print(file.name());
-      Serial.print("\tSIZE: ");
-      Serial.println(file.size());
-    }
-    file = root.openNextFile();
-  }
-}
-
 void mapWrite(void)
 {
   String file_tmp;

uROS_STEP13_micromouse/run.ino

@@ -12,12 +12,12 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-void straight(int len, int init_speed, int max_sp, int finish_speed)
+void straight(int len, int init_speed, int max_speed, int finish_speed)
 {
   int obj_step;
 
   controlInterruptStop();
-  g_max_speed = max_sp;
+  g_max_speed = max_speed;
   g_accel = SEARCH_ACCEL;
 
   if (init_speed < MIN_SPEED) {

uROS_STEP8_micromouse/SPIFFS.ino

@@ -12,38 +12,6 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-void listDir(fs::FS & fs, const char * dirname, uint8_t levels)
-{
-  Serial.printf("Listing directory: %s\r\n", dirname);
-
-  File root = fs.open(dirname);
-  if (!root) {
-    Serial.println("- failed to open directory");
-    return;
-  }
-  if (!root.isDirectory()) {
-    Serial.println(" - not a directory");
-    return;
-  }
-
-  File file = root.openNextFile();
-  while (file) {
-    if (file.isDirectory()) {
-      Serial.print("  DIR : ");
-      Serial.println(file.name());
-      if (levels) {
-        listDir(fs, file.name(), levels - 1);
-      }
-    } else {
-      Serial.print("  FILE: ");
-      Serial.print(file.name());
-      Serial.print("\tSIZE: ");
-      Serial.println(file.size());
-    }
-    file = root.openNextFile();
-  }
-}
-
 void mapWrite(void)
 {
   String file_tmp;

uROS_STEP8_micromouse/run.ino

@@ -12,12 +12,12 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-void straight(int len, int init_speed, int max_sp, int finish_speed)
+void straight(int len, int init_speed, int max_speed, int finish_speed)
 {
   int obj_step;
 
   controlInterruptStop();
-  g_max_speed = max_sp;
+  g_max_speed = max_speed;
   g_accel = SEARCH_ACCEL;
 
   if (init_speed < MIN_SPEED) {