From c7d7389e270366621a1b2dbb198e397c8df39667 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20Remi=C5=A1?= Date: Mon, 23 Jul 2018 20:04:47 +0200 Subject: [PATCH] PowerPanic & Sound --- Firmware/Configuration.h | 171 +---------------------------------- Firmware/Marlin.h | 4 +- Firmware/Marlin_main.cpp | 128 +++++++++++++++++++++++++-- Firmware/eeprom.h | 187 +++++++++++++++++++++++++++++++++++++++ Firmware/lcd.cpp | 6 ++ Firmware/sound.cpp | 105 ++++++++++++++++++++++ Firmware/sound.h | 34 +++++++ Firmware/ultralcd.cpp | 36 +++++++- 8 files changed, 487 insertions(+), 184 deletions(-) create mode 100644 Firmware/eeprom.h create mode 100644 Firmware/sound.cpp create mode 100644 Firmware/sound.h diff --git a/Firmware/Configuration.h b/Firmware/Configuration.h index 469386e5..3fa648f7 100644 --- a/Firmware/Configuration.h +++ b/Firmware/Configuration.h @@ -44,177 +44,8 @@ #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 -#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 +#include "eeprom.h" // 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 80dcc2d0..157a1df9 100644 --- a/Firmware/Marlin.h +++ b/Firmware/Marlin.h @@ -396,6 +396,7 @@ void serialecho_temperatures(); bool check_commands(); void uvlo_(); +void uvlo_tiny(); void recover_print(uint8_t automatic); void setup_uvlo_interrupt(); @@ -403,7 +404,8 @@ 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(); +extern void recover_machine_state_after_power_panic(bool bTiny); extern void restore_print_from_eeprom(); extern void position_menu(); diff --git a/Firmware/Marlin_main.cpp b/Firmware/Marlin_main.cpp index eaa408a4..604823b1 100644 --- a/Firmware/Marlin_main.cpp +++ b/Firmware/Marlin_main.cpp @@ -125,6 +125,8 @@ #include "ultralcd.h" +//-// +#include "sound.h" #include "cmdqueue.h" @@ -1146,6 +1148,8 @@ void setup() spi_init(); lcd_splash(); +//-// + Sound_Init(); #ifdef W25X20CL if (!w25x20cl_init()) @@ -1719,7 +1723,11 @@ void setup() #endif //TMC2130 #ifdef UVLO_SUPPORT - if (eeprom_read_byte((uint8_t*)EEPROM_UVLO) == 1) { //previous print was terminated by UVLO +//-// +MYSERIAL.println(">>> Setup"); +MYSERIAL.println(eeprom_read_byte((uint8_t*)EEPROM_UVLO),DEC); +// if (eeprom_read_byte((uint8_t*)EEPROM_UVLO) == 1) { //previous print was terminated by UVLO + if (eeprom_read_byte((uint8_t*)EEPROM_UVLO) != 0) { //previous print was terminated by UVLO /* if (lcd_show_fullscreen_message_yes_no_and_wait_P(_T(MSG_RECOVER_PRINT), false)) recover_print(); else { @@ -1745,7 +1753,8 @@ void setup() #endif if ( lcd_show_fullscreen_message_yes_no_and_wait_P(_T(MSG_RECOVER_PRINT), false) ) recover_print(0); else { - eeprom_update_byte((uint8_t*)EEPROM_UVLO, 0); +//-// +// eeprom_update_byte((uint8_t*)EEPROM_UVLO, 0); lcd_update_enable(true); lcd_update(2); lcd_setstatuspgm(_T(WELCOME_MSG)); @@ -4757,6 +4766,8 @@ void process_commands() card.openFile(strchr_pointer + 4,true); break; case 24: //M24 - Start SD print +//-// +eeprom_update_byte((uint8_t*)EEPROM_UVLO,0); if (!card.paused) failstats_reset_print(); card.startFileprint(); @@ -6330,6 +6341,8 @@ 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++; @@ -6342,7 +6355,13 @@ Sigma_Exit: } 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); @@ -6945,7 +6964,11 @@ Sigma_Exit: 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)) { @@ -6954,6 +6977,13 @@ Sigma_Exit: 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); @@ -8326,6 +8356,8 @@ void uvlo_() { unsigned long time_start = millis(); bool sd_print = card.sdprinting; +//-// +MYSERIAL.println(">>> uvlo()"); // Conserve power as soon as possible. disable_x(); disable_y(); @@ -8482,6 +8514,51 @@ void uvlo_() }; } + + +void uvlo_tiny() +{ +uint16_t z_microsteps=0; +bool sd_print=card.sdprinting; + +MYSERIAL.println(">>> uvloTiny()"); +// Conserve power as soon as possible. +disable_x(); +disable_y(); +disable_e0(); + +#ifdef TMC2130 +tmc2130_set_current_h(Z_AXIS, 20); +tmc2130_set_current_r(Z_AXIS, 20); +#endif //TMC2130 + +// Read out the current Z motor microstep counter +#ifdef TMC2130 +z_microsteps=tmc2130_rd_MSCNT(Z_TMC2130_CS); +#endif //TMC2130 + +planner_abort_hard(); +sei(); +plan_buffer_line( + current_position[X_AXIS], + current_position[Y_AXIS], + current_position[Z_AXIS]+UVLO_Z_AXIS_SHIFT+float((1024-z_microsteps+7)>>4)/axis_steps_per_unit[Z_AXIS], + current_position[E_AXIS], + 40, active_extruder); +st_synchronize(); +disable_z(); + +// Finaly store the "power outage" flag. +//if(sd_print) + eeprom_update_byte((uint8_t*)EEPROM_UVLO,2); + +eeprom_update_word((uint16_t*)(EEPROM_UVLO_TINY_Z_MICROSTEPS),z_microsteps); +eeprom_update_float((float*)(EEPROM_UVLO_TINY_CURRENT_POSITION_Z), current_position[Z_AXIS]); + +// Increment power failure counter +eeprom_update_byte((uint8_t*)EEPROM_POWER_COUNT, eeprom_read_byte((uint8_t*)EEPROM_POWER_COUNT) + 1); +eeprom_update_word((uint16_t*)EEPROM_POWER_COUNT_TOT, eeprom_read_word((uint16_t*)EEPROM_POWER_COUNT_TOT) + 1); +} #endif //UVLO_SUPPORT #if (defined(FANCHECK) && defined(TACH_1) && (TACH_1 >-1)) @@ -8534,7 +8611,20 @@ void setup_uvlo_interrupt() { ISR(INT4_vect) { EIMSK &= ~(1 << 4); //disable INT4 interrupt to make sure that this code will be executed just once SERIAL_ECHOLNPGM("INT4"); - if (IS_SD_PRINTING) uvlo_(); +//-// +// if (IS_SD_PRINTING) uvlo_(); +//if(IS_SD_PRINTING && (!(eeprom_read_byte((uint8_t*)EEPROM_UVLO))) ) uvlo_(); +if(IS_SD_PRINTING && (!(eeprom_read_byte((uint8_t*)EEPROM_UVLO))) ) uvlo_(); +if(eeprom_read_byte((uint8_t*)EEPROM_UVLO)) uvlo_tiny(); +/* +if(IS_SD_PRINTING) + { +MYSERIAL.println(">>> "); + if(!(eeprom_read_byte((uint8_t*)EEPROM_UVLO))) + uvlo_(); + else uvlo_tiny(); + } +*/ } void recover_print(uint8_t automatic) { @@ -8543,10 +8633,17 @@ void recover_print(uint8_t automatic) { lcd_update(2); lcd_setstatuspgm(_i("Recovering print "));////MSG_RECOVERING_PRINT c=20 r=1 - recover_machine_state_after_power_panic(); //recover position, temperatures and extrude_multipliers +//-// +// recover_machine_state_after_power_panic(); //recover position, temperatures and extrude_multipliers +MYSERIAL.println(">>> RecoverPrint"); +MYSERIAL.println(eeprom_read_byte((uint8_t*)EEPROM_UVLO),DEC); +bool bTiny=(eeprom_read_byte((uint8_t*)EEPROM_UVLO)==2); +recover_machine_state_after_power_panic(bTiny); //recover position, temperatures and extrude_multipliers // Lift the print head, so one may remove the excess priming material. - if (current_position[Z_AXIS] < 25) +//-// +//if (current_position[Z_AXIS] < 25) +if(!bTiny&&(current_position[Z_AXIS]<25)) enquecommand_P(PSTR("G1 Z25 F800")); // Home X and Y axes. Homing just X and Y shall not touch the babystep and the world2machine transformation status. enquecommand_P(PSTR("G28 X Y")); @@ -8564,7 +8661,10 @@ void recover_print(uint8_t automatic) { enquecommand_P(PSTR("G1 E" STRINGIFY(-DEFAULT_RETRACTION)" F480")); // Mark the power panic status as inactive. - eeprom_update_byte((uint8_t*)EEPROM_UVLO, 0); +//-// +MYSERIAL.println("===== before"); +// eeprom_update_byte((uint8_t*)EEPROM_UVLO, 0); +MYSERIAL.println("===== after"); /*while ((abs(degHotend(0)- target_temperature[0])>5) || (abs(degBed() -target_temperature_bed)>3)) { //wait for heater and bed to reach target temp delay_keep_alive(1000); }*/ @@ -8577,7 +8677,7 @@ void recover_print(uint8_t automatic) { printf_P(_N("Current pos Z_AXIS:%.3f\nCurrent pos E_AXIS:%.3f\n"), current_position[Z_AXIS], current_position[E_AXIS]); } -void recover_machine_state_after_power_panic() +void recover_machine_state_after_power_panic(bool bTiny) { char cmd[30]; // 1) Recover the logical cordinates at the time of the power panic. @@ -8586,8 +8686,16 @@ void recover_machine_state_after_power_panic() current_position[Y_AXIS] = eeprom_read_float((float*)(EEPROM_UVLO_CURRENT_POSITION + 4)); // Recover the logical coordinate of the Z axis at the time of the power panic. // The current position after power panic is moved to the next closest 0th full step. - current_position[Z_AXIS] = eeprom_read_float((float*)(EEPROM_UVLO_CURRENT_POSITION_Z)) + +//-// +// current_position[Z_AXIS] = eeprom_read_float((float*)(EEPROM_UVLO_CURRENT_POSITION_Z)) + +// UVLO_Z_AXIS_SHIFT + float((1024 - eeprom_read_word((uint16_t*)(EEPROM_UVLO_Z_MICROSTEPS)) + 7) >> 4) / axis_steps_per_unit[Z_AXIS]; + if(bTiny) + current_position[Z_AXIS] = eeprom_read_float((float*)(EEPROM_UVLO_TINY_CURRENT_POSITION_Z)) + + UVLO_Z_AXIS_SHIFT + float((1024 - eeprom_read_word((uint16_t*)(EEPROM_UVLO_TINY_Z_MICROSTEPS)) + 7) >> 4) / axis_steps_per_unit[Z_AXIS]; + else + current_position[Z_AXIS] = eeprom_read_float((float*)(EEPROM_UVLO_CURRENT_POSITION_Z)) + UVLO_Z_AXIS_SHIFT + float((1024 - eeprom_read_word((uint16_t*)(EEPROM_UVLO_Z_MICROSTEPS)) + 7) >> 4) / axis_steps_per_unit[Z_AXIS]; +//-// if (eeprom_read_byte((uint8_t*)EEPROM_UVLO_E_ABS)) { current_position[E_AXIS] = eeprom_read_float((float*)(EEPROM_UVLO_CURRENT_POSITION_E)); sprintf_P(cmd, PSTR("G92 E")); @@ -8720,6 +8828,8 @@ void restore_print_from_eeprom() { // Set a position in the file. sprintf_P(cmd, PSTR("M26 S%lu"), position); enquecommand(cmd); +//-// +enquecommand_P(PSTR("G4 S0")); // Start SD print. enquecommand_P(PSTR("M24")); } diff --git a/Firmware/eeprom.h b/Firmware/eeprom.h new file mode 100644 index 00000000..28498f13 --- /dev/null +++ b/Firmware/eeprom.h @@ -0,0 +1,187 @@ +#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 + +// +#define EEPROM_UVLO_TINY_CURRENT_POSITION_Z (EEPROM_EXTRUDEMULTIPLY-4) // float +#define EEPROM_UVLO_TINY_Z_MICROSTEPS (EEPROM_UVLO_TINY_CURRENT_POSITION_Z-2) // uint16 + +// Sound Mode +//#define EEPROM_SOUND_MODE (EEPROM_EXTRUDEMULTIPLY-1) // uint8 +#define EEPROM_SOUND_MODE (EEPROM_UVLO_TINY_Z_MICROSTEPS-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 c2cf03f5..9d707e6c 100644 --- a/Firmware/lcd.cpp +++ b/Firmware/lcd.cpp @@ -13,6 +13,8 @@ //#include #include "Marlin.h" #include "fastio.h" +//-// +#include "sound.h" // commands @@ -689,6 +691,9 @@ 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); @@ -696,6 +701,7 @@ void lcd_beeper_quick_feedback(void) WRITE(BEEPER,LOW); delayMicroseconds(100); } +*/ } void lcd_quick_feedback(void) diff --git a/Firmware/sound.cpp b/Firmware/sound.cpp new file mode 100644 index 00000000..90e6ab93 --- /dev/null +++ b/Firmware/sound.cpp @@ -0,0 +1,105 @@ +#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 new file mode 100644 index 00000000..9415b763 --- /dev/null +++ b/Firmware/sound.h @@ -0,0 +1,34 @@ +#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 4b47562e..34e48ea2 100644 --- a/Firmware/ultralcd.cpp +++ b/Firmware/ultralcd.cpp @@ -32,6 +32,9 @@ #include "tmc2130.h" #endif //TMC2130 +//-// +#include "sound.h" + #ifdef SNMM_V2 #include "uart2.h" #endif //SNMM_V2 @@ -4109,6 +4112,11 @@ uint8_t nlines; } #endif //FILAMENT_SENSOR +//-// +static void lcd_sound_state_set(void) +{ +Sound_CycleState(); +} static void lcd_silent_mode_set() { switch (SilentModeMenu) { @@ -4729,7 +4737,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 @@ -4740,13 +4748,33 @@ static void lcd_settings_menu() 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);