diff --git a/build_tools/Openroast 1.2 for Windows README.rtf b/build_tools/Openroast 1.2 for Windows README.rtf index 131d2b8..36d32f4 100644 Binary files a/build_tools/Openroast 1.2 for Windows README.rtf and b/build_tools/Openroast 1.2 for Windows README.rtf differ diff --git a/docs/wiki/developers_installing_and_running.md b/docs/wiki/developers_installing_and_running.md index 2907a15..dafa1dd 100644 --- a/docs/wiki/developers_installing_and_running.md +++ b/docs/wiki/developers_installing_and_running.md @@ -55,7 +55,7 @@ For Mac OS X, setting up to run Openroast from source involves running partway t For Ubuntu, you are about to 1. Install python 3.5 in the `/opt` folder as an alternate version of python, as Ubuntu 14.04 relies on the 2.7 and 3.4 versions that are installed with the OS and you do not want to mess with those installations. -2. Install some 'possibly relevent' packages using apt-get. 'Possibly relevent,' because the maintainer installed these items following older versions of instructions for Openroast 1.0... +2. Install some 'possibly relevant' packages using apt-get. 'Possibly relevant,' because the maintainer installed these items following older versions of instructions for Openroast 1.0... 3. Run Openroast 1.2 using your python 3.5 install. ### Installing python 3.5 diff --git a/docs/wiki/users_installing_mac.md b/docs/wiki/users_installing_mac.md index dd16466..6b6a48b 100644 --- a/docs/wiki/users_installing_mac.md +++ b/docs/wiki/users_installing_mac.md @@ -7,7 +7,7 @@ You do not need to install any software other than what is in the contents of th ![disk image when mounted](https://github.com/Roastero/Openroast/blob/master/docs/wiki/img/Openroast_Mac_OS_X_Installer_snapshot.png "disk image when mounted") 3. In the disk image, you will find 4 objects: 1. a README file that is essentially the same as what you are reading here; - 2. *CH34x_Install_V1.4.pkg*, which is the installer for the OS X USB drivers required to communicate withthe Freshroast SR700; + 2. *CH34x_Install_V1.4.pkg*, which is the installer for the OS X USB drivers required to communicate with the Freshroast SR700; 3. *Openroast 1.2.0[]*, which is the Openroast Mac application; 4. A shortcut to the applications folder. 4. Next, double click on *CH34x_Install_V1.4.pkg*. This will install the USB driver. you may be required to restart your computer to finish the driver installation process. diff --git a/docs/wiki/users_installing_windows.md b/docs/wiki/users_installing_windows.md index 1032734..73868c3 100644 --- a/docs/wiki/users_installing_windows.md +++ b/docs/wiki/users_installing_windows.md @@ -6,7 +6,7 @@ You do not need to install any software other than what is in the contents of th 2. Double-click on the ZIP file. 3. In the ZIP file, you will find 3 files: 1. a README file that is essentially the same as what you are reading here; - 2. *CH341SER.EXE.zip*, which is the installer for the Windows USB drivers required to communicate withthe Freshroast SR700; + 2. *CH341SER.EXE.zip*, which is the installer for the Windows USB drivers required to communicate with the Freshroast SR700; 3. *Openroast_v1.2.x_Win10_xxbit.EXE*, which is the Windows 10 installer for either 64-bit or 32-bit Windows, depending on which Windows package you downloaded. 4. Next, you may have to install the driver. 1. If you previously installed the Freshroast SR700 app that comes with the roaster, the drivers have already been installed and therefore, you do not need to install the drivers. Go to step 5. diff --git a/openroast/freshroastsr700_mock.py b/openroast/freshroastsr700_mock.py index 92b916b..28277f9 100644 --- a/openroast/freshroastsr700_mock.py +++ b/openroast/freshroastsr700_mock.py @@ -22,7 +22,7 @@ def __init__(self, kp=0.06, ki=0.0075, kd=0.01, heater_segments=8): """Create variables used to send in packets to the roaster. The update - data function is called when a packet is opened. The state transistion + data function is called when a packet is opened. The state transition function is used by the timer thread to know what to do next. See wiki for more information on packet structure and fields.""" @@ -438,7 +438,7 @@ def comm(self, thermostat=False, def timer(self, state_transition_event=None): """Timer loop used to keep track of the time while roasting or cooling. If the time remaining reaches zero, the roaster will call the - supplied state transistion function or the roaster will be set to + supplied state transition function or the roaster will be set to the idle state.""" while(self._cont.value): state = self.get_roaster_state() @@ -505,7 +505,7 @@ def __init__(self, number_of_segments=8): # Depending on the output # rate and the load's time constant, the result could be perceived # as discrete lumps rather than an effective average output. - # higer rate of output is better than slower. + # higher rate of output is better than slower. # This code does not attempt to control the rate of output, # that is left to the caller. self._num_segments = number_of_segments diff --git a/openroast/views/recipeeditorwindow.py b/openroast/views/recipeeditorwindow.py index 68dda29..fabd5a9 100644 --- a/openroast/views/recipeeditorwindow.py +++ b/openroast/views/recipeeditorwindow.py @@ -354,7 +354,7 @@ def delete_recipe_step(self, row): self.rebuild_recipe_steps_table(newSteps) def insert_recipe_step(self, row): - """Inserts a row below the specified row wit generic values.""" + """Inserts a row below the specified row with generic values.""" steps = self.get_current_table_values() newSteps = steps @@ -392,7 +392,7 @@ def rebuild_recipe_steps_table(self, newSteps): alert = QtWidgets.QMessageBox() alert.setWindowTitle('openroast') alert.setStyleSheet(self.style) - alert.setText("You must have atleast one step!") + alert.setText("You must have at least one step!") alert.exec_() else: diff --git a/openroast/views/roasttab.py b/openroast/views/roasttab.py index 130cde1..b4bc6ec 100644 --- a/openroast/views/roasttab.py +++ b/openroast/views/roasttab.py @@ -46,7 +46,7 @@ def __init__(self, roaster, recipes): self.timer.timeout.connect(self.update_data) self.timer.start() - # Set the roast tab diabled when starting. + # Set the roast tab disabled when starting. self.setEnabled(False) def create_ui(self): @@ -143,9 +143,9 @@ def update_data(self): def create_right_pane(self): rightPane = QtWidgets.QVBoxLayout() - # Create guage window. - guageWindow = self.create_gauge_window() - rightPane.addLayout(guageWindow) + # Create gauge window. + gaugeWindow = self.create_gauge_window() + rightPane.addLayout(gaugeWindow) # Create sliders. sliderPanel = self.create_slider_panel() @@ -234,30 +234,30 @@ def calc_display_time(self, time): return(minutes, seconds) def create_gauge_window(self): - guageWindow = QtWidgets.QGridLayout() + gaugeWindow = QtWidgets.QGridLayout() # Create current temp gauge. self.currentTempLabel = QtWidgets.QLabel("150") currentTemp = self.create_info_box("CURRENT TEMP", "tempGuage", self.currentTempLabel) - guageWindow.addLayout(currentTemp, 0, 0) + gaugeWindow.addLayout(currentTemp, 0, 0) # Create target temp gauge. self.targetTempLabel = QtWidgets.QLabel() targetTemp = self.create_info_box("TARGET TEMP", "tempGuage", self.targetTempLabel) - guageWindow.addLayout(targetTemp, 0, 1) + gaugeWindow.addLayout(targetTemp, 0, 1) # Create current time. self.sectionTimeLabel = QtWidgets.QLabel() currentTime = self.create_info_box("CURRENT SECTION TIME", "timeWindow", self.sectionTimeLabel) - guageWindow.addLayout(currentTime, 1, 0) + gaugeWindow.addLayout(currentTime, 1, 0) # Create totalTime. self.totalTimeLabel = QtWidgets.QLabel() totalTime = self.create_info_box("TOTAL TIME", "timeWindow", self.totalTimeLabel) - guageWindow.addLayout(totalTime, 1, 1) + gaugeWindow.addLayout(totalTime, 1, 1) - return guageWindow + return gaugeWindow def create_button_panel(self): buttonPanel = QtWidgets.QGridLayout()