azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix build, small proto tweak.

Browse Source
This commit is contained in:
Kotlin Developer
2016-07-03 18:02:52 +00:00
parent 7d8124ae52
commit 25e5b8ed3b
2 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
car_fmw/Makefile
+4 -1
View File
@@ -42,9 +42,12 @@ $(CAR_FMW_ELF): $(CAR_FMW_OBJ) $(LIB_STM32F4D_OBJ) \
$(LIB_CMSIS_OBJ) $(LIB_STDPERIPH_OBJ) $(LIB_CMSIS_OBJ) $(LIB_STDPERIPH_OBJ)
$(CC) $(CFLAGS) $^ -T $(SRC_DIR)/stm32_flash.ld -o $@ $(CC) $(CFLAGS) $^ -T $(SRC_DIR)/stm32_flash.ld -o $@
$(CAR_FMW_OBJ): $(call dircs_to_prefxd_objs,$(SRC_DIR)) $(CAR_FMW_OBJ): $(BIN_DIR) $(call dircs_to_prefxd_objs,$(SRC_DIR))
$(LD_ALL_DEPS) $(LD_ALL_DEPS)
$(BIN_DIR):
mkdir -p $(BIN_DIR)
$(BIN_DIR)/%.o: $(SRC_DIR)/%.c $(BIN_DIR)/%.o: $(SRC_DIR)/%.c
$(CC_ALL_DEPS) $(CC_ALL_DEPS)
proto/carkot.proto
+4 -1
View File
@@ -2,6 +2,7 @@ message Upload {
message Method { message Method {
enum TYPE { enum TYPE {
DFU = 1; DFU = 1;
STLINK = 2;
} }
// Type of upload method. // Type of upload method.
optional TYPE type = 1; optional TYPE type = 1;
@@ -14,8 +15,10 @@ message Upload {
} }
// Firmware data. // Firmware data.
optional bytes data = 1; optional bytes data = 1;
// Firmware load address (string, to avoid 64-bit woes).
optional string base = 2;
// Method of firmware upload. // Method of firmware upload.
optional Method method = 2; optional Method method = 3;
} }
message UploadResult { message UploadResult {