From 066de73659c67fd5607489575df7cb020b35429c Mon Sep 17 00:00:00 2001
From: Klaudia Kandulska <klakan1@st.amu.edu.pl>
Date: Fri, 29 Jun 2018 15:49:34 +0000
Subject: [PATCH] Update 'Zadanie3'

---
 Zadanie3 | 20 +++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

diff --git a/Zadanie3 b/Zadanie3
index 1be6210..bcc7acd 100644
--- a/Zadanie3
+++ b/Zadanie3
@@ -84,21 +84,24 @@ def divide(message, poly16):
     check = temp
     return check
 
-def decode(message_final,poly16,crc):
+def decode(message,poly16,crc):
     l_poly16 = len(poly16)
-    appended_message2 = toBinary(message_final)
-    obroc = list(appended_message2)
+    message = bytearray(message, 'ascii')
+    message = format(int.from_bytes(message, "big"), "b")
+    dec = int(crc, 16)
+    crc2=bin(dec)[2:]
+    msg=message+crc2
+    while len(msg) % 8 != 0:
+        msg = "0" + msg
+    obroc = list(msg)
     for i in range(l_poly16 - 1):
         if obroc[i] == "0":
             obroc[i] = "1"
         elif obroc[i] == '1':
             obroc[i] = "0"
 
-    appended_message2 = "".join(obroc)
+    msg = "".join(obroc)
     
-    dec = int(crc, 16)
-    crc2=bin(dec)[2:]
-    msg=appended_message2+crc2
     remainder = divide(msg, poly16)
     #Poprawione sprawdzanie
     suma = 0
@@ -135,8 +138,7 @@ def encode(message, poly16):
     message_final = bytearray(message_final, 'ascii')
     ab = bytearray(ab, 'ascii')
     print("calosc : ", message_final)
-    print("crc : ", ab)      
-
+    print("crc : ", ab)       
     
 poly16 = "10001000000100001"