Merge branch 'master' into developer

source/fs.c

@@ -184,17 +184,8 @@ u32 firmRead(void *dest, u32 firmType)
     //Complete the string with the .app name
     concatenateStrings(path, "/00000000.app");
 
-    //Last digit of the .app
-    u32 i = 42;
-
     //Convert back the .app name from integer to array
-    u32 tempVersion = firmVersion;
+    hexItoa(firmVersion, &path[35]);
-    while(tempVersion)
-    {
-        static const char hexDigits[] = "0123456789ABCDEF";
-        path[i--] = hexDigits[tempVersion & 0xF];
-        tempVersion >>= 4;
-    }
 
     fileRead(dest, path);
 

source/strings.c

@@ -39,3 +39,17 @@ void concatenateStrings(char *destination, const char *source)
 
     memcpy(&destination[j], source, i + 1);
 }
+
+void hexItoa(u32 number, char *out)
+{
+    const char hexDigits[] = "0123456789ABCDEF";
+    u32 i = 0;
+
+    while(number > 0)
+    {
+        out[7 - i++] = hexDigits[number & 0xF];
+        number >>= 4;
+    }
+
+    for(; i < 8; i++) out[7 - i] = '0';
+}

source/strings.h

@@ -26,3 +26,4 @@
 
 int strlen(const char *string);
 void concatenateStrings(char *destination, const char *source);
+void hexItoa(u32 number, char *out);