Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion cmd/repl.go
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import (

var replCmd = &cobra.Command{
Use: "repl",
Short: "matron/crone repl",
Short: "norns repl",
Run: func(cmd *cobra.Command, args []string) {
ConfigureLogger()
replRun(args)
Expand Down
2 changes: 1 addition & 1 deletion cmd/server.go
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ func init() {

serverCmd.Flags().StringVar(&dataDir, "data", "data/", "`path` to user data directory (dust)")
serverCmd.Flags().StringVar(&appDir, "app", "app/", "`path` to maiden web app directory")
serverCmd.Flags().StringVar(&docDir, "doc", "doc/", "`path` to matron lua docs")
serverCmd.Flags().StringVar(&docDir, "doc", "doc/", "`path` to norns lua docs")

// allow config file values to be overridden by command line
viper.BindPFlag("dust.path", serverCmd.Flags().Lookup("data"))
Expand Down
6 changes: 3 additions & 3 deletions notes.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@ as a user/tinkerer/musician i would like to:
- start a new script
- start a new script from one (of many) existing templates
- mark a script as being a template or not
- load current script into matron
- load current script
- be presented with a list of syntax errors which i can click on to bring me to that point in the editor
- see log output from matron and crone
- see log output
- run commands (repl)
- organize my scripts into folders
- rename existing scripts, samples
Expand Down Expand Up @@ -46,4 +46,4 @@ https://www.digitalocean.com/community/tutorials/how-to-build-go-executables-for

* https://medium.com/@david.gilbertson/icons-as-react-components-de3e33cb8792
* https://icomoon.io/app/#/select
* https://formidable.com/open-source/radium/
* https://formidable.com/open-source/radium/
2 changes: 1 addition & 1 deletion web/public/repl-endpoints.json
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{
"matron": "ws://maiden_app_location:5555",
"norns": "ws://maiden_app_location:5555",
"supercollider": "ws://maiden_app_location:5556"
}
2 changes: 1 addition & 1 deletion web/src/api.js
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,7 @@ class API {
}

static fileFromResource(resource) {
// MAINT: this totally breaks the encapsulation of script resources and returns what matron would see as the script path
// MAINT: this totally breaks the encapsulation of script resources and returns what norns would see as the script path
const prefix = apiPath('dust/');
return resource.split(prefix)[1];
}
Expand Down
2 changes: 1 addition & 1 deletion web/src/constants.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import { Set } from 'immutable';

export const UNTITLED_SCRIPT = 'untitled.lua';

export const MATRON_COMPONENT = 'matron';
export const MATRON_COMPONENT = 'norns';
export const CRONE_COMPONENT = 'crone';

export const SIDEBAR_COMPONENT = 'sidebar';
Expand Down
2 changes: 1 addition & 1 deletion web/src/model/repl-reducers.js
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ const handleReplSend = (action, state, conn) => {

const initialReplState = {
scrollbackLimit: 200,
activeRepl: 'matron',
activeRepl: 'norns',
endpoints: new Map(),
connections: new Map(),
buffers: new Map(),
Expand Down
2 changes: 1 addition & 1 deletion web/src/workspace.js
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ class Workspace extends Component {
// grab the config so that the theming data is available
this.props.loadEditorConfig();

// MAINT: this is a bit odd here but we initiate the connections for the repl early so that any actions taken in the editor (or output from matron/crone) is captured even if the repl isn't being displayed
// MAINT: this is a bit odd here but we initiate the connections for the repl early so that any actions taken in the editor (or output from norns-main) is captured even if the repl isn't being displayed
this.props.replEndpoints(endpoints => {
endpoints.forEach((endpoint, component) => {
this.props.replConnect(component, endpoint);
Expand Down
Loading