-
Notifications
You must be signed in to change notification settings - Fork 13
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Documentation warning update #45
base: master
Are you sure you want to change the base?
Changes from all commits
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,8 @@ | ||
[Desktop Entry] | ||
Type=Application | ||
Name=Makerverse | ||
Comment=Makerverse UI (web browser) | ||
Icon=/home/pi/makerverse/logo.png | ||
Exec=/home/pi/makerverse/bin/kiosk | ||
Terminal=false | ||
Categories=Internet; |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,21 +1,39 @@ | ||
#!/bin/bash | ||
path=${1:-/} | ||
|
||
# Figure out where the git checkout directory lives, if any: | ||
if [[ -z "$MAKERVERSE_SRC_DIR" ]]; then | ||
# Otherwise, the parent directory of this script should (hopefully) work. | ||
MAKERVERSE_SRC_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")/../" && pwd)" | ||
fi | ||
|
||
fn="${MAKERVERSE_SRC_DIR}/kiosk.log" | ||
echo "Launching Makerverse kiosk..." > $fn | ||
printenv | grep "MAKERVERSE" >> $fn | ||
|
||
MAKERVERSE_PROTOCOL="${MAKERVERSE_PROTOCOL:-http}" | ||
MAKERVERSE_HOST="${MAKERVERSE_HOST:-localhost}" | ||
MAKERVERSE_PORT="${MAKERVERSE_PORT:-8000}" | ||
MAKERVERSE_KIOSK_SCALE="${MAKERVERSE_KIOSK_SCALE:-1.0}" | ||
url="${MAKERVERSE_PROTOCOL}://${MAKERVERSE_HOST}:${MAKERVERSE_PORT}${path}" | ||
MAKERVERSE_PATH="${MAKERVERSE_PATH:-/}" | ||
url="${MAKERVERSE_PROTOCOL}://${MAKERVERSE_HOST}:${MAKERVERSE_PORT}${MAKERVERSE_PATH}" | ||
flags="" | ||
|
||
if [[ ! -z "$MAKERVERSE_SCALE" ]]; then | ||
flags="${flags} --force-device-scale-factor=${MAKERVERSE_SCALE}" | ||
fi | ||
|
||
if [[ ! -z "$MAKERVERSE_KIOSK" ]]; then | ||
flags="${flags} --noerrdialogs --disable-infobars --kiosk" | ||
fi | ||
|
||
while [[ ! $(curl -s $url) ]]; do | ||
echo "Waiting for $url" | ||
echo "Waiting for $url" >> $fn | ||
sleep 1; | ||
done | ||
|
||
bash ${MAKERVERSE_SRC_DIR}/scripts/kiosk.sh "$url" \ | ||
-f "--noerrdialogs --disable-infobars --ignore-certificate-errors --force-device-scale-factor=${MAKERVERSE_KIOSK_SCALE}" | ||
echo "Ready to launch: ${flags}" >> $fn | ||
|
||
if [[ ! -z "${flags}" ]]; then | ||
bash ${MAKERVERSE_SRC_DIR}/scripts/kiosk.sh "$url" -f "${flags}" | ||
else | ||
bash ${MAKERVERSE_SRC_DIR}/scripts/kiosk.sh "$url" | ||
fi |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,24 @@ | ||
--- | ||
layout: default | ||
title: Grbl | ||
grand_parent: Machines | ||
parent: CNC | ||
nav_order: 1 | ||
--- | ||
|
||
# Grbl | ||
|
||
Grbl is an extremely common firmware/protocol option for CNC machines. | ||
|
||
Many manufacturers simply ship their CNC machines with Grbl, as it is such a well-known open-source (free) piece of Arduino code. If you're not sure what controller your CNC machine uses, chances are pretty good it uses Grbl. | ||
|
||
## Grbl Versions | ||
|
||
Find all versions on the [Grbl releases page](https://github.com/gnea/grbl/releases). | ||
|
||
- Major versions of Grbl are `1.1h`, `1.1g`, etc. | ||
- Minor versions are designated by the date of the release (`20190825` was released on August 25th, 2019). | ||
|
||
## Updating Grbl | ||
|
||
Please see [the Github README for Grbl](https://github.com/gnea/grbl). |
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -3,7 +3,7 @@ layout: default | |
title: Maslow | ||
grand_parent: Machines | ||
parent: CNC | ||
nav_order: 1 | ||
nav_order: 2 | ||
--- | ||
|
||
# Maslow | ||
|
@@ -20,7 +20,13 @@ The Maslow requires calibration to correct "chain sag" (catenary effects). | |
|
||
### Before you Start | ||
|
||
Do a **pre-flight check**. | ||
!!! WARNING !!! | ||
|
||
- If this is the *first* use of your maslow, before you do anything, reset the chains !!! Even if the sled is not exactly in the middle, to establish a baseline location, reset the chains. Once that is complete, the sled should respond to the shuttle commands to move so then you can avoid costly disaster or erratic behavior. As with all new equipment, please make power shutoff to the system accessible in case you must shut it off quickly. In the makerverse, the RESET button will cut power to the motors, so keep that in mind. After calibration, the sled will be properly positioned and allow future chain resets to occur with chain marks to reset back to the middle of the work piece. | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Are you aware that this is done automatically during the calibration process? When you get to the If that's still a concern, I could make the New Machine? modal do this automatically, as well. My thinking, here, is that this is not the sort of problem which should require documentation. Rather, this sort of problem should be solved by the software. If the user needs to find the docs in order to avoid shooting themselves in the foot, the software is deficient. |
||
|
||
!!! WARNING !!! | ||
|
||
First, do a **pre-flight check**. | ||
|
||
Maslow frames are generally built from hand-cut, imprecise materials. Catching errors early will greatly improve the chances of an easy, successful calibration. | ||
|
||
|
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -624,7 +624,16 @@ class CalibrationModal extends PureComponent { | |
{curTab === 'welcome' && ( | ||
<div className={styles.tabFull}> | ||
<h6>{i18n._('Welcome')}</h6> | ||
If you have not tested your frame before, please run a pre-flight check. | ||
!!! WARNING !!! | ||
<br/> | ||
-- DAMAGE MAY OCCUR -- | ||
<br/> | ||
If this is the first use of your system and you have not yet tested sled movement please close this window and reset your chains. | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Why? This screen already performs a |
||
<br /> | ||
Please run a pre-flight check before attempting to calibrate. | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. There's already a warning about this which you need to click "Okay" for before you can ever see this screen... try opening the calibration modal in version 1.1.2 and you'll see what I mean. |
||
<br /> | ||
!!! WARNING !!! | ||
<br /> | ||
<br /> | ||
For help with this (or any other step), see the Calibration Help at the bottom. | ||
<br /> | ||
|
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Nitpick: please use backticks to indicate code:
~/makerverse/events/scriptname
.