From 161a66dc74d65c1e4d854db3653119870dc01bbb Mon Sep 17 00:00:00 2001
From: Nick Art <nicoltri@student.ethz.ch>
Date: Mon, 18 Nov 2024 11:29:47 -0500
Subject: [PATCH] Bug Fix

Fixed a small type in networking
---
 software/.DS_Store                            | Bin 8196 -> 8196 bytes
 .../applications/githubfiledownload/.DS_Store | Bin 0 -> 6148 bytes
 software/networking/config.py                 |   3 ++-
 software/networking/networking.py             |  10 +++++-----
 4 files changed, 7 insertions(+), 6 deletions(-)
 create mode 100644 software/applications/githubfiledownload/.DS_Store

diff --git a/software/.DS_Store b/software/.DS_Store
index 7c80ef500923e005e991677316a58a5b1d3009fe..c350374846938b1dd54952fe41470aaf102a279a 100644
GIT binary patch
delta 36
qcmZp1XmOa}&nUGqU^hRb)MP(Fnavsk@oXE*8W=aTOEdr(wTuAPm<wzG

delta 318
zcmZp1XmOa}&nUk!U^hRb{A52tnavsk@ob!|3?&TtK$tUGO+c|8&SNOfNjD5m&d)7i
z0E3USffSN#ZoZ34QcivnP?RJ1pcSKW*fB?R6)6N%6l5UTz!(73KC$HbW_F2&LFcL~
E0K+m%yZ`_I

diff --git a/software/applications/githubfiledownload/.DS_Store b/software/applications/githubfiledownload/.DS_Store
new file mode 100644
index 0000000000000000000000000000000000000000..d916576a17a5ea6404397e56ce535d5bf46ff39b
GIT binary patch
literal 6148
zcmeHKJxjz;5S-O34lKOV^8JDX|3N&?!rDKe=P3xm*ofGr^JnYqhhhkVHWo4iyYt>=
zH!qnYn+0H-r~N6g0<fex<JH|9e%)<`gNhiL#(V5B;296-$v=bF9^(%8tht@kUvsy{
zBVI20;bzwlJ7)T0p3&BC0j>loAO)m=6p#W^;CBjm?<JN;$?{S_3P^!Z1^oNaXwF^n
zm>i!Dx)=e-3x)$+$1Fi^9w2wcV=^OzWhpsJtws#Xa>iTbb;V<Hmc!y?-ltBsnoulG
zXS_u^tV@=c0#abAz+rAz-v7^O-^~BhBJHGr6!=#P*kXIR-SCyFx6WS9du^j#(LTW3
oNT-WdOpaE}jkn^HFL}+^yxtX$$x+UDl#}%%;JOG>;4c(-2SRKe9{>OV

literal 0
HcmV?d00001

diff --git a/software/networking/config.py b/software/networking/config.py
index bea81a4..e24e13b 100644
--- a/software/networking/config.py
+++ b/software/networking/config.py
@@ -1,3 +1,4 @@
 mysecrets = {"SSID": "Tufts_Robot", "key" : ""}
 codes = {"0": b'PairingCodePhrase', "1": b'PairingResponsePhrase', "2": b'PairingConfirmationPhrase'}
-configname = "Nickname"
\ No newline at end of file
+configname = "Nickname"
+config = ""
\ No newline at end of file
diff --git a/software/networking/networking.py b/software/networking/networking.py
index 2f53337..39e86fe 100644
--- a/software/networking/networking.py
+++ b/software/networking/networking.py
@@ -792,16 +792,16 @@ def __handle_ack(sender_mac, subtype, stimestamp, rtimestamp, payload_type, payl
                 elif subtype == b'\x15': #Echo
                     self.master._iprint(f"Echo received from {sender_mac} ({self.peer_name(sender_mac)}), {__decode_payload(payload_type, payload)}")
                 elif subtype == b'\x11': #Success
-                    payload = __decode_payload(payload_type, payload)  # should return a list with a cmd type and payload
+                    payload = __decode_payload(payload_type, payload) # should return a list with a cmd type and payload
                     self.master._iprint(f"Success received from {sender_mac} ({self.peer_name(sender_mac)}) for type {payload[0]} with payload {payload[1]}")
                     #add to ack buffer
                 elif subtype == b'\x12': #Fail
-                    payload = __decode_payload(payload_type, payload)  # should return a list with a cmd type, error and payload
-                    self.master._iprint(f"Command fail received from {sender_mac} ({self.peer_name(sender_mac)}) for type {payload[0]} with error {payload[1]} and payload {payload[2]}")")
+                    payload = __decode_payload(payload_type, payload) # should return a list with a cmd type, error and payload
+                    self.master._iprint(f"Command fail received from {sender_mac} ({self.peer_name(sender_mac)}) for type {payload[0]} with error {payload[1]} and payload {payload[2]}")
                     #add to ack buffer
                 elif subtype == b'\x13': #Confirm
-                    payload = __decode_payload(payload_type,payload)  # should return a list with message type and payload
-                    self.master._iprint(f"Receive confirmation received from {sender_mac} ({self.peer_name(sender_mac)}) for type {payload[0]} with payload {payload[1]}")")
+                    payload = __decode_payload(payload_type,payload) # should return a list with message type and payload
+                    self.master._iprint(f"Receive confirmation received from {sender_mac} ({self.peer_name(sender_mac)}) for type {payload[0]} with payload {payload[1]}")
                     #add to ack buffer
                 else:
                     self.master._iprint(f"Unknown ack subtype from {sender_mac} ({self.peer_name(sender_mac)}): {subtype}, Payload: {payload}")