diff --git a/.gitignore b/.gitignore index ca7fc58..d4a9a98 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,7 @@ +[Bb]uild +[Mm][Ss][Vv][Cc]* + + ################# ## Eclipse ################# diff --git a/CMakeLists.txt b/CMakeLists.txt index 9ed086f..6561f79 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -73,7 +73,7 @@ SET(CPACK_RESOURCE_FILE_README "${PROJECT_SOURCE_DIR}/README.txt") SET(CPACK_PACKAGE_FILE_NAME "G19s-Imperial-Clock-Installer") set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "LCDImperialClock - a Star Wars themed clock applet for the Logitech G19s Keyboard") -set(CPACK_PACKAGE_VERSION "1.0.0") +set(CPACK_PACKAGE_VERSION "1.0.1") set(CPACK_PACKAGE_VERSION_MAJOR "1") set(CPACK_PACKAGE_VERSION_MINOR "0") set(CPACK_PACKAGE_VERSION_PATCH "0") diff --git a/G19s-Imperial-Clock-Installer.exe b/G19s-Imperial-Clock-Installer.exe index 9a368f1..1a437b0 100644 Binary files a/G19s-Imperial-Clock-Installer.exe and b/G19s-Imperial-Clock-Installer.exe differ diff --git a/README.md b/README.md index 0ecce54..a7a07d7 100644 --- a/README.md +++ b/README.md @@ -49,7 +49,7 @@ To build the software, you'll need - Qt 5.4 or later (used for image processing/GUI), - CMAKE to build the makefile/visual studio project, and - NSIS if you want to build the windows installer package. - - Visual Studio 2010 which is the only version the logitech library supports + - Visual Studio 2015 which is the only version the logitech library supports As of writing this, the project is only really set up for windows, as I'm pretty sure the logitech libraries only support windows. If that's not the case, the clock code itself should be a trivial port since cmake/qt are natively cross-platform. diff --git a/imperialClock.cpp b/imperialClock.cpp index d4527b9..76a9374 100644 --- a/imperialClock.cpp +++ b/imperialClock.cpp @@ -164,6 +164,7 @@ void imperialClock::drawClock() if (!twentyFourHourTimeCheckBox->isChecked()) { hour = hour % 12; + if (hour == 0) hour = 12; } int minute = now.time().minute(); int second = now.time().second(); diff --git a/lib/LogitechLCDLib.lib b/lib/LogitechLCDLib.lib index 861728b..3ee9706 100644 Binary files a/lib/LogitechLCDLib.lib and b/lib/LogitechLCDLib.lib differ diff --git a/lib/LogitechLcd.dll b/lib/LogitechLcd.dll new file mode 100644 index 0000000..b59a619 Binary files /dev/null and b/lib/LogitechLcd.dll differ