Compare commits

..

No commits in common. "a7c91cee0e81b0e838f3f726526ad26b2bce8391" and "47d8df052a6f6ecdb3c6e80ee9e8ce087d2edfd5" have entirely different histories.

2 changed files with 1 additions and 8 deletions

View File

@ -134,10 +134,7 @@ $(ASOBJ):
$(QUIET)$(CC) $(CFLAGS) -MMD -MT $@ $(INCLUDEPATH) $(DEFINES) -o $@ $(@:$(OBJDIR)/%.S.o=%.S) $(QUIET)$(CC) $(CFLAGS) -MMD -MT $@ $(INCLUDEPATH) $(DEFINES) -o $@ $(@:$(OBJDIR)/%.S.o=%.S)
.PHONY: qtproject-legacy qtproject qtproject-debug clean mrproper objcopy disassemble program program-debug .PHONY: qtproject-legacy qtproject qtproject-debug clean mrproper objcopy disassemble program
program-debug:
$(QUIET)$(MAKE) DEBUGBUILD=true program
program: $(target).elf program: $(target).elf
./program-device.sh $< ./program-device.sh $<

View File

@ -155,11 +155,7 @@ static void reflow_menu_about(struct lcd_menu *menu, enum menu_entry_func_entry
if (strlen(xstr(GIT_VER)) > LCD_CHAR_WIDTH) { if (strlen(xstr(GIT_VER)) > LCD_CHAR_WIDTH) {
menu_lcd_outputf(menu, 2, "%s", &xstr(GIT_VER)[LCD_CHAR_WIDTH]); menu_lcd_outputf(menu, 2, "%s", &xstr(GIT_VER)[LCD_CHAR_WIDTH]);
} }
#ifdef DEBUGBUILD
menu_lcd_output(menu, 3, "Page 2/5 [DEBUG]");
#else
menu_lcd_output(menu, 3, "Page 2/5"); menu_lcd_output(menu, 3, "Page 2/5");
#endif
break; break;
case 2: case 2:
menu_lcd_output(menu, 0, "Compile Info"); menu_lcd_output(menu, 0, "Compile Info");