diff --git a/ReadMe.txt b/ReadMe.txt index 7c47e2f..b6fe2ef 100644 --- a/ReadMe.txt +++ b/ReadMe.txt @@ -54,7 +54,7 @@ NOT WORKING YET CHANGES -Version 1.7beta3 (2019-11-28) +Version 1.7 (2019-12-12) - Updated source code from Eric Rechlin's Emu48 version 1.61+ that was merged from Christoph Gießelink's Emu48 version 1.62. - Allow to take a screenshot of the fullscreen including the skin. @@ -62,6 +62,8 @@ Version 1.7beta3 (2019-11-28) - Add an optional overlapping LCD part stuck to the screen when swiping the 2 calc parts. - Improve loading speed by caching the KML folder. - Support the transparency in the KML Global Color. +- Improve the New and Save menus. +- Sound volume can be adjusted by number by touching the number. Version 1.6 (2019-07-15) @@ -168,18 +170,14 @@ The Eric's Real scripts ("real*.kml" and "real*.bmp/png") are embedded in this a TODO -- Autosave only works once a manual save has been done (William Hostman from comment). - SO, INVITE TO SAVE JUST AFTER THE NEW TO PREVENT TO LOOSE EVERYTHING - Add the name of the file in the toast "State saved". - The clock seems unsynchronized sometimes. - Retain a key by right clicking if it is from a mouse. - Add the possibility to load and save the flash in another file. - Sometimes, the calculator seems to lag and finally freeze. - In Chrome OS: - - The timezone seems to be GMT (localtime_r not right?)! - sometimes there is no OK button in the KML Script Compilation Result. - Add KML script loading dependencies fallback to the inner ROM (and may be KML include?). -- Add a separation between the pixels (Suggestion from Jaime Meza). BUILD diff --git a/app/build.gradle b/app/build.gradle index 6a8ad18..51caa70 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -33,7 +33,7 @@ android { applicationId "org.emulator.forty.eight" minSdkVersion 19 targetSdkVersion 28 - versionCode 10 + versionCode 11 versionName "1.7" setProperty("archivesBaseName", "Emu48-v$versionName") testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" diff --git a/app/src/main/assets/ReadMe.txt b/app/src/main/assets/ReadMe.txt index 4666650..a129fc9 100644 --- a/app/src/main/assets/ReadMe.txt +++ b/app/src/main/assets/ReadMe.txt @@ -54,7 +54,7 @@ NOT WORKING YET CHANGES -Version 1.7beta3 (2019-11-28) +Version 1.7 (2019-12-12) - Updated source code from Eric Rechlin's Emu48 version 1.61+ that was merged from Christoph Gießelink's Emu48 version 1.62. - Allow to take a screenshot of the fullscreen including the skin. @@ -62,6 +62,8 @@ Version 1.7beta3 (2019-11-28) - Add an optional overlapping LCD part stuck to the screen when swiping the 2 calc parts. - Improve loading speed by caching the KML folder. - Support the transparency in the KML Global Color. +- Improve the New and Save menus. +- Sound volume can be adjusted by number by touching the number. Version 1.6 (2019-07-15) diff --git a/app/src/main/cpp/win32-layer.c b/app/src/main/cpp/win32-layer.c index 045d849..40bd0dd 100644 --- a/app/src/main/cpp/win32-layer.c +++ b/app/src/main/cpp/win32-layer.c @@ -3071,11 +3071,11 @@ int closesocket(SOCKET s) { } int win32_select(int __fd_count, fd_set* __read_fds, fd_set* __write_fds, fd_set* __exception_fds, struct timeval* __timeout) { -// struct timeval timeout; -// if(__timeout == NULL) { -// timeout.tv_sec = 5; //0; -// timeout.tv_usec = 0; //500000; -// __timeout = &timeout; -// } + struct timeval timeout; + if(__timeout == NULL) { + timeout.tv_sec = 1; //0; + timeout.tv_usec = 0; //500000; + __timeout = &timeout; + } return select(__fd_count, __read_fds, __write_fds, __exception_fds, __timeout); } diff --git a/build.gradle b/build.gradle index fe28db2..70bd7c8 100644 --- a/build.gradle +++ b/build.gradle @@ -7,7 +7,7 @@ buildscript { jcenter() } dependencies { - classpath 'com.android.tools.build:gradle:3.5.2' + classpath 'com.android.tools.build:gradle:3.5.3' // NOTE: Do not place your application dependencies here; they belong