diff --git a/Makefile b/Makefile index 1f077f7..53fa546 100644 --- a/Makefile +++ b/Makefile @@ -78,7 +78,7 @@ DRIVER_PATH = Drivers/STM32F0xx_HAL_Driver INCLUDES = -I$(CMSIS_PATH)/Include INCLUDES += -I$(CMSIS_DEVICE_PATH)/Include INCLUDES += -I$(DRIVER_PATH)/Inc -INCLUDES += -IInc +INCLUDES += -Iinc INCLUDES += $(USB_INCLUDES) INCLUDES += $(USER_INCLUDES) @@ -166,10 +166,10 @@ $(BUILD_DIR)/$(TARGET).elf: $(OBJECTS) $(USB_OBJECTS) $(CUBELIB) -Map=$(BUILD_DIR)/$(TARGET).map $(SIZE) $@ -$(BUILD_DIR)/%.o: Src/%.c | $(BUILD_DIR) +$(BUILD_DIR)/%.o: src/%.c | $(BUILD_DIR) $(CC) $(CFLAGS) -Os -c -o $@ $^ -$(BUILD_DIR)/%.o: Src/%.s | $(BUILD_DIR) +$(BUILD_DIR)/%.o: src/%.s | $(BUILD_DIR) $(CC) $(CFLAGS) -c -o $@ $^ $(BUILD_DIR): diff --git a/Inc/can.h b/inc/can.h similarity index 100% rename from Inc/can.h rename to inc/can.h diff --git a/Inc/interrupts.h b/inc/interrupts.h similarity index 100% rename from Inc/interrupts.h rename to inc/interrupts.h diff --git a/Inc/led.h b/inc/led.h similarity index 100% rename from Inc/led.h rename to inc/led.h diff --git a/Inc/slcan.h b/inc/slcan.h similarity index 62% rename from Inc/slcan.h rename to inc/slcan.h index 5066824..c3195bc 100644 --- a/Inc/slcan.h +++ b/inc/slcan.h @@ -4,8 +4,8 @@ int8_t slcan_parse_frame(uint8_t *buf, CanRxMsgTypeDef *frame); int8_t slcan_parse_str(uint8_t *buf, uint8_t len); -/* maximum rx buffer len: extended CAN frame with timestamp */ -#define SLCAN_MTU 30// (sizeof("T1111222281122334455667788EA5F\r")+1) +// maximum rx buffer len: extended CAN frame with timestamp +#define SLCAN_MTU 30 // (sizeof("T1111222281122334455667788EA5F\r")+1) #define SLCAN_STD_ID_LEN 3 #define SLCAN_EXT_ID_LEN 8 diff --git a/Inc/stm32f0xx_hal_conf.h b/inc/stm32f0xx_hal_conf.h similarity index 100% rename from Inc/stm32f0xx_hal_conf.h rename to inc/stm32f0xx_hal_conf.h diff --git a/Inc/system.h b/inc/system.h similarity index 100% rename from Inc/system.h rename to inc/system.h diff --git a/Inc/usb_device.h b/inc/usb_device.h similarity index 100% rename from Inc/usb_device.h rename to inc/usb_device.h diff --git a/Inc/usbd_cdc_if.h b/inc/usbd_cdc_if.h similarity index 100% rename from Inc/usbd_cdc_if.h rename to inc/usbd_cdc_if.h diff --git a/Inc/usbd_conf.h b/inc/usbd_conf.h similarity index 100% rename from Inc/usbd_conf.h rename to inc/usbd_conf.h diff --git a/Inc/usbd_desc.h b/inc/usbd_desc.h similarity index 100% rename from Inc/usbd_desc.h rename to inc/usbd_desc.h diff --git a/Src/can.c b/src/can.c similarity index 100% rename from Src/can.c rename to src/can.c diff --git a/Src/interrupts.c b/src/interrupts.c similarity index 100% rename from Src/interrupts.c rename to src/interrupts.c diff --git a/Src/led.c b/src/led.c similarity index 100% rename from Src/led.c rename to src/led.c diff --git a/Src/main.c b/src/main.c similarity index 100% rename from Src/main.c rename to src/main.c diff --git a/Src/slcan.c b/src/slcan.c similarity index 100% rename from Src/slcan.c rename to src/slcan.c diff --git a/Src/startup_stm32f042x6.s b/src/startup_stm32f042x6.s similarity index 100% rename from Src/startup_stm32f042x6.s rename to src/startup_stm32f042x6.s diff --git a/Src/system.c b/src/system.c similarity index 100% rename from Src/system.c rename to src/system.c diff --git a/Src/system_stm32f0xx.c b/src/system_stm32f0xx.c similarity index 100% rename from Src/system_stm32f0xx.c rename to src/system_stm32f0xx.c diff --git a/Src/usb_device.c b/src/usb_device.c similarity index 100% rename from Src/usb_device.c rename to src/usb_device.c diff --git a/Src/usbd_cdc_if.c b/src/usbd_cdc_if.c similarity index 100% rename from Src/usbd_cdc_if.c rename to src/usbd_cdc_if.c diff --git a/Src/usbd_conf.c b/src/usbd_conf.c similarity index 100% rename from Src/usbd_conf.c rename to src/usbd_conf.c diff --git a/Src/usbd_desc.c b/src/usbd_desc.c similarity index 100% rename from Src/usbd_desc.c rename to src/usbd_desc.c