Merge pull request #19 from ELDiablO59152/dev

Version 0.1.0-alpha

.gitignore

@@ -1,2 +1,32 @@
+# Lora project
+data.csv
+info_debug.txt
+Lora/obj/*.o
+Lora/Init
+Lora/API
+Lora/Receive
+Lora/Transmit
 Setup
-Lora/obj/*
+
+# Pic project
+*.d
+*.pre
+*.p1
+*.lst
+*.sym
+*.obj
+*.o
+*.sdb
+*.obj.dmp
+*.map
+nbactions.xml
+nb-configuration.xml
+Pic/build/
+Pic/dist/
+Pic/disassembly/
+Pic/nbbuild/
+Pic/nbdist/
+Pic/nbproject/Makefile-*
+Pic/nbproject/Package-*.bash
+Pic/nbproject/private/
+Pic/funclist

Lora/Makefile

@@ -1,32 +1,42 @@
 CC:=gcc
 CFLAGS:=-Wall -Wextra
 SOURCE:=src
+SOURCE_ASCON:=src/ascon
 BUILD:=obj
 SRC:=$(wildcard $(SOURCE)/*.c)
+ASCON:=$(wildcard $(SOURCE_ASCON)/*.c)
 OBJ:=$(addprefix $(BUILD)/, $(notdir $(SRC:.c=.o)))
+OBJ_ASCON:=$(addprefix $(BUILD)/, $(notdir $(ASCON:.c=.o)))
 EXEC:=TestLora
-FINAL:=Init Receive Transmit
-BASE:=filecsv.o gpio_util.o RF_LoRa_868_SO.o sendRecept.o SX1272.o
+FINAL:=Init API Receive Transmit
+BASE:=filecsv.o gpio_util.o RF_LoRa_868_SO.o sendRecept.o SX1272.o ascon_utils.o aead.o printstate.o
+LOG:=data.csv ../Rasp/data.csv ../Rasp/info_debug.txt
 
 all: $(FINAL)
 
 $(EXEC): $(OBJ)
-	$(CC) -o $(BIN)/$@ $^ $(CFLAGS)
+	$(CC) -o $@ $^ $(CFLAGS)
 
 $(BUILD)/%.o: $(SOURCE)/%.c
 	$(CC) -o $@ -c $< $(CFLAGS)
 
-Init: $(OBJ)
+$(BUILD)/%.o: $(SOURCE_ASCON)/%.c
+	$(CC) -o $@ -c $< $(CFLAGS)
+
+Init: $(OBJ) $(OBJ_ASCON)
+	$(CC) -o $@ $(addprefix $(BUILD)/, $(BASE)) $(BUILD)/$@.o $(CFLAGS)
+
+API: $(OBJ) $(OBJ_ASCON)
 	$(CC) -o $@ $(addprefix $(BUILD)/, $(BASE)) $(BUILD)/$@.o $(CFLAGS)
 
-Receive: $(OBJ)
+Receive: $(OBJ) $(OBJ_ASCON)
 	$(CC) -o $@ $(addprefix $(BUILD)/, $(BASE)) $(BUILD)/$@.o $(CFLAGS)
 
-Transmit: $(OBJ)
+Transmit: $(OBJ) $(OBJ_ASCON)
 	$(CC) -o $@ $(addprefix $(BUILD)/, $(BASE)) $(BUILD)/$@.o $(CFLAGS)
 
 clean:
 	rm -vrf $(BUILD)/*.o
 
 cleanall: clean
-	rm -vrf $(EXEC) $(FINAL) data.csv info_debug.txt
+	rm -vrf $(EXEC) $(FINAL) $(LOG)