Update Makefiles and rename folders and code filenames

Makefile

@@ -2,19 +2,28 @@
 default: all-emulator
 
 all-emulator:
-	$(MAKE) emulator -C rv
+	$(MAKE) emulator -C rv-asm
 	$(MAKE) emulator -C tic-tac-toe
 	$(MAKE) emulator -C paint-cursor
 	$(MAKE) emulator -C movingnum
-	$(MAKE) emulator -C paint-exe
+	$(MAKE) emulator -C paint
 
 all-riscv:
-	$(MAKE) -C rv
+	$(MAKE) -C rv-asm
 	$(MAKE) -C tic-tac-toe
 	$(MAKE) -C paint-cursor
 	$(MAKE) -C i2c-comm
 	$(MAKE) -C movingnum
-	$(MAKE) -C paint-exe
+	$(MAKE) -C paint
 	$(MAKE) -C testing
 
-.PHONY: all-emulator all-riscv
+clean:
+	$(MAKE) -C rv-asm clean
+	$(MAKE) -C tic-tac-toe clean
+	$(MAKE) -C paint-cursor clean
+	$(MAKE) -C i2c-comm clean
+	$(MAKE) -C movingnum clean
+	$(MAKE) -C paint clean
+	$(MAKE) -C testing clean
+
+.PHONY: all-emulator all-riscv clean

README.md

@@ -39,10 +39,10 @@ Projects:
     * PD2: SW (Analog to Digital PIN)
     * PC6: IN (WS2812B Data PIN)
 
-* `paint-exe`
-  * Paint on `InspireMatrix`
+* `paint`
+  * Paint on `InspireMatrix`.
 
-* `rv`
+* `rv-asm`
   * Coding RISC-V Compressed instructions on a board with buttons, and showing the result on the matrix.
   * Originally from <https://github.com/brian-smith-github/rv>
 

i2c-comm/Makefile

@@ -1,3 +1,8 @@
-TARGET:=i2c
+TARGET:=i2c-comm
 
 include ../ch32v003fun/ch32v003fun.mk
+clean:
+	rm -f $(TARGET).elf $(TARGET).hex $(TARGET).bin $(TARGET).map $(TARGET).lst \
+		$(TARGET).o $(TARGET).d $(TARGET).srec $(TARGET).sym $(TARGET).lss
+
+.PHONY: clean

movingnum/Makefile

@@ -1,7 +1,8 @@
-TARGET:= nums
+TARGET:= movingnum
 include ../ch32v003fun/ch32v003fun.mk
 clean:
-	rm -f $(TARGET).elf $(TARGET).hex $(TARGET).bin $(TARGET).map $(TARGET).lst $(TARGET).o $(TARGET).d $(TARGET).srec $(TARGET).sym $(TARGET).lss
+	rm -f $(TARGET).elf $(TARGET).hex $(TARGET).bin $(TARGET).map $(TARGET).lst \
+		$(TARGET).o $(TARGET).d $(TARGET).srec $(TARGET).sym $(TARGET).lss
 	$(MAKE) -f Makefile-emulator clean
 
 emulator:

movingnum/Makefile-emulator

@@ -1,4 +1,4 @@
-# cl -MD -GL -D_HAS_EXCEPTIONS=0 -GR- -O1 -Oy- -W4 -sdl -I../emulator/ -I../data nums.c user32.lib
+# cl -MD -GL -D_HAS_EXCEPTIONS=0 -GR- -O1 -Oy- -W4 -sdl -I../emulator/ -I../data movingnum.c user32.lib
 CC=gcc
 INCLUDES=-I../emulator -I../data -I.
 CFLAGS=-g -Wall -Wextra -Wshadow -Wswitch -Wfloat-equal $(INCLUDES)
@@ -9,8 +9,8 @@ ifeq ($(UNAME_S), Darwin)
     LDFLAGS += -framework CoreFoundation -framework ApplicationServices -pthread
 endif
 
-SRCS=nums.c
-TARGET=nums
+SRCS=movingnum.c
+TARGET=movingnum
 
 SRCS += $(wildcard ../emulator/*.c)
 ifneq ($(UNAME_S), Darwin)

paint-cursor/Makefile

@@ -1,7 +1,8 @@
 TARGET:= paint-cursor
 include ../ch32v003fun/ch32v003fun.mk
 clean:
-	rm -f $(TARGET).elf $(TARGET).hex $(TARGET).bin $(TARGET).map $(TARGET).lst $(TARGET).o $(TARGET).d $(TARGET).srec $(TARGET).sym $(TARGET).lss
+	rm -f $(TARGET).elf $(TARGET).hex $(TARGET).bin $(TARGET).map $(TARGET).lst \
+		$(TARGET).o $(TARGET).d $(TARGET).srec $(TARGET).sym $(TARGET).lss
 	$(MAKE) -f Makefile-emulator clean
 
 emulator:

paint-cursor/README.md

@@ -1,6 +1,7 @@
 # paint-cursor
 
 ## Description
-`paint-cursor.c`:
-    * Draw images on InspireMatrix with direction buttons and matrix buttons
-    * Color is hard-coded in the following, change the value in ```paint-cursor.c``` for different colors
+
+* `paint-cursor.c`:
+  * Draw images on InspireMatrix with direction buttons and matrix buttons
+  * Color is hard-coded in the following, change the value in ```paint-cursor.c``` for different colors

paint-exe/Makefile → paint/Makefile

@@ -1,7 +1,8 @@
 TARGET:= paint
 include ../ch32v003fun/ch32v003fun.mk
 clean:
-	rm -f $(TARGET).elf $(TARGET).hex $(TARGET).bin $(TARGET).map $(TARGET).lst $(TARGET).o $(TARGET).d $(TARGET).srec $(TARGET).sym $(TARGET).lss
+	rm -f $(TARGET).elf $(TARGET).hex $(TARGET).bin $(TARGET).map $(TARGET).lst \
+		$(TARGET).o $(TARGET).d $(TARGET).srec $(TARGET).sym $(TARGET).lss
 	$(MAKE) -f Makefile-emulator clean
 
 emulator:

rv/Makefile → rv-asm/Makefile

@@ -1,8 +1,9 @@
-TARGET:=asm
+TARGET:=rv-asm
 ADDITIONAL_C_FILES:= rv.c
 include ../ch32v003fun/ch32v003fun.mk
 clean:
-	rm -f $(TARGET).elf $(TARGET).hex $(TARGET).bin $(TARGET).map $(TARGET).lst $(TARGET).o $(TARGET).d $(TARGET).srec $(TARGET).sym $(TARGET).lss
+	rm -f $(TARGET).elf $(TARGET).hex $(TARGET).bin $(TARGET).map $(TARGET).lst \
+		$(TARGET).o $(TARGET).d $(TARGET).srec $(TARGET).sym $(TARGET).lss
 	$(MAKE) -f Makefile-emulator clean
 
 emulator:

rv/Makefile-emulator → rv-asm/Makefile-emulator

@@ -8,8 +8,8 @@ ifeq ($(UNAME_S), Darwin)
     LDFLAGS += -framework CoreFoundation -framework ApplicationServices -pthread
 endif
 
-SRCS=asm.c rv.c
-TARGET=asm
+SRCS=rv-asm.c rv.c
+TARGET=rv-asm
 
 SRCS += $(wildcard ../emulator/*.c)
 ifneq ($(UNAME_S), Darwin)

rv-dis/Makefile

@@ -1,8 +1,9 @@
-TARGET:=t2
+TARGET:=rv-dis
 ADDITIONAL_C_FILES:=riscv-disas.c
 include ../ch32v003fun/ch32v003fun.mk
 clean:
-	rm -f $(TARGET).elf $(TARGET).hex $(TARGET).bin $(TARGET).map $(TARGET).lst $(TARGET).o $(TARGET).d $(TARGET).srec $(TARGET).sym $(TARGET).lss
+	rm -f $(TARGET).elf $(TARGET).hex $(TARGET).bin $(TARGET).map $(TARGET).lst \
+		$(TARGET).o $(TARGET).d $(TARGET).srec $(TARGET).sym $(TARGET).lss
 	$(MAKE) -f Makefile-emulator clean
 
 emulator:

rv-dis/README.md

@@ -1,10 +1,3 @@
 # RISC-V Disassembler
 
 RISC-V Disassembler with support for RV32/RV64/RV128 IMAFDC
-
-## Build instructions
-
-```bash
-cmake -B build
-cmake --build build
-```

rv-dis/t2.c → rv-dis/rv-dis.c

@@ -1,3 +1,7 @@
+/**
+ * Originally from `t2.c`.
+*/
+
 #include <stdio.h>
 
 #include "riscv-disas.h"

testing/Makefile

@@ -1,11 +1,12 @@
-TARGET:= testing
+TARGET:=testing
 include ../ch32v003fun/ch32v003fun.mk
 clean:
-	rm -f $(TARGET).elf $(TARGET).hex $(TARGET).bin $(TARGET).map $(TARGET).lst $(TARGET).o $(TARGET).d $(TARGET).srec $(TARGET).sym $(TARGET).lss
+	rm -f $(TARGET).elf $(TARGET).hex $(TARGET).bin $(TARGET).map $(TARGET).lst \
+		$(TARGET).o $(TARGET).d $(TARGET).srec $(TARGET).sym $(TARGET).lss
 	$(MAKE) -f Makefile-emulator clean
 
 emulator:
 	$(MAKE) -f Makefile-emulator clean
 	$(MAKE) -f Makefile-emulator 
 
-.PHONY: emulator
+.PHONY: emulator clean

tic-tac-toe/Makefile

@@ -1,7 +1,8 @@
 TARGET:= tic-tac-toe
 include ../ch32v003fun/ch32v003fun.mk
 clean:
-	rm -f $(TARGET).elf $(TARGET).hex $(TARGET).bin $(TARGET).map $(TARGET).lst $(TARGET).o $(TARGET).d $(TARGET).srec $(TARGET).sym $(TARGET).lss
+	rm -f $(TARGET).elf $(TARGET).hex $(TARGET).bin $(TARGET).map $(TARGET).lst \
+		$(TARGET).o $(TARGET).d $(TARGET).srec $(TARGET).sym $(TARGET).lss
 	$(MAKE) -f Makefile-emulator clean
 
 emulator: