Merge branch 'master' into 0.17

This commit is contained in:
Nick O'Leary
2017-04-10 15:45:21 +01:00
5 changed files with 27 additions and 4 deletions

View File

@@ -659,7 +659,8 @@
"pikeyboard": "Pi Keyboard",
"left": "Left",
"right": "Right",
"middle": "Middle"
"middle": "Middle",
"freq": "Frequency (Hz)"
},
"resistor": {
"none": "none",
@@ -681,7 +682,7 @@
"pin": "<b>Pins in Use</b>: ",
"in": "Tip: Only Digital Input is supported - input must be 0 or 1.",
"dig": "Tip: For digital output - input must be 0 or 1.",
"pwm": "Tip: For PWM output - input must be between 0 to 100."
"pwm": "Tip: For PWM output - input must be between 0 to 100; setting high frequency might occupy more CPU than expected."
},
"types": {
"digout": "digital output",