Skip to content

Commit

Permalink
Merge branch 'master' into fix-operator-localization
Browse files Browse the repository at this point in the history
  • Loading branch information
tcorbly authored Jan 22, 2025
2 parents fff9a76 + 4c24801 commit 364050b
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 3 deletions.
3 changes: 2 additions & 1 deletion src/App.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import * as React from 'react';
import { Route, Switch } from 'react-router';
import { Redirect, Route, Switch } from 'react-router';
import { Unsubscribe } from 'firebase/auth';
import { connect } from 'react-redux';

Expand Down Expand Up @@ -130,6 +130,7 @@ class App extends React.Component<Props, State> {
<Route path="/scene/:sceneId" component={Root} />
<Route path="/challenge/:challengeId" component={ChallengeRoot} />
<Route path="/curriculum" component={CurriculumPage} />
<Redirect to="/" />
</Switch>
<DocumentationWindow theme={DARK} />
</>
Expand Down
5 changes: 3 additions & 2 deletions src/programming/python/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -47,14 +47,15 @@ if (SIMULATOR_HAS_CPYTHON) {
}));
let create: unknown;
if (params.createSerial) {
create = module.FS.makedev(64, 0);
// NOTE: This was initially using a major ID of 64, but that overrode the registers device.
// Needs to be revisited when completing create support.
create = module.FS.makedev(65, 0);
module.FS.registerDevice(create, createDevice({
serial: params.createSerial
}));
}
module.FS.mkdev('/registers', registers);
module.FS.mkdir('/kipr');
module.FS.mkdir('/dev');
if (create) module.FS.mkdev('/dev/ttyUSB0', create);
module.FS.writeFile('/kipr/_kipr.so', new Uint8Array(libkiprBuffer));

Expand Down

0 comments on commit 364050b

Please sign in to comment.