Skip to content

Commit

Permalink
Version 1.13
Browse files Browse the repository at this point in the history
Temporary fix for RTD temperature spikes causing failed prints
Added 'only if printing a file' condition in M581 command
Fixed M117 for PanelDue
Don't print extruder positions in M114 because they are always zero
Process M0 and M1 when in simulation mode
Allow setting of fan PWM from 50% upwards when a fan is in thermostatic
mode
Reduced default extruder heater PWM frequency
Axes are no longer homes when microstepping is changed
SD card interface speed is included in M122 output
  • Loading branch information
dc42 committed Jun 15, 2016
1 parent 76a635f commit b12a131
Show file tree
Hide file tree
Showing 24 changed files with 4,266 additions and 197 deletions.
128 changes: 127 additions & 1 deletion .cproject

Large diffs are not rendered by default.

11 changes: 11 additions & 0 deletions .settings/language.settings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -22,4 +22,15 @@
</provider>
</extension>
</configuration>
<configuration id="cdt.managedbuild.config.gnu.cross.exe.release.516195201.976458850.241502451.286403080" name="SAM4E_PROTO1">
<extension point="org.eclipse.cdt.core.LanguageSettingsProvider">
<provider copy-of="extension" id="org.eclipse.cdt.ui.UserLanguageSettingsProvider"/>
<provider-reference id="org.eclipse.cdt.core.ReferencedProjectsLanguageSettingsProvider" ref="shared-provider"/>
<provider-reference id="org.eclipse.cdt.managedbuilder.core.MBSLanguageSettingsProvider" ref="shared-provider"/>
<provider class="org.eclipse.cdt.internal.build.crossgcc.CrossGCCBuiltinSpecsDetector" console="false" env-hash="337623625225680352" id="org.eclipse.cdt.build.crossgcc.CrossGCCBuiltinSpecsDetector" keep-relative-paths="false" name="CDT Cross GCC Built-in Compiler Settings" parameter="${COMMAND} ${FLAGS} -E -P -v -dD &quot;${INPUTS}&quot;" prefer-non-shared="true">
<language-scope id="org.eclipse.cdt.core.gcc"/>
<language-scope id="org.eclipse.cdt.core.g++"/>
</provider>
</extension>
</configuration>
</project>
8 changes: 8 additions & 0 deletions .settings/org.eclipse.cdt.core.prefs
Original file line number Diff line number Diff line change
@@ -1,4 +1,12 @@
eclipse.preferences.version=1
environment/project/cdt.managedbuild.config.gnu.cross.exe.release.516195201.976458850.241502451.286403080/LINK_FLAGS_1/delimiter=;
environment/project/cdt.managedbuild.config.gnu.cross.exe.release.516195201.976458850.241502451.286403080/LINK_FLAGS_1/operation=append
environment/project/cdt.managedbuild.config.gnu.cross.exe.release.516195201.976458850.241502451.286403080/LINK_FLAGS_1/value=-mthumb -Wl,--cref -Wl,--check-sections -Wl,--gc-sections -Wl,--entry\=Reset_Handler -Wl,--unresolved-symbols\=report-all -Wl,--warn-common -Wl,--warn-section-align -Wl,--warn-unresolved-symbols -Wl,--start-group
environment/project/cdt.managedbuild.config.gnu.cross.exe.release.516195201.976458850.241502451.286403080/LINK_FLAGS_2/delimiter=;
environment/project/cdt.managedbuild.config.gnu.cross.exe.release.516195201.976458850.241502451.286403080/LINK_FLAGS_2/operation=append
environment/project/cdt.managedbuild.config.gnu.cross.exe.release.516195201.976458850.241502451.286403080/LINK_FLAGS_2/value=-Wl,--end-group -lm -gcc
environment/project/cdt.managedbuild.config.gnu.cross.exe.release.516195201.976458850.241502451.286403080/append=true
environment/project/cdt.managedbuild.config.gnu.cross.exe.release.516195201.976458850.241502451.286403080/appendContributed=true
environment/project/cdt.managedbuild.config.gnu.cross.exe.release.516195201.976458850.241502451/LINK_FLAGS_1/delimiter=;
environment/project/cdt.managedbuild.config.gnu.cross.exe.release.516195201.976458850.241502451/LINK_FLAGS_1/operation=append
environment/project/cdt.managedbuild.config.gnu.cross.exe.release.516195201.976458850.241502451/LINK_FLAGS_1/value=-mthumb -Wl,--cref -Wl,--check-sections -Wl,--gc-sections -Wl,--entry\=Reset_Handler -Wl,--unresolved-symbols\=report-all -Wl,--warn-common -Wl,--warn-section-align -Wl,--warn-unresolved-symbols -Wl,--start-group
Expand Down
10 changes: 5 additions & 5 deletions src/Configuration.h
Original file line number Diff line number Diff line change
Expand Up @@ -26,11 +26,11 @@ Licence: GPL
// Firmware name is now defined in the Pins file

#ifndef VERSION
# define VERSION "1.13beta1"
# define VERSION "1.13"
#endif

#ifndef DATE
# define DATE "2016-05-27"
# define DATE "2016-06-13"
#endif

#define AUTHORS "reprappro, dc42, zpl, t3p3, dnewman"
Expand Down Expand Up @@ -68,7 +68,7 @@ const unsigned int MAIN_BAUD_RATE = 115200; // Default communication speed of
const unsigned int AUX_BAUD_RATE = 57600; // Ditto - for auxiliary UART device
const unsigned int AUX2_BAUD_RATE = 115200; // Ditto - for second auxiliary UART device

const uint32_t SERIAL_MAIN_TIMEOUT = 1000; // timeout in ms for sending dara to the main serial/USB port
const uint32_t SERIAL_MAIN_TIMEOUT = 1000; // timeout in ms for sending data to the main serial/USB port

// Heater values

Expand All @@ -83,7 +83,7 @@ const float TIME_TO_HOT = 150.0; // Seconds

const uint8_t MAX_BAD_TEMPERATURE_COUNT = 4; // Number of bad temperature samples permitted before a heater fault is reported
const float BAD_LOW_TEMPERATURE = -10.0; // Celsius
const float DEFAULT_TEMPERATURE_LIMIT = 260.0; // Celsius
const float DEFAULT_TEMPERATURE_LIMIT = 262.0; // Celsius
const float HOT_END_FAN_TEMPERATURE = 45.0; // Temperature at which a thermostatic hot end fan comes on
const float BAD_ERROR_TEMPERATURE = 2000.0; // Must exceed any reasonable 5temperature limit including DEFAULT_TEMPERATURE_LIMIT

Expand All @@ -93,7 +93,7 @@ const unsigned int FirstRtdChannel = 200; // Temperature sensor channels 200..
// PWM frequencies

const unsigned int SlowHeaterPwmFreq = 10; // slow PWM frequency for bed and chamber heaters, compatible with DC/AC SSRs
const unsigned int NormalHeaterPwmFreq = 500; // normal PWM frequency used for hot ends
const unsigned int NormalHeaterPwmFreq = 250; // normal PWM frequency used for hot ends
const unsigned int DefaultFanPwmFreq = 500; // increase to 25kHz using M106 command to meet Intel 4-wire PWM fan specification

// Default Z probe values
Expand Down
64 changes: 64 additions & 0 deletions src/DuetNG/FirmwareUpdater.cpp
Original file line number Diff line number Diff line change
@@ -0,0 +1,64 @@
/*
* FirmwareUpdater.cpp
*
* Created on: 21 May 2016
* Author: David
*/

#include "FirmwareUpdater.h"
#include "RepRapFirmware.h"
#include "WifiFirmwareUploader.h"

namespace FirmwareUpdater
{
const unsigned int WifiFirmwareModule = 1;
const unsigned int WifiFilesModule = 2;
const unsigned int WifiExternalFirmwareModule = 3;

// Check that the prerequisites are satisfied.
// Return true if yes, else print a message and return false.
bool CheckFirmwareUpdatePrerequisites(uint8_t moduleMap)
{
if ((moduleMap & (1 << WifiExternalFirmwareModule)) != 0 && (moduleMap & ((1 << WifiFirmwareModule) | (1 << WifiFilesModule))) != 0)
{
reprap.GetPlatform()->Message(GENERIC_MESSAGE, "Invalid combination of firmware update modules\n");
return false;
}
if ((moduleMap & (1 << WifiFirmwareModule)) != 0 && !reprap.GetPlatform()->GetMassStorage()->FileExists(SYS_DIR, WIFI_FIRMWARE_FILE))
{
reprap.GetPlatform()->MessageF(GENERIC_MESSAGE, "File %s not found\n", WIFI_FIRMWARE_FILE);
return false;
}
if ((moduleMap & (1 << WifiFilesModule)) != 0 && !reprap.GetPlatform()->GetMassStorage()->FileExists(SYS_DIR, WIFI_WEB_FILE))
{
reprap.GetPlatform()->MessageF(GENERIC_MESSAGE, "File %s not found\n", WIFI_WEB_FILE);
return false;
}
return true;
}

bool IsReady()
{
return reprap.GetNetwork()->GetWifiUploader()->IsReady();
}

void UpdateModule(unsigned int module)
{
switch(module)
{
case WifiExternalFirmwareModule:
Network::ResetWiFiForExternalUpload();
break;

case WifiFirmwareModule:
reprap.GetNetwork()->GetWifiUploader()->SendUpdateFile(WIFI_FIRMWARE_FILE, SYS_DIR, WifiFirmwareUploader::FirmwareAddress);
break;

case WifiFilesModule:
reprap.GetNetwork()->GetWifiUploader()->SendUpdateFile(WIFI_WEB_FILE, SYS_DIR, WifiFirmwareUploader::WebFilesAddress);
break;
}
}
}

// End
20 changes: 20 additions & 0 deletions src/DuetNG/FirmwareUpdater.h
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
/*
* FirmwareUpdater.h
*
* Created on: 21 May 2016
* Author: David
*/

#ifndef SRC_DUETNG_FIRMWAREUPDATER_H_
#define SRC_DUETNG_FIRMWAREUPDATER_H_

#include <cstdint>

namespace FirmwareUpdater
{
bool CheckFirmwareUpdatePrerequisites(uint8_t moduleMap);
bool IsReady();
void UpdateModule(unsigned int module);
}

#endif /* SRC_DUETNG_FIRMWAREUPDATER_H_ */
Loading

0 comments on commit b12a131

Please sign in to comment.