josh
/
Prusa-Firmware
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/MK3' into MK3_Fix_LCD_stats

This commit is contained in:
3d-gussner 2020-04-02 15:14:00 +02:00
parent dbd07c1d1c a1b8ee67b3
commit 0daa916c8d
3 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Firmware/Dcodes.cpp
View File

@ -98,7 +98,7 @@ void print_mem(uint32_t address, uint16_t count, uint8_t type, uint8_t countperl
} }
} }
#ifdef DEBUG_DCODE3 #if defined DEBUG_DCODE3 || defined DEBUG_DCODES
#define EEPROM_SIZE 0x1000 #define EEPROM_SIZE 0x1000
/*! /*!
### D3 - Read/Write EEPROM <a href="https://reprap.org/wiki/G-code#D3:_Read.2FWrite_EEPROM">D3: Read/Write EEPROM</a> ### D3 - Read/Write EEPROM <a href="https://reprap.org/wiki/G-code#D3:_Read.2FWrite_EEPROM">D3: Read/Write EEPROM</a>
@ -360,7 +360,7 @@ void dcode_4()
} }
#endif //DEBUG_DCODES #endif //DEBUG_DCODES
#ifdef DEBUG_DCODE5 #if defined DEBUG_DCODE5 || defined DEBUG_DCODES
/*! /*!
### D5 - Read/Write FLASH <a href="https://reprap.org/wiki/G-code#D5:_Read.2FWrite_FLASH">D5: Read/Write Flash</a> ### D5 - Read/Write FLASH <a href="https://reprap.org/wiki/G-code#D5:_Read.2FWrite_FLASH">D5: Read/Write Flash</a>
@ -372,7 +372,7 @@ void dcode_4()
#### Parameters #### Parameters
- `A` - Address (x00000-x3ffff) - `A` - Address (x00000-x3ffff)
- `C` - Count (1-8192) - `C` - Count (1-8192)
- `X` - Data - `X` - Data (hex)
- `E` - Erase - `E` - Erase
#### Notes #### Notes

6
Firmware/Marlin_main.cpp
View File

@ -8835,7 +8835,7 @@ Sigma_Exit:
case 2: case 2:
dcode_2(); break; dcode_2(); break;
#endif //DEBUG_DCODES #endif //DEBUG_DCODES
#ifdef DEBUG_DCODE3 #if defined DEBUG_DCODE3 || defined DEBUG_DCODES
/*! /*!
### D3 - Read/Write EEPROM <a href="https://reprap.org/wiki/G-code#D3:_Read.2FWrite_EEPROM">D3: Read/Write EEPROM</a> ### D3 - Read/Write EEPROM <a href="https://reprap.org/wiki/G-code#D3:_Read.2FWrite_EEPROM">D3: Read/Write EEPROM</a>
@ -8876,7 +8876,7 @@ Sigma_Exit:
case 4: case 4:
dcode_4(); break; dcode_4(); break;
#endif //DEBUG_DCODES #endif //DEBUG_DCODES
#ifdef DEBUG_DCODE5 #if defined DEBUG_DCODE5 || defined DEBUG_DCODES
/*! /*!
### D5 - Read/Write FLASH <a href="https://reprap.org/wiki/G-code#D5:_Read.2FWrite_FLASH">D5: Read/Write Flash</a> ### D5 - Read/Write FLASH <a href="https://reprap.org/wiki/G-code#D5:_Read.2FWrite_FLASH">D5: Read/Write Flash</a>
@ -8888,7 +8888,7 @@ Sigma_Exit:
#### Parameters #### Parameters
- `A` - Address (x00000-x3ffff) - `A` - Address (x00000-x3ffff)
- `C` - Count (1-8192) - `C` - Count (1-8192)
- `X` - Data - `X` - Data (hex)
- `E` - Erase - `E` - Erase
#### Notes #### Notes

4
lang/lang_en_fr.txt
View File

@ -20,7 +20,7 @@
#MSG_CRASH_DET_STEALTH_FORCE_OFF c=20 r=4 #MSG_CRASH_DET_STEALTH_FORCE_OFF c=20 r=4
"WARNING:\x0aCrash detection\x0adisabled in\x0aStealth mode" "WARNING:\x0aCrash detection\x0adisabled in\x0aStealth mode"
"ATTENTION:\x0aDetection de crash\x0adesactivee en\x0amode feutre" "ATTENTION:\x0aDetection de crash\x0adesactivee en\x0amode furtif"
# #
">Cancel" ">Cancel"
@ -550,7 +550,7 @@
#MSG_SILENT #MSG_SILENT
"Silent" "Silent"
"Feutre" "Furtif"
# #
"MMU needs user attention." "MMU needs user attention."