Merge remote-tracking branch 'upstream/MK3' into MK3_Fix_LCD_stats
This commit is contained in:
commit
0daa916c8d
|
|
@ -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
|
||||
/*!
|
||||
### 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
|
||||
|
||||
#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>
|
||||
|
|
@ -372,7 +372,7 @@ void dcode_4()
|
|||
#### Parameters
|
||||
- `A` - Address (x00000-x3ffff)
|
||||
- `C` - Count (1-8192)
|
||||
- `X` - Data
|
||||
- `X` - Data (hex)
|
||||
- `E` - Erase
|
||||
|
||||
#### Notes
|
||||
|
|
|
|||
|
|
@ -8835,7 +8835,7 @@ Sigma_Exit:
|
|||
case 2:
|
||||
dcode_2(); break;
|
||||
#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>
|
||||
|
|
@ -8876,7 +8876,7 @@ Sigma_Exit:
|
|||
case 4:
|
||||
dcode_4(); break;
|
||||
#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>
|
||||
|
|
@ -8888,7 +8888,7 @@ Sigma_Exit:
|
|||
#### Parameters
|
||||
- `A` - Address (x00000-x3ffff)
|
||||
- `C` - Count (1-8192)
|
||||
- `X` - Data
|
||||
- `X` - Data (hex)
|
||||
- `E` - Erase
|
||||
|
||||
#### Notes
|
||||
|
|
|
|||
|
|
@ -20,7 +20,7 @@
|
|||
|
||||
#MSG_CRASH_DET_STEALTH_FORCE_OFF c=20 r=4
|
||||
"WARNING:\x0aCrash detection\x0adisabled in\x0aStealth mode"
|
||||
"ATTENTION:\x0aDetection de crash\x0adesactivee en\x0amode feutre"
|
||||
"ATTENTION:\x0aDetection de crash\x0adesactivee en\x0amode furtif"
|
||||
|
||||
#
|
||||
">Cancel"
|
||||
|
|
@ -550,7 +550,7 @@
|
|||
|
||||
#MSG_SILENT
|
||||
"Silent"
|
||||
"Feutre"
|
||||
"Furtif"
|
||||
|
||||
#
|
||||
"MMU needs user attention."
|
||||
|
|
|
|||
Loading…
Reference in New Issue