• R/O
  • SSH
  • HTTPS

chibios: Commit


Commit MetaInfo

Revision14338 (tree)
Time2021-04-30 22:44:34
Authorgdisirio

Log Message

Added support for extra fields in timers, added filler coloumns in tables.

Change Summary

Incremental Difference

--- branches/chibistudio_trunk/tools/chibios-rt7_debug_support/src/org/chibios/tools/eclipse/debug/utils/KernelObjects.java (revision 14337)
+++ branches/chibistudio_trunk/tools/chibios-rt7_debug_support/src/org/chibios/tools/eclipse/debug/utils/KernelObjects.java (revision 14338)
@@ -358,6 +358,20 @@
358358 n = evaluateExpressionNumber("(uint32_t)((struct ch_virtual_timer *)" + current + ")->par");
359359 map.put("par", Long.toString(n));
360360
361+ try {
362+ n = evaluateExpressionNumber("(uint32_t)((struct ch_virtual_timer *)" + current + ")->last");
363+ map.put("last", Long.toString(n));
364+ } catch (DebugProxyException e) {
365+ map.put("last", "-");
366+ }
367+
368+ try {
369+ n = evaluateExpressionNumber("(uint32_t)((struct ch_virtual_timer *)" + current + ")->reload");
370+ map.put("reload", Long.toString(n));
371+ } catch (DebugProxyException e) {
372+ map.put("reload", "-");
373+ }
374+
361375 // Inserting the new thread map into the threads list.
362376 lhm.put(current, map);
363377
--- branches/chibistudio_trunk/tools/chibios-rt7_debug_support/src/org/chibios/tools/eclipse/debug/views/ChibiView.java (revision 14337)
+++ branches/chibistudio_trunk/tools/chibios-rt7_debug_support/src/org/chibios/tools/eclipse/debug/views/ChibiView.java (revision 14338)
@@ -169,6 +169,10 @@
169169 tblclmnGlobalVariableValue.setWidth(300);
170170 tblclmnGlobalVariableValue.setText("Value");
171171
172+ TableColumn tblclmnGlobalVariableFiller = new TableColumn(globalTable, SWT.FILL);
173+ tblclmnGlobalVariableFiller.setWidth(1);
174+ tblclmnGlobalVariableFiller.setText("");
175+
172176 tbtmThreads = new CTabItem(tabFolder, SWT.NONE);
173177 tbtmThreads.setText("Threads");
174178
@@ -234,6 +238,10 @@
234238 tblclmnThreadCumulativeTime.setWidth(192);
235239 tblclmnThreadCumulativeTime.setText("Cumulative Time");
236240
241+ TableColumn tblclmnThreadFiller = new TableColumn(threadsTable, SWT.FILL);
242+ tblclmnThreadFiller.setWidth(1);
243+ tblclmnThreadFiller.setText("");
244+
237245 tbtmTimers = new CTabItem(tabFolder, SWT.NONE);
238246 tbtmTimers.setText("Timers");
239247
@@ -263,6 +271,18 @@
263271 tblclmnTimerParameter.setWidth(72);
264272 tblclmnTimerParameter.setText("Param");
265273
274+ TableColumn tblclmnTimerLastDeadline = new TableColumn(timersTable, SWT.RIGHT);
275+ tblclmnTimerLastDeadline.setWidth(100);
276+ tblclmnTimerLastDeadline.setText("Last Deadline");
277+
278+ TableColumn tblclmnTimerReload = new TableColumn(timersTable, SWT.RIGHT);
279+ tblclmnTimerReload.setWidth(100);
280+ tblclmnTimerReload.setText("Reload");
281+
282+ TableColumn tblclmnTimerFiller = new TableColumn(timersTable, SWT.FILL);
283+ tblclmnTimerFiller.setWidth(1);
284+ tblclmnTimerFiller.setText("");
285+
266286 tbtmTraceBuffer = new CTabItem(tabFolder, SWT.NONE);
267287 tbtmTraceBuffer.setText("TraceBuffer");
268288
@@ -315,7 +335,11 @@
315335 TableColumn tblclmnTraceBufferCurrentName = new TableColumn(tbTable, SWT.LEFT);
316336 tblclmnTraceBufferCurrentName.setWidth(144);
317337 tblclmnTraceBufferCurrentName.setText("Name");
318-
338+
339+ TableColumn tblclmnTraceBufferFiller = new TableColumn(tbTable, SWT.FILL);
340+ tblclmnTraceBufferFiller.setWidth(1);
341+ tblclmnTraceBufferFiller.setText("");
342+
319343 tbtmStatistics = new CTabItem(tabFolder, SWT.NONE);
320344 tbtmStatistics.setText("Statistics");
321345
@@ -348,6 +372,10 @@
348372 tblclmnStatsCumulative.setWidth(192);
349373 tblclmnStatsCumulative.setText("Cumulative Time");
350374
375+ TableColumn tblclmnStatsFiller = new TableColumn(statisticsTable, SWT.FILL);
376+ tblclmnStatsFiller.setWidth(1);
377+ tblclmnStatsFiller.setText("");
378+
351379 makeActions();
352380 hookContextMenu();
353381 contributeToActionBars();
@@ -499,7 +527,9 @@
499527 Long.toString(time),
500528 "+" + HexUtils.parseNumber(map.get("delta")),
501529 makeHex(map.get("func")),
502- makeHex(map.get("par"))
530+ makeHex(map.get("par")),
531+ map.get("last"),
532+ map.get("reload")
503533 });
504534 }
505535 }
Show on old repository browser