Namespace refactoring

Author: tobozo

examples/i18n/i18n.ino

@@ -1,9 +1,9 @@
 #include <LittleFS.h>
 #include <YAMLDuino.h>
 
-
 #include <vector>
 static std::vector<String> i18nFiles;
+
 const char* extension = "yml";
 const char* path = "/lang";
 
@@ -14,14 +14,14 @@ void setup()
   Serial.begin(115200);
   LittleFS.begin();
 
-  Serial.printf( "[%d] %s\n", ESP.getFreeHeap(), "Hello i18n test");
+  Serial.println( "Hello i18n test");
 
   // scan the lang folder and store filenames in an array
 
   File dir =  LittleFS.open( path );
 
   if( !dir ) {
-    Serial.printf("Error, can't access filesystem, halting");
+    Serial.println("Error, can't access filesystem, halting");
     while(1) vTaskDelay(1);
   }
 
@@ -47,21 +47,21 @@ void loop()
 {
   int randLang = rand()%(i18nFiles.size());
 
-  int free_heap_before_load = ESP.getFreeHeap();
+  int free_heap_before_load = HEAP_AVAILABLE();
 
   if(! i18n.setLocale(i18nFiles[randLang].c_str()) ) {
 
-    Serial.printf( "[%d] Error loading locale %s, halting\n", ESP.getFreeHeap(), i18nFiles[randLang].c_str());
+    YAML_LOG_n( "Error loading locale %s, halting\n", i18nFiles[randLang].c_str());
 
     while(1) vTaskDelay(1);
   }
 
-  int free_heap_after_load = ESP.getFreeHeap();
+  int free_heap_after_load = HEAP_AVAILABLE();
 
-  Serial.printf( "[%d-%d] Locale file %s loaded\n", free_heap_before_load, free_heap_after_load, i18nFiles[randLang].c_str());
+  YAML_LOG_n( "[%d-%d] Locale file %s loaded\n", free_heap_before_load, free_heap_after_load, i18nFiles[randLang].c_str());
 
-  Serial.printf( "[%d] %s\n", ESP.getFreeHeap(), i18n.gettext("activerecord:errors:messages:record_invalid" ) ); // "La validation a échoué : %{errors}"
-  Serial.printf( "[%d] %s\n", ESP.getFreeHeap(), i18n.gettext("date:abbr_day_names:2" ) ); // "mar"
-  Serial.printf( "[%d] %s\n", ESP.getFreeHeap(), i18n.gettext("time:pm" ) ); // "pm", last element
+  Serial.println( i18n.gettext("activerecord:errors:messages:record_invalid" ) ); // "La validation a échoué : %{errors}"
+  Serial.println( i18n.gettext("date:abbr_day_names:2" ) ); // "mar"
+  Serial.println( i18n.gettext("time:pm" ) ); // "pm", last element
   delay( 1000 );
 }

src/ArduinoYaml.hpp

@@ -57,7 +57,7 @@ extern "C"
 
 #define I18N_SUPPORT
 
-#if !defined WIO_TERMINAL && __has_include(<FS.h>)
+#if __has_include(<FS.h>)
   #define I18N_SUPPORT_FS
 #endif