Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Version 0.1.0-alpha #19

Merged
merged 36 commits into from
Jun 3, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
36 commits
Select commit Hold shift + click to select a range
beb4068
CRYPTO::ADD:Starting dev of diffiehellman
ELDiablO59152 Feb 27, 2023
db9e3f4
GPIO::FIX:Handling errors related to port opening
ELDiablO59152 Mar 1, 2023
aa66dff
THREAD::DELETE:Replace the LoRa thread by a permanent subprocess
ELDiablO59152 Mar 1, 2023
55a6653
THREAD::DELETE:Stdout is now unbuffered. Python can read it normally
ELDiablO59152 Mar 2, 2023
34c8469
Merge pull request #9 from ELDiablO59152/destroy_thread
ELDiablO59152 Mar 2, 2023
c9aed6d
Merge pull request #10 from ELDiablO59152/diffie_hellman
ELDiablO59152 Mar 2, 2023
77dc5b0
STRUCTURE::CHANGE: code refactoring
ELDiablO59152 May 17, 2023
14336d3
feat(routingTable): ajout de la creation table de routage statique
PizzISEN May 19, 2023
b1429f1
correction pr routingTable
devtools42 May 19, 2023
589aca6
add -h and --Help
devtools42 May 19, 2023
84b84e3
modification match car version raspberry pi <=3.9.2
devtools42 May 19, 2023
b337485
ajout du status
devtools42 May 22, 2023
f704774
correction
devtools42 May 22, 2023
e3cfb51
upgrade
devtools42 May 22, 2023
6fbca95
Merge pull request #11 from ELDiablO59152/routingTable
devtools42 May 22, 2023
fcb10d0
Repeteur ISEN
sasah6659 May 22, 2023
9ce6ae0
indentation + rename fichier
sasah6659 May 22, 2023
2526051
Refacto + mis à jour config LoRa + correction fonction ping
sasah6659 May 22, 2023
0ca4965
Refacto
sasah6659 May 22, 2023
1251b0b
commentaires
sasah6659 May 22, 2023
887be02
refacto 2
sasah6659 May 22, 2023
7e01ae8
GITIGNORE::CHANGE: delete mplab build files
ELDiablO59152 May 23, 2023
77b3843
Merge pull request #13 from ELDiablO59152/repeteur_isen
ELDiablO59152 May 23, 2023
e9f5ba4
feat(routingTable): integration of routingTable in the transmit process
PizzISEN May 23, 2023
3b3f75c
Encryption of data in Transmit.c and Decryption in Receive.c using as…
Alexandre-Prz May 24, 2023
3f37d9a
parameter rangePower
devtools42 May 24, 2023
6bda01e
delete
devtools42 May 24, 2023
fb6474f
Merge branch 'dev' of https://github.com/ELDiablO59152/Zigbee-LoRa-In…
Alexandre-Prz May 25, 2023
8f94a07
ENCRYPTION::CHANGE: fixes
ELDiablO59152 May 25, 2023
cd7d34a
Merge pull request #17 from ELDiablO59152/Chiffrement_ASCON
ELDiablO59152 May 25, 2023
b7db94f
Merge pull request #15 from ELDiablO59152/routingUpdate
ELDiablO59152 May 26, 2023
df371a8
API::ADD: new API to pilot the LoRa module (#18)
ELDiablO59152 Jun 2, 2023
0493311
Merge remote-tracking branch 'origin/dev' into RT_Integration
ELDiablO59152 Jun 3, 2023
c25c3af
ROUTING::ADD: update routing table
ELDiablO59152 Jun 3, 2023
48eb698
ROUTING::ADD: lookup routing table for LoRa communications (#16)
ELDiablO59152 Jun 3, 2023
b2eb428
REPEATER::CHANGE: frequency set to 868Mhz
ELDiablO59152 Jun 3, 2023
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 31 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -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
24 changes: 17 additions & 7 deletions Lora/Makefile
Original file line number Diff line number Diff line change
@@ -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)/[email protected] $(CFLAGS)

API: $(OBJ) $(OBJ_ASCON)
$(CC) -o $@ $(addprefix $(BUILD)/, $(BASE)) $(BUILD)/[email protected] $(CFLAGS)

Receive: $(OBJ)
Receive: $(OBJ) $(OBJ_ASCON)
$(CC) -o $@ $(addprefix $(BUILD)/, $(BASE)) $(BUILD)/[email protected] $(CFLAGS)

Transmit: $(OBJ)
Transmit: $(OBJ) $(OBJ_ASCON)
$(CC) -o $@ $(addprefix $(BUILD)/, $(BASE)) $(BUILD)/[email protected] $(CFLAGS)

clean:
rm -vrf $(BUILD)/*.o

cleanall: clean
rm -vrf $(EXEC) $(FINAL) data.csv info_debug.txt
rm -vrf $(EXEC) $(FINAL) $(LOG)
Empty file added Lora/obj/.gitkeep
Empty file.
Loading