From befcfd10b7dbd30f464a8666f557c86e25fc6a4f Mon Sep 17 00:00:00 2001 From: Joachim Le Fournis <43498612+RedGl0w@users.noreply.github.com> Date: Sat, 5 Sep 2020 11:16:25 +0200 Subject: [PATCH 1/5] [Python] Change heap --- apps/code/app.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/code/app.h b/apps/code/app.h index a42979e1e..2903390a6 100644 --- a/apps/code/app.h +++ b/apps/code/app.h @@ -74,7 +74,7 @@ public: VariableBoxController * variableBoxController() { return &m_variableBoxController; } - static constexpr int k_pythonHeapSize = 32768; + static constexpr int k_pythonHeapSize = 100000; private: /* Python delegate: From aeb22bf35db0b3eb6a5914214429c31d691d9c65 Mon Sep 17 00:00:00 2001 From: Joachim Le Fournis <43498612+RedGl0w@users.noreply.github.com> Date: Sat, 5 Sep 2020 11:20:15 +0200 Subject: [PATCH 2/5] [external] change heapSize --- apps/external/app.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/external/app.h b/apps/external/app.h index 01ddaa800..8077289f5 100644 --- a/apps/external/app.h +++ b/apps/external/app.h @@ -29,7 +29,7 @@ private: MainController m_mainController; StackViewController m_stackViewController; Window * m_window; - static constexpr int k_externalHeapSize = 80000; + static constexpr int k_externalHeapSize = 100000; char m_externalHeap[k_externalHeapSize]; }; From f2edb0a03303c8d243882b4d9a5f4c8843787835 Mon Sep 17 00:00:00 2001 From: Joachim Le Fournis <43498612+RedGl0w@users.noreply.github.com> Date: Sun, 11 Oct 2020 09:08:48 +0200 Subject: [PATCH 3/5] [Ion/usb] Changed URL in order to have easier update --- ion/src/device/shared/usb/calculator.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ion/src/device/shared/usb/calculator.h b/ion/src/device/shared/usb/calculator.h index 6dd9679f5..5b6f5caea 100644 --- a/ion/src/device/shared/usb/calculator.h +++ b/ion/src/device/shared/usb/calculator.h @@ -99,7 +99,7 @@ public: /* Switch to this descriptor to use dfu-util to write in the SRAM. * FIXME Should be an alternate Interface. */ m_microsoftOSStringDescriptor(k_microsoftOSVendorCode), - m_workshopURLDescriptor(URLDescriptor::Scheme::HTTPS, "workshop.numworks.com"), + m_workshopURLDescriptor(URLDescriptor::Scheme::HTTPS, "getomega.dev"), m_extendedCompatIdDescriptor("WINUSB"), m_descriptors{ &m_deviceDescriptor, // Type = Device, Index = 0 From 715ff95cf12d7aeb45d56772e76de41998f91b4a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Quentin=20Guid=C3=A9e?= Date: Tue, 3 Nov 2020 19:49:43 +0100 Subject: [PATCH 4/5] [epsilon] Fix upstream merge --- ion/src/simulator/shared/keyboard_sdl.cpp | 2 -- ion/src/simulator/shared/main_sdl.cpp | 13 +++---------- 2 files changed, 3 insertions(+), 12 deletions(-) diff --git a/ion/src/simulator/shared/keyboard_sdl.cpp b/ion/src/simulator/shared/keyboard_sdl.cpp index a75676aaa..64e659df6 100644 --- a/ion/src/simulator/shared/keyboard_sdl.cpp +++ b/ion/src/simulator/shared/keyboard_sdl.cpp @@ -50,8 +50,6 @@ constexpr static KeySDLKeyPair sKeyPairs[] = { constexpr int sNumberOfKeyPairs = sizeof(sKeyPairs)/sizeof(KeySDLKeyPair); -static bool previousState = false; - State scan() { // We need to tell SDL to get new state from the host OS SDL_PumpEvents(); diff --git a/ion/src/simulator/shared/main_sdl.cpp b/ion/src/simulator/shared/main_sdl.cpp index 7b85c02ee..a8529e938 100644 --- a/ion/src/simulator/shared/main_sdl.cpp +++ b/ion/src/simulator/shared/main_sdl.cpp @@ -88,6 +88,7 @@ int main(int argc, char * argv[]) { #endif Ion::Simulator::Main::init(); + Ion::Simulator::Haptics::init(); ion_main(arguments.size(), &arguments[0]); @@ -95,16 +96,11 @@ int main(int argc, char * argv[]) { if (!argument_volatile) { savePython(); } - Ion::Simulator::Haptics::init(); - - ion_main(arguments.size(), &arguments[0]); +#endif // Shutdown Ion::Simulator::Haptics::shutdown(); Ion::Simulator::Main::quit(); -#endif - - Ion::Simulator::Main::quit(); if (file_buffer != nullptr) SDL_free(file_buffer); @@ -313,10 +309,8 @@ void refresh() { if (!sNeedsRefresh) { return; } + sNeedsRefresh = false; - #if EPSILON_SDL_SCREEN_ONLY - Display::draw(sRenderer, &sScreenRect); - #else if (argument_screen_only) { Display::draw(sRenderer, &sScreenRect); } else { @@ -329,7 +323,6 @@ void refresh() { Layout::draw(sRenderer); Display::draw(sRenderer, &screenRect); } - #endif SDL_RenderPresent(sRenderer); From 78beafe3f19f454b501d3b6d5306adc50d854733 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Quentin=20Guid=C3=A9e?= Date: Fri, 6 Nov 2020 23:53:51 +0100 Subject: [PATCH 5/5] [ion] Fix web simulator --- ion/src/simulator/shared/main_sdl.cpp | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/ion/src/simulator/shared/main_sdl.cpp b/ion/src/simulator/shared/main_sdl.cpp index a8529e938..5cea5207b 100644 --- a/ion/src/simulator/shared/main_sdl.cpp +++ b/ion/src/simulator/shared/main_sdl.cpp @@ -311,6 +311,9 @@ void refresh() { } sNeedsRefresh = false; + #if EPSILON_SDL_SCREEN_ONLY + Display::draw(sRenderer, &sScreenRect); + #else if (argument_screen_only) { Display::draw(sRenderer, &sScreenRect); } else { @@ -323,6 +326,7 @@ void refresh() { Layout::draw(sRenderer); Display::draw(sRenderer, &screenRect); } + #endif SDL_RenderPresent(sRenderer);