From ad9947438b89e0c6edd9d03ec7132c0952bd9a54 Mon Sep 17 00:00:00 2001
From: yul <yul@yu-li.eu>
Date: Wed, 22 Jun 2022 02:14:35 +0200
Subject: [PATCH] aaaaaah stuff are showing on the master screen teacher code
 slave code mine

---
 Debug/CANOpen_attempt.axf               | Bin 242344 -> 242344 bytes
 Debug/CANOpen_attempt.map               |  10 +++++-----
 Debug/src/main.o                        | Bin 90872 -> 90868 bytes
 Debug/uart2can-bin_bla_Debug.ld         |   2 +-
 Debug/uart2can-bin_bla_Debug_library.ld |   2 +-
 Debug/uart2can-bin_bla_Debug_memory.ld  |   2 +-
 src/main.c                              |   4 ++--
 7 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/Debug/CANOpen_attempt.axf b/Debug/CANOpen_attempt.axf
index 2be74c290f646453ece4d86753585f3f86fc3d11..35aaf6e4ca137200545c6b2e3e533c4b03e91a18 100755
GIT binary patch
delta 237
zcmZ4SlyAjTzJ@J~8e)u$+cm`)GZ`7Br%x7VjAvwR|18e9{j)gJX(`6Y>HCeC@_>|{
zF_Q#i<aT#sriDywM-&+t9;#1IRA5rwE^Nm1h>2~xG6RFU#?<>v7Tb+2nUp!$nAI5=
zPG~@sG&(XBIx-%a{<(?Cm1(>3bejgIlIiQ3nY0<1x8G`J`liBIxc%Y^rYY<i&sn8x
zSUDA0<!x9w^jO(#StayYIUNyPnRHfud!W?z{tZmFCm0!~&#z<_-Tt70d5#5R)AZVn
a%*u?+(-&@JR%Z;GeiB5@pZ;+p^L7B*CPh^M

delta 237
zcmZ4SlyAjTzJ@J~8e)vB+cm`)GZ`7VrcV}UjAvwQ|18e9{j)gJX(`62>HCeC@_>|{
zF_Q#i)OL4criDyw#}pYD9;#1IRA5rwE^Nm1h>2~dG6RFU#?<>v7Tb+2nUp!$Sk)OA
zPG~@sG&(XBIx-%c{<(?Cm1(E)bejgIlIiQ3nY4j6-)d(1rovdf{o)FyDePJ=Sfy-O
zITcyuZCE+<SlMk^CG=T29S~fZbXGolR(3sBj_ti0m~2l>Ur@;`vi(5?^BfDtmg%({
anUxt?r!U;dtj-uQ{UnH5IQ`>B=IsE|9YtpV

diff --git a/Debug/CANOpen_attempt.map b/Debug/CANOpen_attempt.map
index fd25d14..576060b 100644
--- a/Debug/CANOpen_attempt.map
+++ b/Debug/CANOpen_attempt.map
@@ -1333,7 +1333,7 @@ LOAD linker stubs
  .debug_macro   0x00000000000028c8      0x12d /home/yuyu/Documents/Documents/HEPIA/SPI/workspace/CMSIS_CORE_LPC17xx/Debug/libCMSIS_CORE_LPC17xx.a(system_LPC17xx.o)
  .debug_macro   0x00000000000029f5      0xa7e /home/yuyu/Documents/Documents/HEPIA/SPI/workspace/CMSIS_CORE_LPC17xx/Debug/libCMSIS_CORE_LPC17xx.a(system_LPC17xx.o)
 
-.debug_line     0x0000000000000000     0x2b84
+.debug_line     0x0000000000000000     0x2b82
  .debug_line    0x0000000000000000      0x407 ./src/accelo.o
  .debug_line    0x0000000000000407      0x2a5 ./src/callback.o
  .debug_line    0x00000000000006ac      0x5b6 ./src/can.o
@@ -1341,10 +1341,10 @@ LOAD linker stubs
  .debug_line    0x0000000000000dc2       0xb5 ./src/crp.o
  .debug_line    0x0000000000000e77      0x579 ./src/i2c.o
  .debug_line    0x00000000000013f0      0x55f ./src/lcd.o
- .debug_line    0x000000000000194f      0x877 ./src/main.o
- .debug_line    0x00000000000021c6      0x1f3 ./src/od.o
- .debug_line    0x00000000000023b9      0x34c ./src/ssp.o
- .debug_line    0x0000000000002705      0x47f /home/yuyu/Documents/Documents/HEPIA/SPI/workspace/CMSIS_CORE_LPC17xx/Debug/libCMSIS_CORE_LPC17xx.a(system_LPC17xx.o)
+ .debug_line    0x000000000000194f      0x875 ./src/main.o
+ .debug_line    0x00000000000021c4      0x1f3 ./src/od.o
+ .debug_line    0x00000000000023b7      0x34c ./src/ssp.o
+ .debug_line    0x0000000000002703      0x47f /home/yuyu/Documents/Documents/HEPIA/SPI/workspace/CMSIS_CORE_LPC17xx/Debug/libCMSIS_CORE_LPC17xx.a(system_LPC17xx.o)
 
 .debug_str      0x0000000000000000     0xbd53
  .debug_str     0x0000000000000000     0xa2b3 ./src/accelo.o
diff --git a/Debug/src/main.o b/Debug/src/main.o
index 578b953ec044f2574ecf8127666be063abc332ce..09031e3564bb7517c8e6dedf427fdc7a2952f995 100644
GIT binary patch
delta 465
zcmYMwF-SsD6vlB+bn^*Cwq%x25|JPjL4!dNHkm^rMfo!AJr}DXaEOLzXshjs!bd}p
zTW!e;ELsW*YSS%fNeZGNNN6xxI){dq`{U2OhXc2Hr@ro#H9*C(|D}z{R?aP=zQT^S
zO3HrHZaPRW9CdH<+3x8f-5&C61Sw}*Geu|MP4!MHmtXZyDs4nLr&Q0Va)tlXmsOq9
zd}Yr?t7rDW&v?xB;dD4!(hf(ol8VxmM%NYZJY|XQv9~}ms#a<Xl8=~J<ZR+#k+w+#
zEpY`97eXir5j2DZ!U^UA`2@e*hfC)=gDzBYDm>#`_{8iovyVd|f_K5dM3UzcC?~m^
zpcRG}{Zaa(Aw&>PF&6T|G3tUFV`=6Ydx9G^VGaIO#zIaA;YKjfWiSDlLI`Ey1Y|N7
th?^9oE$o^!$X`)1X_#8^Ak@$heDG!%17YDD>%uGY!YwWZ3-t_negVF;jC%k8

delta 476
zcmYMwPbh<N9LMqJtA2Z)$)uP`#FCUhbDGn$NV({d^52ZvS}EZoNjSP$DbvSg2gQw|
zho*2)Rt}Wn#!jYOmJ6j=`F=UL{9e8L{l0zc_nuatX|+*H+ehAK2Ps?W3q*yR%SM>U
zel#v!6x>Xf&+%F0si2@;@0o6*d3&QXp*Oy&N>e$#s>W1?Pw4?w(W;ys|5-Jqirba$
zQ-*DI-yPbOUv0h4H(k>TCN#}Tjds(SL02hvKTQ$cV0D0c=^=GHAo&FU5a&16hG>zB
zke6yk&oE;mDOkt}Ap}O4bHqpZ<vP?T*D(f#2kZ%1d<gI83Nq{15-hw3G5E)LE`)<I
zu5aW8UKIKz`A1H$5Ey3?hzq;O2xVxQV6s>h%5W>ppgPPXFe{k25MppmGR+tlOdJUN
z$P4G_iBJ<QVkts({1wRvHIM^o;T}1m7Van$Lx54Ic};7<P9K$GB}ygqin!cf<3vax
H6D7|NH{g;z

diff --git a/Debug/uart2can-bin_bla_Debug.ld b/Debug/uart2can-bin_bla_Debug.ld
index f8231b8..e288d5f 100644
--- a/Debug/uart2can-bin_bla_Debug.ld
+++ b/Debug/uart2can-bin_bla_Debug.ld
@@ -6,7 +6,7 @@
  * Generated linker script file for LPC1769
  * Created from linkscript.ldt by FMCreateLinkLibraries
  * Using Freemarker v2.3.30
- * MCUXpresso IDE v11.5.0 [Build 7232] [2022-01-11] on Jun 22, 2022, 1:31:44 AM
+ * MCUXpresso IDE v11.5.0 [Build 7232] [2022-01-11] on Jun 22, 2022, 2:13:14 AM
  */
 
 INCLUDE "uart2can-bin_bla_Debug_library.ld"
diff --git a/Debug/uart2can-bin_bla_Debug_library.ld b/Debug/uart2can-bin_bla_Debug_library.ld
index 82ef6cc..9a028fe 100644
--- a/Debug/uart2can-bin_bla_Debug_library.ld
+++ b/Debug/uart2can-bin_bla_Debug_library.ld
@@ -6,7 +6,7 @@
  * Generated linker script file for LPC1769
  * Created from library.ldt by FMCreateLinkLibraries
  * Using Freemarker v2.3.30
- * MCUXpresso IDE v11.5.0 [Build 7232] [2022-01-11] on Jun 22, 2022, 1:31:44 AM
+ * MCUXpresso IDE v11.5.0 [Build 7232] [2022-01-11] on Jun 22, 2022, 2:13:14 AM
  */
 
 GROUP (
diff --git a/Debug/uart2can-bin_bla_Debug_memory.ld b/Debug/uart2can-bin_bla_Debug_memory.ld
index 40f542b..ffcb8b8 100644
--- a/Debug/uart2can-bin_bla_Debug_memory.ld
+++ b/Debug/uart2can-bin_bla_Debug_memory.ld
@@ -6,7 +6,7 @@
  * Generated linker script file for LPC1769
  * Created from memory.ldt by FMCreateLinkMemory
  * Using Freemarker v2.3.30
- * MCUXpresso IDE v11.5.0 [Build 7232] [2022-01-11] on Jun 22, 2022, 1:31:44 AM
+ * MCUXpresso IDE v11.5.0 [Build 7232] [2022-01-11] on Jun 22, 2022, 2:13:14 AM
  */
 
 MEMORY
diff --git a/src/main.c b/src/main.c
index 46d2920..9bf0999 100644
--- a/src/main.c
+++ b/src/main.c
@@ -270,7 +270,7 @@ void CAN_IRQHandler(){
 		switch((msg.id >> 7) & 0xf){ //get the function code
 			case CAN_HEARTBEAT:
 				if(msg.data[0] != CAN_NMT_STATE_OPERATIONAL)
-					CANOpen_NMT_send(0, CAN_NMT_STATE_OPERATIONAL);
+					CANOpen_NMT_send(0, CAN_NMT_CMD_OPERATIONAL);
 			case CAN_RPDO1:
 				CANOpen_pdo1_receive(data_g_1);
 				affichage();
@@ -355,7 +355,7 @@ int slave_main(){
 						last_timestamp_nmt = get_systick_counter();
 					}
 			}
- 			if(state == CAN_NMT_CMD_OPERATIONAL){
+  			if(state == CAN_NMT_STATE_OPERATIONAL){
 				if(get_systick_counter() - last_timestamp > get_od_accelo_interval()){
 					get_data_from_i2c_and_ready_to_be_sent_to_master_then_send();
 					last_timestamp = get_systick_counter();