Merge 'upstream/master' - At least it builds...

firmware/application/ui_debug.cpp

@@ -35,7 +35,7 @@ namespace ui {
 /* DebugMemoryView *******************************************************/
 
 DebugMemoryView::DebugMemoryView(NavigationView& nav) {
-	add_children({ {
+	add_children({
 		&text_title,
 		&text_label_m0_core_free,
 		&text_label_m0_core_free_value,
@@ -44,7 +44,7 @@ DebugMemoryView::DebugMemoryView(NavigationView& nav) {
 		&text_label_m0_heap_fragments,
 		&text_label_m0_heap_fragments_value,
 		&button_done
-	} });
+	});
 
 	const auto m0_core_free = chCoreStatus();
 	text_label_m0_core_free_value.set(to_string_dec_uint(m0_core_free, 5));
@@ -135,11 +135,11 @@ Coord TemperatureWidget::screen_y(
 /* TemperatureView *******************************************************/
 
 TemperatureView::TemperatureView(NavigationView& nav) {
-	add_children({ {
+	add_children({
 		&text_title,
 		&temperature_widget,
 		&button_done,
-	} });
+	});
 
 	button_done.on_select = [&nav](Button&){ nav.pop(); };
 }
@@ -164,7 +164,7 @@ void RegistersWidget::update() {
 }
 
 void RegistersWidget::paint(Painter& painter) {
-	const Coord left = (size().w - config.row_width()) / 2;
+	const Coord left = (size().width() - config.row_width()) / 2;
 
 	draw_legend(left, painter);
 	draw_values(left, painter);
@@ -219,12 +219,12 @@ RegistersView::RegistersView(
 	std::function<uint32_t(const size_t register_number)>&& reader
 ) : registers_widget { std::move(config), std::move(reader) }
 {
-	add_children({ {
+	add_children({
 		&text_title,
 		&registers_widget,
 		&button_update,
 		&button_done,
-	} });
+	});
 
 	button_update.on_select = [this](Button&){
 		this->registers_widget.update();
@@ -285,10 +285,10 @@ DebugLCRView::DebugLCRView(NavigationView& nav, std::string lcr_string, uint8_t
 	
 	std::string debug_text;
 	
-	add_children({ {
+	add_children({
 		&console,
 		&button_exit
-	} });
+	});
 
 	for(const auto c : lcr_string) {
 		if ((c < 32) || (c > 126))