Scott Lahteine пре 3 година
родитељ
комит
1d4f928342

+ 12
- 24
Marlin/src/HAL/DUE/eeprom_flash.cpp Прегледај датотеку

199
   for (i = 0; i <PageSize >> 2; i++)
199
   for (i = 0; i <PageSize >> 2; i++)
200
     pageContents[i] = (((uint32_t*)data)[i]) | (~(pageContents[i] ^ ((uint32_t*)data)[i]));
200
     pageContents[i] = (((uint32_t*)data)[i]) | (~(pageContents[i] ^ ((uint32_t*)data)[i]));
201
 
201
 
202
-  DEBUG_ECHO_START();
203
-  DEBUG_ECHOLNPGM("EEPROM PageWrite   ", page);
202
+  DEBUG_ECHO_MSG("EEPROM PageWrite   ", page);
204
   DEBUG_ECHOLNPGM(" in FLASH address ", (uint32_t)addrflash);
203
   DEBUG_ECHOLNPGM(" in FLASH address ", (uint32_t)addrflash);
205
   DEBUG_ECHOLNPGM(" base address     ", (uint32_t)getFlashStorage(0));
204
   DEBUG_ECHOLNPGM(" base address     ", (uint32_t)getFlashStorage(0));
206
   DEBUG_FLUSH();
205
   DEBUG_FLUSH();
245
     // Reenable interrupts
244
     // Reenable interrupts
246
     __enable_irq();
245
     __enable_irq();
247
 
246
 
248
-    DEBUG_ECHO_START();
249
-    DEBUG_ECHOLNPGM("EEPROM Unlock failure for page ", page);
247
+    DEBUG_ECHO_MSG("EEPROM Unlock failure for page ", page);
250
     return false;
248
     return false;
251
   }
249
   }
252
 
250
 
270
     // Reenable interrupts
268
     // Reenable interrupts
271
     __enable_irq();
269
     __enable_irq();
272
 
270
 
273
-    DEBUG_ECHO_START();
274
-    DEBUG_ECHOLNPGM("EEPROM Write failure for page ", page);
271
+    DEBUG_ECHO_MSG("EEPROM Write failure for page ", page);
275
 
272
 
276
     return false;
273
     return false;
277
   }
274
   }
286
   if (memcmp(getFlashStorage(page),data,PageSize)) {
283
   if (memcmp(getFlashStorage(page),data,PageSize)) {
287
 
284
 
288
     #ifdef EE_EMU_DEBUG
285
     #ifdef EE_EMU_DEBUG
289
-      DEBUG_ECHO_START();
290
-      DEBUG_ECHOLNPGM("EEPROM Verify Write failure for page ", page);
286
+      DEBUG_ECHO_MSG("EEPROM Verify Write failure for page ", page);
291
 
287
 
292
       ee_Dump( page, (uint32_t *)addrflash);
288
       ee_Dump( page, (uint32_t *)addrflash);
293
       ee_Dump(-page, data);
289
       ee_Dump(-page, data);
325
   uint16_t i;
321
   uint16_t i;
326
   uint32_t addrflash = uint32_t(getFlashStorage(page));
322
   uint32_t addrflash = uint32_t(getFlashStorage(page));
327
 
323
 
328
-  DEBUG_ECHO_START();
329
-  DEBUG_ECHOLNPGM("EEPROM PageErase  ", page);
324
+  DEBUG_ECHO_MSG("EEPROM PageErase  ", page);
330
   DEBUG_ECHOLNPGM(" in FLASH address ", (uint32_t)addrflash);
325
   DEBUG_ECHOLNPGM(" in FLASH address ", (uint32_t)addrflash);
331
   DEBUG_ECHOLNPGM(" base address     ", (uint32_t)getFlashStorage(0));
326
   DEBUG_ECHOLNPGM(" base address     ", (uint32_t)getFlashStorage(0));
332
   DEBUG_FLUSH();
327
   DEBUG_FLUSH();
370
     // Reenable interrupts
365
     // Reenable interrupts
371
     __enable_irq();
366
     __enable_irq();
372
 
367
 
373
-    DEBUG_ECHO_START();
374
-    DEBUG_ECHOLNPGM("EEPROM Unlock failure for page ",page);
368
+    DEBUG_ECHO_MSG("EEPROM Unlock failure for page ",page);
375
 
369
 
376
     return false;
370
     return false;
377
   }
371
   }
394
     // Reenable interrupts
388
     // Reenable interrupts
395
     __enable_irq();
389
     __enable_irq();
396
 
390
 
397
-    DEBUG_ECHO_START();
398
-    DEBUG_ECHOLNPGM("EEPROM Erase failure for page ",page);
391
+    DEBUG_ECHO_MSG("EEPROM Erase failure for page ",page);
399
 
392
 
400
     return false;
393
     return false;
401
   }
394
   }
410
   uint32_t * aligned_src = (uint32_t *) addrflash;
403
   uint32_t * aligned_src = (uint32_t *) addrflash;
411
   for (i = 0; i < PageSize >> 2; i++) {
404
   for (i = 0; i < PageSize >> 2; i++) {
412
     if (*aligned_src++ != 0xFFFFFFFF) {
405
     if (*aligned_src++ != 0xFFFFFFFF) {
413
-      DEBUG_ECHO_START();
414
-      DEBUG_ECHOLNPGM("EEPROM Verify Erase failure for page ",page);
406
+      DEBUG_ECHO_MSG("EEPROM Verify Erase failure for page ",page);
415
       ee_Dump(page, (uint32_t *)addrflash);
407
       ee_Dump(page, (uint32_t *)addrflash);
416
       return false;
408
       return false;
417
     }
409
     }
921
   // If all groups seem to be used, default to first group
913
   // If all groups seem to be used, default to first group
922
   if (curGroup >= GroupCount) curGroup = 0;
914
   if (curGroup >= GroupCount) curGroup = 0;
923
 
915
 
924
-  DEBUG_ECHO_START();
925
-  DEBUG_ECHOLNPGM("EEPROM Current Group: ",curGroup);
916
+  DEBUG_ECHO_MSG("EEPROM Current Group: ",curGroup);
926
   DEBUG_FLUSH();
917
   DEBUG_FLUSH();
927
 
918
 
928
   // Now, validate that all the other group pages are empty
919
   // Now, validate that all the other group pages are empty
931
 
922
 
932
     for (int page = 0; page < PagesPerGroup; page++) {
923
     for (int page = 0; page < PagesPerGroup; page++) {
933
       if (!ee_IsPageClean(grp * PagesPerGroup + page)) {
924
       if (!ee_IsPageClean(grp * PagesPerGroup + page)) {
934
-        DEBUG_ECHO_START();
935
-        DEBUG_ECHOLNPGM("EEPROM Page ", page, " not clean on group ", grp);
925
+        DEBUG_ECHO_MSG("EEPROM Page ", page, " not clean on group ", grp);
936
         DEBUG_FLUSH();
926
         DEBUG_FLUSH();
937
         ee_PageErase(grp * PagesPerGroup + page);
927
         ee_PageErase(grp * PagesPerGroup + page);
938
       }
928
       }
948
     }
938
     }
949
   }
939
   }
950
 
940
 
951
-  DEBUG_ECHO_START();
952
-  DEBUG_ECHOLNPGM("EEPROM Active page: ", curPage);
941
+  DEBUG_ECHO_MSG("EEPROM Active page: ", curPage);
953
   DEBUG_FLUSH();
942
   DEBUG_FLUSH();
954
 
943
 
955
   // Make sure the pages following the first clean one are also clean
944
   // Make sure the pages following the first clean one are also clean
956
   for (int page = curPage + 1; page < PagesPerGroup; page++) {
945
   for (int page = curPage + 1; page < PagesPerGroup; page++) {
957
     if (!ee_IsPageClean(curGroup * PagesPerGroup + page)) {
946
     if (!ee_IsPageClean(curGroup * PagesPerGroup + page)) {
958
-      DEBUG_ECHO_START();
959
-      DEBUG_ECHOLNPGM("EEPROM Page ", page, " not clean on active group ", curGroup);
947
+      DEBUG_ECHO_MSG("EEPROM Page ", page, " not clean on active group ", curGroup);
960
       DEBUG_FLUSH();
948
       DEBUG_FLUSH();
961
       ee_Dump(curGroup * PagesPerGroup + page, getFlashStorage(curGroup * PagesPerGroup + page));
949
       ee_Dump(curGroup * PagesPerGroup + page, getFlashStorage(curGroup * PagesPerGroup + page));
962
       ee_PageErase(curGroup * PagesPerGroup + page);
950
       ee_PageErase(curGroup * PagesPerGroup + page);

+ 1
- 2
Marlin/src/feature/mmu/mmu2.cpp Прегледај датотеку

1031
     const float es = pgm_read_float(&(step->extrude));
1031
     const float es = pgm_read_float(&(step->extrude));
1032
     const feedRate_t fr_mm_m = pgm_read_float(&(step->feedRate));
1032
     const feedRate_t fr_mm_m = pgm_read_float(&(step->feedRate));
1033
 
1033
 
1034
-    DEBUG_ECHO_START();
1035
-    DEBUG_ECHOLNPGM("E step ", es, "/", fr_mm_m);
1034
+    DEBUG_ECHO_MSG("E step ", es, "/", fr_mm_m);
1036
 
1035
 
1037
     current_position.e += es;
1036
     current_position.e += es;
1038
     line_to_current_position(MMM_TO_MMS(fr_mm_m));
1037
     line_to_current_position(MMM_TO_MMS(fr_mm_m));

+ 7
- 7
Marlin/src/gcode/probe/M951.cpp Прегледај датотеку

32
 
32
 
33
 inline void mpe_settings_report() {
33
 inline void mpe_settings_report() {
34
   SERIAL_ECHO_MSG("Magnetic Parking Extruder");
34
   SERIAL_ECHO_MSG("Magnetic Parking Extruder");
35
-  SERIAL_ECHO_START(); SERIAL_ECHOLNPGM("L: Left parking  :", mpe_settings.parking_xpos[0]);
36
-  SERIAL_ECHO_START(); SERIAL_ECHOLNPGM("R: Right parking :", mpe_settings.parking_xpos[1]);
37
-  SERIAL_ECHO_START(); SERIAL_ECHOLNPGM("I: Grab Offset   :", mpe_settings.grab_distance);
38
-  SERIAL_ECHO_START(); SERIAL_ECHOLNPGM("J: Normal speed  :", long(MMS_TO_MMM(mpe_settings.slow_feedrate)));
39
-  SERIAL_ECHO_START(); SERIAL_ECHOLNPGM("H: High speed    :", long(MMS_TO_MMM(mpe_settings.fast_feedrate)));
40
-  SERIAL_ECHO_START(); SERIAL_ECHOLNPGM("D: Distance trav.:", mpe_settings.travel_distance);
41
-  SERIAL_ECHO_START(); SERIAL_ECHOLNPGM("C: Compenstion   :", mpe_settings.compensation_factor);
35
+  SERIAL_ECHO_MSG("L: Left parking  :", mpe_settings.parking_xpos[0]);
36
+  SERIAL_ECHO_MSG("R: Right parking :", mpe_settings.parking_xpos[1]);
37
+  SERIAL_ECHO_MSG("I: Grab Offset   :", mpe_settings.grab_distance);
38
+  SERIAL_ECHO_MSG("J: Normal speed  :", long(MMS_TO_MMM(mpe_settings.slow_feedrate)));
39
+  SERIAL_ECHO_MSG("H: High speed    :", long(MMS_TO_MMM(mpe_settings.fast_feedrate)));
40
+  SERIAL_ECHO_MSG("D: Distance trav.:", mpe_settings.travel_distance);
41
+  SERIAL_ECHO_MSG("C: Compenstion   :", mpe_settings.compensation_factor);
42
 }
42
 }
43
 
43
 
44
 void mpe_settings_init() {
44
 void mpe_settings_init() {

+ 6
- 7
Marlin/src/lcd/extui/ftdi_eve_touch_ui/archim2-flash/flash_storage.cpp Прегледај датотеку

178
 
178
 
179
     if (!is_known) {
179
     if (!is_known) {
180
       SERIAL_ECHO_MSG("Unable to locate supported SPI Flash Memory.");
180
       SERIAL_ECHO_MSG("Unable to locate supported SPI Flash Memory.");
181
-      SERIAL_ECHO_START(); SERIAL_ECHOLNPGM("  Manufacturer ID, got: ", manufacturer_id);
182
-      SERIAL_ECHO_START(); SERIAL_ECHOLNPGM("  Device Type    , got: ", device_type);
183
-      SERIAL_ECHO_START(); SERIAL_ECHOLNPGM("  Capacity       , got: ", capacity);
181
+      SERIAL_ECHO_MSG("  Manufacturer ID, got: ", manufacturer_id);
182
+      SERIAL_ECHO_MSG("  Device Type    , got: ", device_type);
183
+      SERIAL_ECHO_MSG("  Capacity       , got: ", capacity);
184
     }
184
     }
185
 
185
 
186
     return is_known;
186
     return is_known;
247
         case 0xFFFFFFFFul: return read_offset;
247
         case 0xFFFFFFFFul: return read_offset;
248
         case delimiter:    read_offset = offset; break;
248
         case delimiter:    read_offset = offset; break;
249
         default:
249
         default:
250
-          SERIAL_ECHO_START(); SERIAL_ECHOLNPGM("Invalid delimiter in Flash: ", delim);
250
+          SERIAL_ECHO_MSG("Invalid delimiter in Flash: ", delim);
251
           return -1;
251
           return -1;
252
       }
252
       }
253
     }
253
     }
325
     }
325
     }
326
 
326
 
327
     SERIAL_ECHO_START();
327
     SERIAL_ECHO_START();
328
-    SERIAL_ECHOPGM("Writing UI settings to SPI Flash (offset ", write_addr);
329
-    SERIAL_ECHOPGM(")...");
328
+    SERIAL_ECHOPGM("Writing UI settings to SPI Flash (offset ", write_addr, ")...");
330
 
329
 
331
     const uint32_t delim = delimiter;
330
     const uint32_t delim = delimiter;
332
     write_addr = write(write_addr, &delim, sizeof(delim));
331
     write_addr = write(write_addr, &delim, sizeof(delim));
509
 
508
 
510
     bytes_remaining = get_media_file_size(slot);
509
     bytes_remaining = get_media_file_size(slot);
511
     if (bytes_remaining != 0xFFFFFFFFUL) {
510
     if (bytes_remaining != 0xFFFFFFFFUL) {
512
-      SERIAL_ECHO_START(); SERIAL_ECHOLNPGM("Boot media file size:", bytes_remaining);
511
+      SERIAL_ECHO_MSG("Boot media file size:", bytes_remaining);
513
       addr = get_media_file_start(slot);
512
       addr = get_media_file_start(slot);
514
       return true;
513
       return true;
515
     }
514
     }

+ 1
- 3
Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/basic/commands.cpp Прегледај датотеку

1024
   uint16_t Command_Space = mem_read_32(REG::CMDB_SPACE) & 0x0FFF;
1024
   uint16_t Command_Space = mem_read_32(REG::CMDB_SPACE) & 0x0FFF;
1025
   if (Command_Space < (len + padding)) {
1025
   if (Command_Space < (len + padding)) {
1026
     #if ENABLED(TOUCH_UI_DEBUG)
1026
     #if ENABLED(TOUCH_UI_DEBUG)
1027
-      SERIAL_ECHO_START();
1028
-      SERIAL_ECHOPGM("Waiting for ", len + padding);
1029
-      SERIAL_ECHOLNPGM(" bytes in command queue, now free: ", Command_Space);
1027
+      SERIAL_ECHO_MSG("Waiting for ", len + padding, " bytes in command queue, now free: ", Command_Space);
1030
     #endif
1028
     #endif
1031
     do {
1029
     do {
1032
       Command_Space = mem_read_32(REG::CMDB_SPACE) & 0x0FFF;
1030
       Command_Space = mem_read_32(REG::CMDB_SPACE) & 0x0FFF;

+ 6
- 12
Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_lib/extended/dl_cache.cpp Прегледај датотеку

131
   if (dl_size > dl_slot_size) {
131
   if (dl_size > dl_slot_size) {
132
     // Not enough memory to cache the display list.
132
     // Not enough memory to cache the display list.
133
     #if ENABLED(TOUCH_UI_DEBUG)
133
     #if ENABLED(TOUCH_UI_DEBUG)
134
-      SERIAL_ECHO_START();
135
-      SERIAL_ECHOPGM  ("Not enough space in GRAM to cache display list, free space: ", dl_slot_size);
136
-      SERIAL_ECHOLNPGM(" Required: ", dl_size);
134
+      SERIAL_ECHO_MSG("Not enough space in GRAM to cache display list, free space: ", dl_slot_size, " Required: ", dl_size);
137
     #endif
135
     #endif
138
     dl_slot_used = 0;
136
     dl_slot_used = 0;
139
     save_slot();
137
     save_slot();
141
   }
139
   }
142
   else {
140
   else {
143
     #if ENABLED(TOUCH_UI_DEBUG)
141
     #if ENABLED(TOUCH_UI_DEBUG)
144
-      SERIAL_ECHO_START();
145
-      SERIAL_ECHOPGM  ("Saving DL to RAMG cache, bytes: ", dl_slot_used);
146
-      SERIAL_ECHOLNPGM(" Free space: ", dl_slot_size);
142
+      SERIAL_ECHO_MSG("Saving DL to RAMG cache, bytes: ", dl_slot_used, " Free space: ", dl_slot_size);
147
     #endif
143
     #endif
148
     dl_slot_used = dl_size;
144
     dl_slot_used = dl_size;
149
     save_slot();
145
     save_slot();
160
 }
156
 }
161
 
157
 
162
 void DLCache::load_slot(uint8_t indx, uint32_t &addr, uint16_t &size, uint16_t &used) {
158
 void DLCache::load_slot(uint8_t indx, uint32_t &addr, uint16_t &size, uint16_t &used) {
163
-  addr  = CLCD::mem_read_32(DL_CACHE_START + indx * 12 + 0);
164
-  size  = CLCD::mem_read_32(DL_CACHE_START + indx * 12 + 4);
165
-  used  = CLCD::mem_read_32(DL_CACHE_START + indx * 12 + 8);
159
+  addr = CLCD::mem_read_32(DL_CACHE_START + indx * 12 + 0);
160
+  size = CLCD::mem_read_32(DL_CACHE_START + indx * 12 + 4);
161
+  used = CLCD::mem_read_32(DL_CACHE_START + indx * 12 + 8);
166
 }
162
 }
167
 
163
 
168
 void DLCache::append() {
164
 void DLCache::append() {
171
   #if ENABLED(TOUCH_UI_DEBUG)
167
   #if ENABLED(TOUCH_UI_DEBUG)
172
     cmd.execute();
168
     cmd.execute();
173
     wait_until_idle();
169
     wait_until_idle();
174
-    SERIAL_ECHO_START();
175
-    SERIAL_ECHOPGM  ("Appending to DL from RAMG cache, bytes: ", dl_slot_used);
176
-    SERIAL_ECHOLNPGM(" REG_CMD_DL: ", CLCD::mem_read_32(REG::CMD_DL));
170
+    SERIAL_ECHO_MSG("Appending to DL from RAMG cache, bytes: ", dl_slot_used, " REG_CMD_DL: ", CLCD::mem_read_32(REG::CMD_DL));
177
   #endif
171
   #endif
178
 }
172
 }
179
 
173
 

Loading…
Откажи
Сачувај