diff --git a/README.md b/README.md index 1f76a5a2..b318a7dc 100644 --- a/README.md +++ b/README.md @@ -9,7 +9,7 @@ Step-by-step algebra calculator for Raspberry PI. # Live preview This preview has been built using TeaVM: a JVM made in javascript. Obviously it runs slower than the original. -https://local.cavallium.it/webtests/warppiweb/ +https://local.cavallium.it/calculator/ # Keypad PCB https://workspace.circuitmaker.com/Projects/Details/Andrea-Cavalli/Scientific-calculator-Keypad diff --git a/core/src/main/java/it/cavallium/warppi/gui/CalculatorHUD.java b/core/src/main/java/it/cavallium/warppi/gui/CalculatorHUD.java index 921c32ce..3dd5e443 100644 --- a/core/src/main/java/it/cavallium/warppi/gui/CalculatorHUD.java +++ b/core/src/main/java/it/cavallium/warppi/gui/CalculatorHUD.java @@ -134,7 +134,7 @@ public class CalculatorHUD extends HUD { } else { r.glColor(0xFF990000); } - r.glDrawStringLeft(0, StaticVars.screenSize[1] - ((currentDebugLine+1) * (r.getCurrentFont().getCharacterHeight()+1)), "[" + String.format("%1$03d", session.debugScreenID) + "] " + title.toUpperCase()); + r.glDrawStringLeft(0, StaticVars.screenSize[1] - ((currentDebugLine+1) * (r.getCurrentFont().getCharacterHeight()+1)), "[" + String.format("%1$03d", session.debugScreenID) + "]" + title.toUpperCase()); if (session == Engine.INSTANCE.getHardwareDevice().getDisplayManager().getScreen()) { r.glColor(0xFF00CC00); } else { diff --git a/desktop/src/main/java/it/cavallium/warppi/desktop/DesktopConsoleUtils.java b/desktop/src/main/java/it/cavallium/warppi/desktop/DesktopConsoleUtils.java index a8d4ee9b..7bfbc463 100644 --- a/desktop/src/main/java/it/cavallium/warppi/desktop/DesktopConsoleUtils.java +++ b/desktop/src/main/java/it/cavallium/warppi/desktop/DesktopConsoleUtils.java @@ -49,9 +49,9 @@ public class DesktopConsoleUtils implements it.cavallium.warppi.Platform.Console if (StaticVars.outputLevel >= level) { final String time = getTimeString(); if (StaticVars.outputLevel == 0) - println(System.out, "[" + time + "] " + str); + println(System.out, "[" + time + "]" + str); else - println(System.out, "[" + time + "] " + str); + println(System.out, "[" + time + "]" + str); } } @@ -69,9 +69,9 @@ public class DesktopConsoleUtils implements it.cavallium.warppi.Platform.Console if (StaticVars.outputLevel >= level) { final String time = getTimeString(); if (StaticVars.outputLevel == 0) - println(System.out, "[" + time + "][" + prefix + "] " + str); + println(System.out, "[" + time + "][" + prefix + "]" + str); else - println(System.out, "[" + time + "][" + prefix + "] " + str); + println(System.out, "[" + time + "][" + prefix + "]" + str); } } diff --git a/hardware/src/main/java/it/cavallium/warppi/hardware/HardwareConsoleUtils.java b/hardware/src/main/java/it/cavallium/warppi/hardware/HardwareConsoleUtils.java index c915b771..5ff42cb2 100644 --- a/hardware/src/main/java/it/cavallium/warppi/hardware/HardwareConsoleUtils.java +++ b/hardware/src/main/java/it/cavallium/warppi/hardware/HardwareConsoleUtils.java @@ -49,9 +49,9 @@ public class HardwareConsoleUtils implements it.cavallium.warppi.Platform.Consol if (StaticVars.outputLevel >= level) { final String time = getTimeString(); if (StaticVars.outputLevel == 0) - println(System.out, "[" + time + "] " + str); + println(System.out, "[" + time + "]" + str); else - println(System.out, "[" + time + "] " + str); + println(System.out, "[" + time + "]" + str); } } @@ -69,9 +69,9 @@ public class HardwareConsoleUtils implements it.cavallium.warppi.Platform.Consol if (StaticVars.outputLevel >= level) { final String time = getTimeString(); if (StaticVars.outputLevel == 0) - println(System.out, "[" + time + "][" + prefix + "] " + str); + println(System.out, "[" + time + "][" + prefix + "]" + str); else - println(System.out, "[" + time + "][" + prefix + "] " + str); + println(System.out, "[" + time + "][" + prefix + "]" + str); } } diff --git a/teavm/src/main/java/it/cavallium/warppi/teavm/TeaVMConsoleUtils.java b/teavm/src/main/java/it/cavallium/warppi/teavm/TeaVMConsoleUtils.java index a7412ddb..d9d48e54 100644 --- a/teavm/src/main/java/it/cavallium/warppi/teavm/TeaVMConsoleUtils.java +++ b/teavm/src/main/java/it/cavallium/warppi/teavm/TeaVMConsoleUtils.java @@ -47,9 +47,9 @@ public class TeaVMConsoleUtils implements it.cavallium.warppi.Platform.ConsoleUt if (StaticVars.outputLevel >= level) { final String time = getTimeString(); if (StaticVars.outputLevel == 0) - println(System.out, "[" + time + "] " + str); + println(System.out, "[" + time + "]" + str); else - println(System.out, "[" + time + "] " + str); + println(System.out, "[" + time + "]" + str); } } @@ -67,9 +67,9 @@ public class TeaVMConsoleUtils implements it.cavallium.warppi.Platform.ConsoleUt if (StaticVars.outputLevel >= level) { final String time = getTimeString(); if (StaticVars.outputLevel == 0) - println(System.out, "[" + time + "][" + prefix + "] " + str); + println(System.out, "[" + time + "][" + prefix + "]" + str); else - println(System.out, "[" + time + "][" + prefix + "] " + str); + println(System.out, "[" + time + "][" + prefix + "]" + str); } }