UpsilonNumworks/Upsilon
1
0
Fork 0
mirror of https://github.com/UpsilonNumworks/Upsilon.git synced 2026-01-19 00:37:25 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'omega-dev' into merge-upstream

Browse Source
This commit is contained in:
Quentin Guidée
2020-11-27 13:24:57 +01:00
parent 1347b1a20c 83b4d9390d
commit ff029ea785
5 changed files with 6 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
apps/code/app.h
View File

@@ -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:

2
apps/external/app.h vendored
View File

@@ -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];
};

2
ion/src/device/shared/usb/calculator.h
View File

@@ -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

2
ion/src/simulator/shared/keyboard_sdl.cpp
View File

@@ -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();

9
ion/src/simulator/shared/main_sdl.cpp
View File

@@ -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,6 +309,7 @@ void refresh() {
if (!sNeedsRefresh) {
return;
}
sNeedsRefresh = false;
#if EPSILON_SDL_SCREEN_ONLY
Display::draw(sRenderer, &sScreenRect);