diff --git a/.gitignore b/.gitignore index 4dedac2..1b00f77 100644 --- a/.gitignore +++ b/.gitignore @@ -329,3 +329,6 @@ ASALocalRun/ # MFractors (Xamarin productivity tool) working folder .mfractor/ /src/enc_temp_folder/ + +build/ +!build/tools/EmbedFile.exe diff --git a/src/lib/Convert.h b/src/lib/Convert.h index 4042f42..e2f8d95 100644 --- a/src/lib/Convert.h +++ b/src/lib/Convert.h @@ -34,7 +34,7 @@ namespace sttp datetime_t FromUnixTime(time_t unixSOC, uint16_t milliseconds); // Convert Unix second of century and microseconds to DateTime - datetime_t FromUnixTimeMicro(time_t unixSOC, uint16_t microseconds); + datetime_t FromUnixTimeMicro(time_t unixSOC, uint32_t microseconds); // Converts a timestamp, in Ticks, to DateTime datetime_t FromTicks(int64_t ticks);