From 5fd1acaf81c796768273936b459f3dce166e2bdd Mon Sep 17 00:00:00 2001 From: PavelSindler Date: Fri, 20 Jul 2018 15:20:57 +0200 Subject: [PATCH] Revert "PowerPanic" --- Firmware/Configuration.h | 171 +++++++++++++++++++++++++++++++++++- Firmware/Marlin.h | 10 ++- Firmware/Marlin_main.cpp | 25 +----- Firmware/eeprom.h | 182 --------------------------------------- Firmware/lcd.cpp | 6 -- Firmware/sound.cpp | 105 ---------------------- Firmware/sound.h | 34 -------- Firmware/ultralcd.cpp | 38 ++------ 8 files changed, 182 insertions(+), 389 deletions(-) delete mode 100644 Firmware/eeprom.h delete mode 100644 Firmware/sound.cpp delete mode 100644 Firmware/sound.h diff --git a/Firmware/Configuration.h b/Firmware/Configuration.h index 3fa648f7..469386e5 100644 --- a/Firmware/Configuration.h +++ b/Firmware/Configuration.h @@ -44,8 +44,177 @@ #define FW_PRUSA3D_MAGIC "PRUSA3DFW" #define FW_PRUSA3D_MAGIC_LEN 10 +// The total size of the EEPROM is +// 4096 for the Atmega2560 +#define EEPROM_TOP 4096 +#define EEPROM_SILENT 4095 +#define EEPROM_LANG 4094 +#define EEPROM_BABYSTEP_X 4092 +#define EEPROM_BABYSTEP_Y 4090 +#define EEPROM_BABYSTEP_Z 4088 +#define EEPROM_CALIBRATION_STATUS 4087 +#define EEPROM_BABYSTEP_Z0 4085 +#define EEPROM_FILAMENTUSED 4081 +// uint32_t +#define EEPROM_TOTALTIME 4077 -#include "eeprom.h" +#define EEPROM_BED_CALIBRATION_CENTER (EEPROM_TOTALTIME-2*4) +#define EEPROM_BED_CALIBRATION_VEC_X (EEPROM_BED_CALIBRATION_CENTER-2*4) +#define EEPROM_BED_CALIBRATION_VEC_Y (EEPROM_BED_CALIBRATION_VEC_X-2*4) + +// Offsets of the Z heiths of the calibration points from the first point. +// The offsets are saved as 16bit signed int, scaled to tenths of microns. +#define EEPROM_BED_CALIBRATION_Z_JITTER (EEPROM_BED_CALIBRATION_VEC_Y-2*8) +#define EEPROM_FARM_MODE (EEPROM_BED_CALIBRATION_Z_JITTER-1) +#define EEPROM_FARM_NUMBER (EEPROM_FARM_MODE-3) + +// Correction of the bed leveling, in micrometers. +// Maximum 50 micrometers allowed. +// Bed correction is valid if set to 1. If set to zero or 255, the successive 4 bytes are invalid. +#define EEPROM_BED_CORRECTION_VALID (EEPROM_FARM_NUMBER-1) +#define EEPROM_BED_CORRECTION_LEFT (EEPROM_BED_CORRECTION_VALID-1) +#define EEPROM_BED_CORRECTION_RIGHT (EEPROM_BED_CORRECTION_LEFT-1) +#define EEPROM_BED_CORRECTION_FRONT (EEPROM_BED_CORRECTION_RIGHT-1) +#define EEPROM_BED_CORRECTION_REAR (EEPROM_BED_CORRECTION_FRONT-1) +#define EEPROM_TOSHIBA_FLASH_AIR_COMPATIBLITY (EEPROM_BED_CORRECTION_REAR-1) +#define EEPROM_PRINT_FLAG (EEPROM_TOSHIBA_FLASH_AIR_COMPATIBLITY-1) +#define EEPROM_PROBE_TEMP_SHIFT (EEPROM_PRINT_FLAG - 2*5) //5 x int for storing pinda probe temp shift relative to 50 C; unit: motor steps +#define EEPROM_TEMP_CAL_ACTIVE (EEPROM_PROBE_TEMP_SHIFT - 1) +#define EEPROM_BOWDEN_LENGTH (EEPROM_TEMP_CAL_ACTIVE - 2*4) //4 x int for bowden lengths for multimaterial +#define EEPROM_CALIBRATION_STATUS_PINDA (EEPROM_BOWDEN_LENGTH - 1) //0 - not calibrated; 1 - calibrated +#define EEPROM_UVLO (EEPROM_CALIBRATION_STATUS_PINDA - 1) //1 - uvlo during print +#define EEPROM_UVLO_CURRENT_POSITION (EEPROM_UVLO-2*4) // 2 x float for current_position in X and Y axes +#define EEPROM_FILENAME (EEPROM_UVLO_CURRENT_POSITION - 8) //8chars to store filename without extension +#define EEPROM_FILE_POSITION (EEPROM_FILENAME - 4) //32 bit for uint32_t file position +#define EEPROM_UVLO_CURRENT_POSITION_Z (EEPROM_FILE_POSITION - 4) //float for current position in Z +#define EEPROM_UVLO_TARGET_HOTEND (EEPROM_UVLO_CURRENT_POSITION_Z - 1) +#define EEPROM_UVLO_TARGET_BED (EEPROM_UVLO_TARGET_HOTEND - 1) +#define EEPROM_UVLO_FEEDRATE (EEPROM_UVLO_TARGET_BED - 2) +#define EEPROM_UVLO_FAN_SPEED (EEPROM_UVLO_FEEDRATE - 1) +#define EEPROM_FAN_CHECK_ENABLED (EEPROM_UVLO_FAN_SPEED - 1) +#define EEPROM_UVLO_MESH_BED_LEVELING (EEPROM_FAN_CHECK_ENABLED - 9*2) + +#define EEPROM_UVLO_Z_MICROSTEPS (EEPROM_UVLO_MESH_BED_LEVELING - 2) +#define EEPROM_UVLO_E_ABS (EEPROM_UVLO_Z_MICROSTEPS - 1) +#define EEPROM_UVLO_CURRENT_POSITION_E (EEPROM_UVLO_E_ABS - 4) //float for current position in E + +// Crash detection mode EEPROM setting +#define EEPROM_CRASH_DET (EEPROM_UVLO_CURRENT_POSITION_E - 5) // float (orig EEPROM_UVLO_MESH_BED_LEVELING-12) +// Crash detection counter Y (last print) +#define EEPROM_CRASH_COUNT_Y (EEPROM_CRASH_DET - 1) // uint8 (orig EEPROM_UVLO_MESH_BED_LEVELING-15) +// Filament sensor on/off EEPROM setting +#define EEPROM_FSENSOR (EEPROM_CRASH_COUNT_Y - 1) // uint8 (orig EEPROM_UVLO_MESH_BED_LEVELING-14) +// Crash detection counter X (last print) +#define EEPROM_CRASH_COUNT_X (EEPROM_FSENSOR - 1) // uint8 (orig EEPROM_UVLO_MESH_BED_LEVELING-15) +// Filament runout/error coutner (last print) +#define EEPROM_FERROR_COUNT (EEPROM_CRASH_COUNT_X - 1) // uint8 (orig EEPROM_UVLO_MESH_BED_LEVELING-16) +// Power loss errors (last print) +#define EEPROM_POWER_COUNT (EEPROM_FERROR_COUNT - 1) // uint8 (orig EEPROM_UVLO_MESH_BED_LEVELING-17) + +#define EEPROM_XYZ_CAL_SKEW (EEPROM_POWER_COUNT - 4) // float for skew backup +#define EEPROM_WIZARD_ACTIVE (EEPROM_XYZ_CAL_SKEW - 1) +#define EEPROM_BELTSTATUS_X (EEPROM_WIZARD_ACTIVE - 2) // uint16 +#define EEPROM_BELTSTATUS_Y (EEPROM_BELTSTATUS_X - 2) // uint16 + +#define EEPROM_DIR_DEPTH (EEPROM_BELTSTATUS_Y-1) +#define EEPROM_DIRS (EEPROM_DIR_DEPTH-80) //8 chars for each dir name, max 10 levels +#define EEPROM_SD_SORT (EEPROM_DIRS - 1) //0 -time, 1-alpha, 2-none +#define EEPROM_SECOND_SERIAL_ACTIVE (EEPROM_SD_SORT - 1) + +#define EEPROM_FSENS_AUTOLOAD_ENABLED (EEPROM_SECOND_SERIAL_ACTIVE - 1) + +// Crash detection counter X (total) +#define EEPROM_CRASH_COUNT_X_TOT (EEPROM_FSENS_AUTOLOAD_ENABLED - 2) // uint16 +// Crash detection counter Y (total) +#define EEPROM_CRASH_COUNT_Y_TOT (EEPROM_CRASH_COUNT_X_TOT - 2) // uint16 +// Filament runout/error coutner (total) +#define EEPROM_FERROR_COUNT_TOT (EEPROM_CRASH_COUNT_Y_TOT - 2) // uint16 +// Power loss errors (total) +#define EEPROM_POWER_COUNT_TOT (EEPROM_FERROR_COUNT_TOT - 2) // uint16 + +//////////////////////////////////////// +// TMC2130 Accurate sensorless homing + +// X-axis home origin (stepper phase in microsteps, 0..63 for 16ustep resolution) +#define EEPROM_TMC2130_HOME_X_ORIGIN (EEPROM_POWER_COUNT_TOT - 1) // uint8 +// X-axis home bsteps (number of microsteps backward) +#define EEPROM_TMC2130_HOME_X_BSTEPS (EEPROM_TMC2130_HOME_X_ORIGIN - 1) // uint8 +// X-axis home fsteps (number of microsteps forward) +#define EEPROM_TMC2130_HOME_X_FSTEPS (EEPROM_TMC2130_HOME_X_BSTEPS - 1) // uint8 +// Y-axis home origin (stepper phase in microsteps, 0..63 for 16ustep resolution) +#define EEPROM_TMC2130_HOME_Y_ORIGIN (EEPROM_TMC2130_HOME_X_FSTEPS - 1) // uint8 +// X-axis home bsteps (number of microsteps backward) +#define EEPROM_TMC2130_HOME_Y_BSTEPS (EEPROM_TMC2130_HOME_Y_ORIGIN - 1) // uint8 +// X-axis home fsteps (number of microsteps forward) +#define EEPROM_TMC2130_HOME_Y_FSTEPS (EEPROM_TMC2130_HOME_Y_BSTEPS - 1) // uint8 +// Accurate homing enabled +#define EEPROM_TMC2130_HOME_ENABLED (EEPROM_TMC2130_HOME_Y_FSTEPS - 1) // uint8 + + +//////////////////////////////////////// +// TMC2130 uStep linearity correction + +// Linearity correction factor (XYZE) +#define EEPROM_TMC2130_WAVE_X_FAC (EEPROM_TMC2130_HOME_ENABLED - 1) // uint8 +#define EEPROM_TMC2130_WAVE_Y_FAC (EEPROM_TMC2130_WAVE_X_FAC - 1) // uint8 +#define EEPROM_TMC2130_WAVE_Z_FAC (EEPROM_TMC2130_WAVE_Y_FAC - 1) // uint8 +#define EEPROM_TMC2130_WAVE_E_FAC (EEPROM_TMC2130_WAVE_Z_FAC - 1) // uint8 + + +//////////////////////////////////////// +// TMC2130 uStep resolution + +// microstep resolution (XYZE): usteps = (256 >> mres) +#define EEPROM_TMC2130_X_MRES (EEPROM_TMC2130_WAVE_E_FAC - 1) // uint8 +#define EEPROM_TMC2130_Y_MRES (EEPROM_TMC2130_X_MRES - 1) // uint8 +#define EEPROM_TMC2130_Z_MRES (EEPROM_TMC2130_Y_MRES - 1) // uint8 +#define EEPROM_TMC2130_E_MRES (EEPROM_TMC2130_Z_MRES - 1) // uint8 + +// HW +#define EEPROM_PRINTER_TYPE (EEPROM_TMC2130_E_MRES - 2) // uint16 +#define EEPROM_BOARD_TYPE (EEPROM_PRINTER_TYPE - 2) // uint16 + +// Extruder multiplier for power panic +#define EEPROM_EXTRUDER_MULTIPLIER_0 (EEPROM_BOARD_TYPE - 4) //float +#define EEPROM_EXTRUDER_MULTIPLIER_1 (EEPROM_EXTRUDER_MULTIPLIER_0 - 4) //float +#define EEPROM_EXTRUDER_MULTIPLIER_2 (EEPROM_EXTRUDER_MULTIPLIER_1 - 4) //float +#define EEPROM_EXTRUDEMULTIPLY (EEPROM_EXTRUDER_MULTIPLIER_2 - 2) // uint16 + + +//TMC2130 configuration +#define EEPROM_TMC_AXIS_SIZE //axis configuration block size +#define EEPROM_TMC_X (EEPROM_TMC + 0 * EEPROM_TMC_AXIS_SIZE) //X axis configuration blok +#define EEPROM_TMC_Y (EEPROM_TMC + 1 * EEPROM_TMC_AXIS_SIZE) //Y axis +#define EEPROM_TMC_Z (EEPROM_TMC + 2 * EEPROM_TMC_AXIS_SIZE) //Z axis +#define EEPROM_TMC_E (EEPROM_TMC + 3 * EEPROM_TMC_AXIS_SIZE) //E axis +//TMC2130 - X axis +#define EEPROM_TMC_X_USTEPS_INTPOL (EEPROM_TMC_X + 0) // 1byte, bit 0..4 USTEPS, bit 7 INTPOL +#define EEPROM_TMC_X_PWM_AMPL (EEPROM_TMC_X + 1) // 1byte (0..255) +#define EEPROM_TMC_X_PWM_GRAD_FREQ (EEPROM_TMC_X + 2) // 1byte, bit 0..3 GRAD, bit 4..5 FREQ +#define EEPROM_TMC_X_TCOOLTHRS (EEPROM_TMC_X + 3) // 2bytes (0..) +#define EEPROM_TMC_X_SG_THRS (EEPROM_TMC_X + 5) // 1byte, (-64..+63) +#define EEPROM_TMC_X_CURRENT_H (EEPROM_TMC_X + 6) // 1byte, (0..63) +#define EEPROM_TMC_X_CURRENT_R (EEPROM_TMC_X + 7) // 1byte, (0..63) +#define EEPROM_TMC_X_HOME_SG_THRS (EEPROM_TMC_X + 8) // 1byte, (-64..+63) +#define EEPROM_TMC_X_HOME_CURRENT_R (EEPROM_TMC_X + 9) // 1byte, (-64..+63) +#define EEPROM_TMC_X_HOME_DTCOOLTHRS (EEPROM_TMC_X + 10) // 1byte (-128..+127) +#define EEPROM_TMC_X_DTCOOLTHRS_LOW (EEPROM_TMC_X + 11) // 1byte (-128..+127) +#define EEPROM_TMC_X_DTCOOLTHRS_HIGH (EEPROM_TMC_X + 12) // 1byte (-128..+127) +#define EEPROM_TMC_X_SG_THRS_LOW (EEPROM_TMC_X + 13) // 1byte, (-64..+63) +#define EEPROM_TMC_X_SG_THRS_HIGH (EEPROM_TMC_X + 14) // 1byte, (-64..+63) + +// Currently running firmware, each digit stored as uint16_t. +// The flavor differentiates a dev, alpha, beta, release candidate or a release version. +#define EEPROM_FIRMWARE_VERSION_END (FW_PRUSA3D_MAGIC_LEN+8) +#define EEPROM_FIRMWARE_VERSION_FLAVOR (FW_PRUSA3D_MAGIC_LEN+6) +#define EEPROM_FIRMWARE_VERSION_REVISION (FW_PRUSA3D_MAGIC_LEN+4) +#define EEPROM_FIRMWARE_VERSION_MINOR (FW_PRUSA3D_MAGIC_LEN+2) +#define EEPROM_FIRMWARE_VERSION_MAJOR FW_PRUSA3D_MAGIC_LEN +// Magic string, indicating that the current or the previous firmware running was the Prusa3D firmware. +#define EEPROM_FIRMWARE_PRUSA_MAGIC 0 + +#define EEPROM_OFFSET 20 //offset for storing settings using M500 +//#define EEPROM_OFFSET // This configuration file contains the basic settings. // Advanced settings can be found in Configuration_adv.h diff --git a/Firmware/Marlin.h b/Firmware/Marlin.h index 064d96d4..11e35a10 100644 --- a/Firmware/Marlin.h +++ b/Firmware/Marlin.h @@ -396,7 +396,6 @@ void serialecho_temperatures(); bool check_commands(); void uvlo_(); -void uvlo_tiny(); void recover_print(uint8_t automatic); void setup_uvlo_interrupt(); @@ -404,8 +403,7 @@ void setup_uvlo_interrupt(); void setup_fan_interrupt(); #endif -//extern void recover_machine_state_after_power_panic(); -extern void recover_machine_state_after_power_panic(bool bTiny); +extern void recover_machine_state_after_power_panic(); extern void restore_print_from_eeprom(); extern void position_menu(); @@ -466,4 +464,8 @@ void gcode_M701(); #define UVLO !(PINE & (1<<4)) -void proc_commands(); \ No newline at end of file +void proc_commands(); + +bool mmu_get_reponse(); +void mmu_not_responding(); +void mmu_load_to_nozzle(); \ No newline at end of file diff --git a/Firmware/Marlin_main.cpp b/Firmware/Marlin_main.cpp index 1ae77012..74719f72 100644 --- a/Firmware/Marlin_main.cpp +++ b/Firmware/Marlin_main.cpp @@ -126,8 +126,6 @@ #include "ultralcd.h" -//-// -#include "sound.h" #include "cmdqueue.h" @@ -1151,8 +1149,6 @@ void setup() spi_init(); lcd_splash(); -//-// - Sound_Init(); #ifdef W25X20CL // Enter an STK500 compatible Optiboot boot loader waiting for flashing the languages to an external flash memory. @@ -6363,8 +6359,6 @@ Sigma_Exit: unsigned long waiting_start_time = millis(); uint8_t wait_for_user_state = 0; lcd_display_message_fullscreen_P(_T(MSG_PRESS_TO_UNLOAD)); -//-// -bool bFirst=true; while (!(wait_for_user_state == 0 && lcd_clicked())){ //cnt++; @@ -6385,13 +6379,7 @@ bool bFirst=true; } SET_OUTPUT(BEEPER); if (counterBeep == 0) { -//-// -//if(eSoundMode==e_SOUND_MODE_LOUD) -if((eSoundMode==e_SOUND_MODE_LOUD)||((eSoundMode==e_SOUND_MODE_ONCE)&&bFirst)) -{ -bFirst=false; WRITE(BEEPER, HIGH); -} } if (counterBeep == 20) { WRITE(BEEPER, LOW); @@ -7113,11 +7101,7 @@ bFirst=false; disable_e2(); delay(100); -//-// -//if(eSoundMode==e_SOUND_MODE_LOUD) -// Sound_MakeSound_tmp(); -Sound_MakeSound(e_SOUND_CLASS_Prompt,e_SOUND_TYPE_StandardPrompt); -/* + WRITE(BEEPER, HIGH); uint8_t counterBeep = 0; while (!lcd_clicked() && (counterBeep < 50)) { @@ -7126,13 +7110,6 @@ Sound_MakeSound(e_SOUND_CLASS_Prompt,e_SOUND_TYPE_StandardPrompt); counterBeep++; } WRITE(BEEPER, LOW); -*/ -uint8_t counterBeep = 0; -while (!lcd_clicked() && (counterBeep < 50)) { - delay_keep_alive(100); - counterBeep++; -} -//-// st_synchronize(); while (lcd_clicked()) delay_keep_alive(100); diff --git a/Firmware/eeprom.h b/Firmware/eeprom.h deleted file mode 100644 index f6af7037..00000000 --- a/Firmware/eeprom.h +++ /dev/null @@ -1,182 +0,0 @@ -#ifndef EEPROM_H -#define EEPROM_H - -// The total size of the EEPROM is -// 4096 for the Atmega2560 -#define EEPROM_TOP 4096 -#define EEPROM_SILENT 4095 -#define EEPROM_LANG 4094 -#define EEPROM_BABYSTEP_X 4092 -#define EEPROM_BABYSTEP_Y 4090 -#define EEPROM_BABYSTEP_Z 4088 -#define EEPROM_CALIBRATION_STATUS 4087 -#define EEPROM_BABYSTEP_Z0 4085 -#define EEPROM_FILAMENTUSED 4081 -// uint32_t -#define EEPROM_TOTALTIME 4077 - -#define EEPROM_BED_CALIBRATION_CENTER (EEPROM_TOTALTIME-2*4) -#define EEPROM_BED_CALIBRATION_VEC_X (EEPROM_BED_CALIBRATION_CENTER-2*4) -#define EEPROM_BED_CALIBRATION_VEC_Y (EEPROM_BED_CALIBRATION_VEC_X-2*4) - -// Offsets of the Z heiths of the calibration points from the first point. -// The offsets are saved as 16bit signed int, scaled to tenths of microns. -#define EEPROM_BED_CALIBRATION_Z_JITTER (EEPROM_BED_CALIBRATION_VEC_Y-2*8) -#define EEPROM_FARM_MODE (EEPROM_BED_CALIBRATION_Z_JITTER-1) -#define EEPROM_FARM_NUMBER (EEPROM_FARM_MODE-3) - -// Correction of the bed leveling, in micrometers. -// Maximum 50 micrometers allowed. -// Bed correction is valid if set to 1. If set to zero or 255, the successive 4 bytes are invalid. -#define EEPROM_BED_CORRECTION_VALID (EEPROM_FARM_NUMBER-1) -#define EEPROM_BED_CORRECTION_LEFT (EEPROM_BED_CORRECTION_VALID-1) -#define EEPROM_BED_CORRECTION_RIGHT (EEPROM_BED_CORRECTION_LEFT-1) -#define EEPROM_BED_CORRECTION_FRONT (EEPROM_BED_CORRECTION_RIGHT-1) -#define EEPROM_BED_CORRECTION_REAR (EEPROM_BED_CORRECTION_FRONT-1) -#define EEPROM_TOSHIBA_FLASH_AIR_COMPATIBLITY (EEPROM_BED_CORRECTION_REAR-1) -#define EEPROM_PRINT_FLAG (EEPROM_TOSHIBA_FLASH_AIR_COMPATIBLITY-1) -#define EEPROM_PROBE_TEMP_SHIFT (EEPROM_PRINT_FLAG - 2*5) //5 x int for storing pinda probe temp shift relative to 50 C; unit: motor steps -#define EEPROM_TEMP_CAL_ACTIVE (EEPROM_PROBE_TEMP_SHIFT - 1) -#define EEPROM_BOWDEN_LENGTH (EEPROM_TEMP_CAL_ACTIVE - 2*4) //4 x int for bowden lengths for multimaterial -#define EEPROM_CALIBRATION_STATUS_PINDA (EEPROM_BOWDEN_LENGTH - 1) //0 - not calibrated; 1 - calibrated -#define EEPROM_UVLO (EEPROM_CALIBRATION_STATUS_PINDA - 1) //1 - uvlo during print -#define EEPROM_UVLO_CURRENT_POSITION (EEPROM_UVLO-2*4) // 2 x float for current_position in X and Y axes -#define EEPROM_FILENAME (EEPROM_UVLO_CURRENT_POSITION - 8) //8chars to store filename without extension -#define EEPROM_FILE_POSITION (EEPROM_FILENAME - 4) //32 bit for uint32_t file position -#define EEPROM_UVLO_CURRENT_POSITION_Z (EEPROM_FILE_POSITION - 4) //float for current position in Z -#define EEPROM_UVLO_TARGET_HOTEND (EEPROM_UVLO_CURRENT_POSITION_Z - 1) -#define EEPROM_UVLO_TARGET_BED (EEPROM_UVLO_TARGET_HOTEND - 1) -#define EEPROM_UVLO_FEEDRATE (EEPROM_UVLO_TARGET_BED - 2) -#define EEPROM_UVLO_FAN_SPEED (EEPROM_UVLO_FEEDRATE - 1) -#define EEPROM_FAN_CHECK_ENABLED (EEPROM_UVLO_FAN_SPEED - 1) -#define EEPROM_UVLO_MESH_BED_LEVELING (EEPROM_FAN_CHECK_ENABLED - 9*2) - -#define EEPROM_UVLO_Z_MICROSTEPS (EEPROM_UVLO_MESH_BED_LEVELING - 2) -#define EEPROM_UVLO_E_ABS (EEPROM_UVLO_Z_MICROSTEPS - 1) -#define EEPROM_UVLO_CURRENT_POSITION_E (EEPROM_UVLO_E_ABS - 4) //float for current position in E - -// Crash detection mode EEPROM setting -#define EEPROM_CRASH_DET (EEPROM_UVLO_CURRENT_POSITION_E - 5) // float (orig EEPROM_UVLO_MESH_BED_LEVELING-12) -// Crash detection counter Y (last print) -#define EEPROM_CRASH_COUNT_Y (EEPROM_CRASH_DET - 1) // uint8 (orig EEPROM_UVLO_MESH_BED_LEVELING-15) -// Filament sensor on/off EEPROM setting -#define EEPROM_FSENSOR (EEPROM_CRASH_COUNT_Y - 1) // uint8 (orig EEPROM_UVLO_MESH_BED_LEVELING-14) -// Crash detection counter X (last print) -#define EEPROM_CRASH_COUNT_X (EEPROM_FSENSOR - 1) // uint8 (orig EEPROM_UVLO_MESH_BED_LEVELING-15) -// Filament runout/error coutner (last print) -#define EEPROM_FERROR_COUNT (EEPROM_CRASH_COUNT_X - 1) // uint8 (orig EEPROM_UVLO_MESH_BED_LEVELING-16) -// Power loss errors (last print) -#define EEPROM_POWER_COUNT (EEPROM_FERROR_COUNT - 1) // uint8 (orig EEPROM_UVLO_MESH_BED_LEVELING-17) - -#define EEPROM_XYZ_CAL_SKEW (EEPROM_POWER_COUNT - 4) // float for skew backup -#define EEPROM_WIZARD_ACTIVE (EEPROM_XYZ_CAL_SKEW - 1) -#define EEPROM_BELTSTATUS_X (EEPROM_WIZARD_ACTIVE - 2) // uint16 -#define EEPROM_BELTSTATUS_Y (EEPROM_BELTSTATUS_X - 2) // uint16 - -#define EEPROM_DIR_DEPTH (EEPROM_BELTSTATUS_Y-1) -#define EEPROM_DIRS (EEPROM_DIR_DEPTH-80) //8 chars for each dir name, max 10 levels -#define EEPROM_SD_SORT (EEPROM_DIRS - 1) //0 -time, 1-alpha, 2-none -#define EEPROM_SECOND_SERIAL_ACTIVE (EEPROM_SD_SORT - 1) - -#define EEPROM_FSENS_AUTOLOAD_ENABLED (EEPROM_SECOND_SERIAL_ACTIVE - 1) - -// Crash detection counter X (total) -#define EEPROM_CRASH_COUNT_X_TOT (EEPROM_FSENS_AUTOLOAD_ENABLED - 2) // uint16 -// Crash detection counter Y (total) -#define EEPROM_CRASH_COUNT_Y_TOT (EEPROM_CRASH_COUNT_X_TOT - 2) // uint16 -// Filament runout/error coutner (total) -#define EEPROM_FERROR_COUNT_TOT (EEPROM_CRASH_COUNT_Y_TOT - 2) // uint16 -// Power loss errors (total) -#define EEPROM_POWER_COUNT_TOT (EEPROM_FERROR_COUNT_TOT - 2) // uint16 - -//////////////////////////////////////// -// TMC2130 Accurate sensorless homing - -// X-axis home origin (stepper phase in microsteps, 0..63 for 16ustep resolution) -#define EEPROM_TMC2130_HOME_X_ORIGIN (EEPROM_POWER_COUNT_TOT - 1) // uint8 -// X-axis home bsteps (number of microsteps backward) -#define EEPROM_TMC2130_HOME_X_BSTEPS (EEPROM_TMC2130_HOME_X_ORIGIN - 1) // uint8 -// X-axis home fsteps (number of microsteps forward) -#define EEPROM_TMC2130_HOME_X_FSTEPS (EEPROM_TMC2130_HOME_X_BSTEPS - 1) // uint8 -// Y-axis home origin (stepper phase in microsteps, 0..63 for 16ustep resolution) -#define EEPROM_TMC2130_HOME_Y_ORIGIN (EEPROM_TMC2130_HOME_X_FSTEPS - 1) // uint8 -// X-axis home bsteps (number of microsteps backward) -#define EEPROM_TMC2130_HOME_Y_BSTEPS (EEPROM_TMC2130_HOME_Y_ORIGIN - 1) // uint8 -// X-axis home fsteps (number of microsteps forward) -#define EEPROM_TMC2130_HOME_Y_FSTEPS (EEPROM_TMC2130_HOME_Y_BSTEPS - 1) // uint8 -// Accurate homing enabled -#define EEPROM_TMC2130_HOME_ENABLED (EEPROM_TMC2130_HOME_Y_FSTEPS - 1) // uint8 - - -//////////////////////////////////////// -// TMC2130 uStep linearity correction - -// Linearity correction factor (XYZE) -#define EEPROM_TMC2130_WAVE_X_FAC (EEPROM_TMC2130_HOME_ENABLED - 1) // uint8 -#define EEPROM_TMC2130_WAVE_Y_FAC (EEPROM_TMC2130_WAVE_X_FAC - 1) // uint8 -#define EEPROM_TMC2130_WAVE_Z_FAC (EEPROM_TMC2130_WAVE_Y_FAC - 1) // uint8 -#define EEPROM_TMC2130_WAVE_E_FAC (EEPROM_TMC2130_WAVE_Z_FAC - 1) // uint8 - - -//////////////////////////////////////// -// TMC2130 uStep resolution - -// microstep resolution (XYZE): usteps = (256 >> mres) -#define EEPROM_TMC2130_X_MRES (EEPROM_TMC2130_WAVE_E_FAC - 1) // uint8 -#define EEPROM_TMC2130_Y_MRES (EEPROM_TMC2130_X_MRES - 1) // uint8 -#define EEPROM_TMC2130_Z_MRES (EEPROM_TMC2130_Y_MRES - 1) // uint8 -#define EEPROM_TMC2130_E_MRES (EEPROM_TMC2130_Z_MRES - 1) // uint8 - -// HW -#define EEPROM_PRINTER_TYPE (EEPROM_TMC2130_E_MRES - 2) // uint16 -#define EEPROM_BOARD_TYPE (EEPROM_PRINTER_TYPE - 2) // uint16 - -// Extruder multiplier for power panic -#define EEPROM_EXTRUDER_MULTIPLIER_0 (EEPROM_BOARD_TYPE - 4) //float -#define EEPROM_EXTRUDER_MULTIPLIER_1 (EEPROM_EXTRUDER_MULTIPLIER_0 - 4) //float -#define EEPROM_EXTRUDER_MULTIPLIER_2 (EEPROM_EXTRUDER_MULTIPLIER_1 - 4) //float -#define EEPROM_EXTRUDEMULTIPLY (EEPROM_EXTRUDER_MULTIPLIER_2 - 2) // uint16 - -// Sound Mode -#define EEPROM_SOUND_MODE (EEPROM_EXTRUDEMULTIPLY-1) // uint8 - -// !!!!! -// !!!!! this is end of EEPROM section ... all updates MUST BE inserted before this mark !!!!! -// !!!!! - -//TMC2130 configuration -#define EEPROM_TMC_AXIS_SIZE //axis configuration block size -#define EEPROM_TMC_X (EEPROM_TMC + 0 * EEPROM_TMC_AXIS_SIZE) //X axis configuration blok -#define EEPROM_TMC_Y (EEPROM_TMC + 1 * EEPROM_TMC_AXIS_SIZE) //Y axis -#define EEPROM_TMC_Z (EEPROM_TMC + 2 * EEPROM_TMC_AXIS_SIZE) //Z axis -#define EEPROM_TMC_E (EEPROM_TMC + 3 * EEPROM_TMC_AXIS_SIZE) //E axis -//TMC2130 - X axis -#define EEPROM_TMC_X_USTEPS_INTPOL (EEPROM_TMC_X + 0) // 1byte, bit 0..4 USTEPS, bit 7 INTPOL -#define EEPROM_TMC_X_PWM_AMPL (EEPROM_TMC_X + 1) // 1byte (0..255) -#define EEPROM_TMC_X_PWM_GRAD_FREQ (EEPROM_TMC_X + 2) // 1byte, bit 0..3 GRAD, bit 4..5 FREQ -#define EEPROM_TMC_X_TCOOLTHRS (EEPROM_TMC_X + 3) // 2bytes (0..) -#define EEPROM_TMC_X_SG_THRS (EEPROM_TMC_X + 5) // 1byte, (-64..+63) -#define EEPROM_TMC_X_CURRENT_H (EEPROM_TMC_X + 6) // 1byte, (0..63) -#define EEPROM_TMC_X_CURRENT_R (EEPROM_TMC_X + 7) // 1byte, (0..63) -#define EEPROM_TMC_X_HOME_SG_THRS (EEPROM_TMC_X + 8) // 1byte, (-64..+63) -#define EEPROM_TMC_X_HOME_CURRENT_R (EEPROM_TMC_X + 9) // 1byte, (-64..+63) -#define EEPROM_TMC_X_HOME_DTCOOLTHRS (EEPROM_TMC_X + 10) // 1byte (-128..+127) -#define EEPROM_TMC_X_DTCOOLTHRS_LOW (EEPROM_TMC_X + 11) // 1byte (-128..+127) -#define EEPROM_TMC_X_DTCOOLTHRS_HIGH (EEPROM_TMC_X + 12) // 1byte (-128..+127) -#define EEPROM_TMC_X_SG_THRS_LOW (EEPROM_TMC_X + 13) // 1byte, (-64..+63) -#define EEPROM_TMC_X_SG_THRS_HIGH (EEPROM_TMC_X + 14) // 1byte, (-64..+63) - -// Currently running firmware, each digit stored as uint16_t. -// The flavor differentiates a dev, alpha, beta, release candidate or a release version. -#define EEPROM_FIRMWARE_VERSION_END (FW_PRUSA3D_MAGIC_LEN+8) -#define EEPROM_FIRMWARE_VERSION_FLAVOR (FW_PRUSA3D_MAGIC_LEN+6) -#define EEPROM_FIRMWARE_VERSION_REVISION (FW_PRUSA3D_MAGIC_LEN+4) -#define EEPROM_FIRMWARE_VERSION_MINOR (FW_PRUSA3D_MAGIC_LEN+2) -#define EEPROM_FIRMWARE_VERSION_MAJOR FW_PRUSA3D_MAGIC_LEN -// Magic string, indicating that the current or the previous firmware running was the Prusa3D firmware. -#define EEPROM_FIRMWARE_PRUSA_MAGIC 0 - -#define EEPROM_OFFSET 20 //offset for storing settings using M500 -//#define EEPROM_OFFSET - -#endif // EEPROM_H diff --git a/Firmware/lcd.cpp b/Firmware/lcd.cpp index b68b943b..f564be86 100644 --- a/Firmware/lcd.cpp +++ b/Firmware/lcd.cpp @@ -13,8 +13,6 @@ //#include #include "Marlin.h" #include "fastio.h" -//-// -#include "sound.h" // commands @@ -691,9 +689,6 @@ uint8_t lcd_clicked(void) void lcd_beeper_quick_feedback(void) { SET_OUTPUT(BEEPER); -//-// -Sound_MakeSound(e_SOUND_CLASS_Echo,e_SOUND_TYPE_ButtonEcho); -/* for(int8_t i = 0; i < 10; i++) { WRITE(BEEPER,HIGH); @@ -701,7 +696,6 @@ Sound_MakeSound(e_SOUND_CLASS_Echo,e_SOUND_TYPE_ButtonEcho); WRITE(BEEPER,LOW); delayMicroseconds(100); } -*/ } void lcd_quick_feedback(void) diff --git a/Firmware/sound.cpp b/Firmware/sound.cpp deleted file mode 100644 index 90e6ab93..00000000 --- a/Firmware/sound.cpp +++ /dev/null @@ -1,105 +0,0 @@ -#include "sound.h" - -#include "Marlin.h" - -//#include -//#include -//#include "eeprom.h" - - -//eSOUND_MODE eSoundMode=e_SOUND_MODE_LOUD; -// nema vyznam, pokud se bude volat Sound_Init (tzn. poc. hodnota je v EEPROM) -// !?! eSOUND_MODE eSoundMode; v ultraldc.cpp :: cd_settings_menu() se takto jevi jako lokalni promenna -eSOUND_MODE eSoundMode; //=e_SOUND_MODE_DEFAULT; - - -static void Sound_SaveMode(void); -static void Sound_DoSound_Echo(void); -static void Sound_DoSound_Prompt(void); - - -void Sound_Init(void) -{ -eSoundMode=(eSOUND_MODE)eeprom_read_byte((uint8_t*)EEPROM_SOUND_MODE); -if(eSoundMode==e_SOUND_MODE_NULL) - Sound_Default(); // je potreba provest i ulozeni do EEPROM -} - -void Sound_Default(void) -{ -eSoundMode=e_SOUND_MODE_DEFAULT; -Sound_SaveMode(); -} - -void Sound_SaveMode(void) -{ -eeprom_update_byte((uint8_t*)EEPROM_SOUND_MODE,(uint8_t)eSoundMode); -} - -void Sound_CycleState(void) -{ -switch(eSoundMode) - { - case e_SOUND_MODE_LOUD: - eSoundMode=e_SOUND_MODE_ONCE; - break; - case e_SOUND_MODE_ONCE: - eSoundMode=e_SOUND_MODE_SILENT; - break; - case e_SOUND_MODE_SILENT: - eSoundMode=e_SOUND_MODE_MUTE; - break; - case e_SOUND_MODE_MUTE: - eSoundMode=e_SOUND_MODE_LOUD; - break; - default: - eSoundMode=e_SOUND_MODE_LOUD; - } -Sound_SaveMode(); -} - -void Sound_MakeSound(eSOUND_CLASS eSoundClass,eSOUND_TYPE eSoundType) -{ -switch(eSoundMode) - { - case e_SOUND_MODE_LOUD: - if(eSoundType==e_SOUND_TYPE_ButtonEcho) - Sound_DoSound_Echo(); - if(eSoundType==e_SOUND_TYPE_StandardPrompt) - Sound_DoSound_Prompt(); - break; - case e_SOUND_MODE_ONCE: - if(eSoundType==e_SOUND_TYPE_ButtonEcho) - Sound_DoSound_Echo(); - if(eSoundType==e_SOUND_TYPE_StandardPrompt) - Sound_DoSound_Prompt(); - break; - case e_SOUND_MODE_SILENT: - break; - case e_SOUND_MODE_MUTE: - break; - default: - ; - } -} - - -static void Sound_DoSound_Echo(void) -{ -uint8_t nI; - -for(nI=0;nI<10;nI++) - { - WRITE(BEEPER,HIGH); - delayMicroseconds(100); - WRITE(BEEPER,LOW); - delayMicroseconds(100); - } -} - -static void Sound_DoSound_Prompt(void) -{ -WRITE(BEEPER,HIGH); -delay_keep_alive(500); -WRITE(BEEPER,LOW); -} diff --git a/Firmware/sound.h b/Firmware/sound.h deleted file mode 100644 index 9415b763..00000000 --- a/Firmware/sound.h +++ /dev/null @@ -1,34 +0,0 @@ -#ifndef SOUND_H -#define SOUND_H - - -#define MSG_SOUND_MODE_LOUD "Sound [loud]" -#define MSG_SOUND_MODE_ONCE "Sound [once]" -#define MSG_SOUND_MODE_SILENT "Sound [silent]" -#define MSG_SOUND_MODE_MUTE "Sound [mute]" - - -#define e_SOUND_MODE_NULL 0xFF -typedef enum - {e_SOUND_MODE_LOUD,e_SOUND_MODE_ONCE,e_SOUND_MODE_SILENT,e_SOUND_MODE_MUTE} eSOUND_MODE; -#define e_SOUND_MODE_DEFAULT e_SOUND_MODE_LOUD - -typedef enum - {e_SOUND_TYPE_ButtonEcho,e_SOUND_TYPE_EncoderEcho,e_SOUND_TYPE_StandardPrompt,e_SOUND_TYPE_StandardConfirm,e_SOUND_TYPE_StandardWarning,e_SOUND_TYPE_StandardAlert} eSOUND_TYPE; -typedef enum - {e_SOUND_CLASS_Echo,e_SOUND_CLASS_Prompt,e_SOUND_CLASS_Confirm,e_SOUND_CLASS_Warning,e_SOUND_CLASS_Alert} eSOUND_CLASS; - - -extern eSOUND_MODE eSoundMode; - - -extern void Sound_Init(void); -extern void Sound_Default(void); -extern void Sound_Save(void); -extern void Sound_CycleState(void); -extern void Sound_MakeSound(eSOUND_CLASS eSoundClass,eSOUND_TYPE eSoundType); - -//static void Sound_DoSound_Echo(void); -//static void Sound_DoSound_Prompt(void); - -#endif // SOUND_H diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp index 8543d5a2..6ea1b5f1 100644 --- a/Firmware/ultralcd.cpp +++ b/Firmware/ultralcd.cpp @@ -31,9 +31,6 @@ #include "tmc2130.h" #endif //TMC2130 -//-// -#include "sound.h" - #ifdef SNMM_V2 #include "uart2.h" #endif //SNMM_V2 @@ -4115,11 +4112,6 @@ static void lcd_fsensor_state_set() } #endif //PAT9125 -//-// -static void lcd_sound_state_set(void) -{ -Sound_CycleState(); -} #if !SDSORT_USES_RAM void lcd_set_degree() { @@ -4676,7 +4668,7 @@ static void lcd_settings_menu() #endif //(LANG_MODE != 0) if (card.ToshibaFlashAir_isEnabled()) { - MENU_ITEM_FUNCTION_P(_i("SD card [flshAir]"), lcd_toshiba_flash_air_compatibility_toggle);////MSG_TOSHIBA_FLASH_AIR_COMPATIBILITY_ON c=19 r=1 + MENU_ITEM_FUNCTION_P(_i("SD card [FlshAir]"), lcd_toshiba_flash_air_compatibility_toggle);////MSG_TOSHIBA_FLASH_AIR_COMPATIBILITY_ON c=19 r=1 } else { MENU_ITEM_FUNCTION_P(_i("SD card [normal]"), lcd_toshiba_flash_air_compatibility_toggle);////MSG_TOSHIBA_FLASH_AIR_COMPATIBILITY_OFF c=19 r=1 } @@ -4686,33 +4678,13 @@ static void lcd_settings_menu() uint8_t sdSort; EEPROM_read(EEPROM_SD_SORT, (uint8_t*)&sdSort, sizeof(sdSort)); switch (sdSort) { - case SD_SORT_TIME: MENU_ITEM_FUNCTION_P(_i("Sort: [time]"), lcd_sort_type_set); break;////MSG_SORT_TIME c=17 r=1 - case SD_SORT_ALPHA: MENU_ITEM_FUNCTION_P(_i("Sort: [alphabet]"), lcd_sort_type_set); break;////MSG_SORT_ALPHA c=17 r=1 - default: MENU_ITEM_FUNCTION_P(_i("Sort: [none]"), lcd_sort_type_set);////MSG_SORT_NONE c=17 r=1 + case SD_SORT_TIME: MENU_ITEM_FUNCTION_P(_i("Sort: [Time]"), lcd_sort_type_set); break;////MSG_SORT_TIME c=17 r=1 + case SD_SORT_ALPHA: MENU_ITEM_FUNCTION_P(_i("Sort: [Alphabet]"), lcd_sort_type_set); break;////MSG_SORT_ALPHA c=17 r=1 + default: MENU_ITEM_FUNCTION_P(_i("Sort: [None]"), lcd_sort_type_set);////MSG_SORT_NONE c=17 r=1 } } #endif // SDCARD_SORT_ALPHA - -//-// -switch(eSoundMode) - { - case e_SOUND_MODE_LOUD: - MENU_ITEM_FUNCTION_P(_i(MSG_SOUND_MODE_LOUD),lcd_sound_state_set); - break; - case e_SOUND_MODE_ONCE: - MENU_ITEM_FUNCTION_P(_i(MSG_SOUND_MODE_ONCE),lcd_sound_state_set); - break; - case e_SOUND_MODE_SILENT: - MENU_ITEM_FUNCTION_P(_i(MSG_SOUND_MODE_SILENT),lcd_sound_state_set); - break; - case e_SOUND_MODE_MUTE: - MENU_ITEM_FUNCTION_P(_i(MSG_SOUND_MODE_MUTE),lcd_sound_state_set); - break; - default: - MENU_ITEM_FUNCTION_P(_i(MSG_SOUND_MODE_LOUD),lcd_sound_state_set); - } -//-// - + if (farm_mode) { MENU_ITEM_SUBMENU_P(PSTR("Farm number"), lcd_farm_no);