diff --git a/ReadMe.txt b/ReadMe.txt index 60b6dad..003acfe 100644 --- a/ReadMe.txt +++ b/ReadMe.txt @@ -32,6 +32,12 @@ NOT WORKING YET CHANGES +Version 1.2 (2019-03-XX) + +- Use the KML Global color as background color. +- Set the extension .e49 when "Saving as" a state file with model 'Q'. + + Version 1.1 (2019-03-01) - Update the KML spripts and the images from Eric Rechlin. @@ -57,6 +63,10 @@ Note: some included files are not covered by the GPL; these include ROM image fi The Eric's Real scripts ("real*.kml" and "real*.bmp") are embedded in this application with the kind permission of Eric Rechlin. TODO +- Sometimes the "busy" annunciator gets stuck +- On-D diagnostic does not work for 48gII/49G/49g+/50g (rom.e49 v2.15 not good or not well supported) +- Pixel alignment (pixel squeeze?) issue +- Add KML script loading dependencies fallback to the inner ROM (and may be KML include?) - Add haptic feedback when touch a button - Add a true fullscreen mode under the status bar and the bottom buttons - Improve the access to the menu diff --git a/app/src/main/assets/ReadMe.txt b/app/src/main/assets/ReadMe.txt index 10ddc3b..b08b5dc 100644 --- a/app/src/main/assets/ReadMe.txt +++ b/app/src/main/assets/ReadMe.txt @@ -32,6 +32,12 @@ NOT WORKING YET CHANGES +Version 1.2 (2019-03-XX) + +- Use the KML Global color as background color. +- Set the extension .e49 when "Saving as" a state file with model 'Q'. + + Version 1.1 (2019-03-01) - Update the KML spripts and the images from Eric Rechlin. diff --git a/app/src/main/java/org/emulator/forty/eight/MainActivity.java b/app/src/main/java/org/emulator/forty/eight/MainActivity.java index bccf2ac..8cd70ec 100644 --- a/app/src/main/java/org/emulator/forty/eight/MainActivity.java +++ b/app/src/main/java/org/emulator/forty/eight/MainActivity.java @@ -601,7 +601,7 @@ public class MainActivity extends AppCompatActivity implements NavigationView.On intent.addCategory(Intent.CATEGORY_OPENABLE); intent.setType("*/*"); int model = NativeLib.getCurrentModel(); - String extension = "e48"; // HP48SX/GX + String extension = "e48"; // HP48SX/GX // model 'S' 'G' switch (model) { case '6': case 'A': @@ -610,6 +610,8 @@ public class MainActivity extends AppCompatActivity implements NavigationView.On case 'E': extension = "e39"; // HP39/40G break; + case '2': + case 'Q': case 'X': extension = "e49"; // HP49G break; diff --git a/app/src/main/java/org/emulator/forty/eight/MainScreenView.java b/app/src/main/java/org/emulator/forty/eight/MainScreenView.java index 6c870d5..f714424 100644 --- a/app/src/main/java/org/emulator/forty/eight/MainScreenView.java +++ b/app/src/main/java/org/emulator/forty/eight/MainScreenView.java @@ -27,7 +27,7 @@ public class MainScreenView extends SurfaceView { private float screenOffsetX = 0.0f; private float screenOffsetY= 0.0f; private boolean fillScreen = false; - private int backgroundColor = 0; + private int backgroundColor = Color.BLACK; public MainScreenView(Context context) { super(context); @@ -247,9 +247,8 @@ public class MainScreenView extends SurfaceView { //bitmapMainScreen.reconfigure(/* x */ Math.max(1, param1), /* y */ Math.max(1, param2), Bitmap.Config.ARGB_8888); bitmapMainScreen = Bitmap.createBitmap(Math.max(1, param1), Math.max(1, param2), Bitmap.Config.ARGB_8888); -// int globalColor = NativeLib.getGlobalColor(); -// backgroundColor = Color.argb(255, (globalColor & 0x00FF0000) >> 16, (globalColor & 0x0000FF00) >> 8, globalColor & 0x000000FF); - backgroundColor = Color.BLACK; + int globalColor = NativeLib.getGlobalColor(); + backgroundColor = Color.argb(255, (globalColor & 0x00FF0000) >> 16, (globalColor & 0x0000FF00) >> 8, globalColor & 0x000000FF); bitmapMainScreen.eraseColor(backgroundColor); NativeLib.changeBitmap(bitmapMainScreen);