Compare commits
No commits in common. "04389b1df640ddc53a499df0fc2fd578734693b2" and "bd82f55966da2f8f1d9e0054b521feab1b29ecde" have entirely different histories.
04389b1df6
...
bd82f55966
@ -110,8 +110,6 @@ mrproper: clean
|
|||||||
clean:
|
clean:
|
||||||
@echo "Cleaning up derived files..."
|
@echo "Cleaning up derived files..."
|
||||||
$(QUIET)rm -f $(target).elf $(target).bin $(target).hex $(OBJ) $(ASOBJ) $(mapfile).map $(CFILES:%.c=$(OBJDIR)/%.c.d) $(ASFILES:%.S=$(OBJDIR)/%.S.d)
|
$(QUIET)rm -f $(target).elf $(target).bin $(target).hex $(OBJ) $(ASOBJ) $(mapfile).map $(CFILES:%.c=$(OBJDIR)/%.c.d) $(ASFILES:%.S=$(OBJDIR)/%.S.d)
|
||||||
$(QUIET)rm -rf $(OBJDIR)/*
|
|
||||||
|
|
||||||
qtproject:
|
qtproject:
|
||||||
echo -e "TEMPLATE = app\nCONFIG -= console app_bundle qt" > $(target).pro
|
echo -e "TEMPLATE = app\nCONFIG -= console app_bundle qt" > $(target).pro
|
||||||
echo -e "SOURCES += $(CFILES) $(ASFILES)" >> $(target).pro
|
echo -e "SOURCES += $(CFILES) $(ASFILES)" >> $(target).pro
|
||||||
|
@ -26,7 +26,6 @@
|
|||||||
#include <stdlib.h>
|
#include <stdlib.h>
|
||||||
#include <stdio.h>
|
#include <stdio.h>
|
||||||
#include <string.h>
|
#include <string.h>
|
||||||
#include <inttypes.h>
|
|
||||||
/* #include <arm_math.h> */
|
/* #include <arm_math.h> */
|
||||||
#include <stm32/stm32f4xx.h>
|
#include <stm32/stm32f4xx.h>
|
||||||
#include <cmsis/core_cm4.h>
|
#include <cmsis/core_cm4.h>
|
||||||
@ -217,7 +216,7 @@ int main()
|
|||||||
|
|
||||||
|
|
||||||
rot = rotary_encoder_get_abs_val();
|
rot = rotary_encoder_get_abs_val();
|
||||||
snprintf(&disp[0][0], 21U, "Rot-Enc: %" PRIu32, rot);
|
snprintf(&disp[0][0], 21U, "Rot-Enc: %u", rot);
|
||||||
strcpy(&disp[1][0], "Line 2");
|
strcpy(&disp[1][0], "Line 2");
|
||||||
strcpy(&disp[3][0], "Shimatta Reflow");
|
strcpy(&disp[3][0], "Shimatta Reflow");
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user