From 6aa108c0f94c068c3e6e16cea26f54934c4b568c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jurij=20Podgor=C5=A1ek?= Date: Thu, 26 Sep 2024 15:04:46 +0200 Subject: [PATCH] Popravki linux sprejemnika --- linux-receiver/bin/receiver | Bin 17784 -> 17792 bytes linux-receiver/main.c | 26 ++++++++++++++++++-------- 2 files changed, 18 insertions(+), 8 deletions(-) diff --git a/linux-receiver/bin/receiver b/linux-receiver/bin/receiver index 211fb1b592fee1ab94bf3353adb8c69676148efa..01d26653240462c3d1df9b97cae361c7c05f2aea 100755 GIT binary patch delta 2082 zcmZuyeQZ-z6u-A0+d3F+*LAP0d~`$I7Poa{j7_Jm%XsjnqKsG&Lb4Rt62gMZbP%Hr zV29+{lx-Zuj~E^NA()Wx@eC|P#z3VK6CI*3j3xq$JQ%`eU>h(}&%N&zgnFBvckcO} z^E>CBd-^*5KHV6ho%yt{t6;aqKZ)?=?>g_Zj99eIh+?Np3|YT9PHnYJ8o2)a7Gv20 zczMT5d!@PXj&T+Bzy+f~e}@{A05+40_A`xs$K@E8&vK7@Tpwf-`q8hJTkC+Dee@M5 zHP5GZZrR5D_Hp?SN+11|>s2sASSq!Sx0-I$WcgV!ZJrO9R%4ijh=`Yivw?8$A+tv>vNGX|j>9I7q{xL5p>3 zB?PnU=9Qtp^>CkjqL)q7F+1ybHO9%}L^w1NZ_AgW<_?@9Nj`pL7(v`#O=H`Ws9ok- zOq~wH*+SrpaZDWzbVtOA-ZGgGIi_9T6igwD!E{ zn2#|H6|jUc)d+W8PtIG;t5d@vmAqv~bg~|?9qmKek$@^iHxrzE?OqRKPlmpX zh}SUwB69N9p8AF;O>R%hHm}dPBKRicd7GfqE5V=Mxt6h8@%S~&`ymwNe4g86LbYa! z?L9+nMv53V8kd_Ur{X!MqIn~Jjkn->&U6}9GID>IWM7OYXG?#OAY3V$K~=C6Z=g|- ziyQ1Ec!z9Z&3v`M?c!=$0#Ey9&{1WnZ?}og2ReJD(?;B+yGHlYAA6u{w&322?3o4| zQQZ%t2l)$g9ncDae#`YgxEx~=yyY&6FUfL&dLakpEZ9^oxc&GxvJ($!snxg=Z$uFe zlndrXh8IT!vAyc)_n#};sOkDf`=GvVujuYJ6l zUM|nT&N)Kqi|Cn2tfZU$rf}tI4>F+JZ)9tRZoSJ_dF*W_ORYHlHayRxoqG)JjI+a~ z#U?Jw%ez&|1l{JCz5Gxl+{&oZhH*C?E>uCSEoHI{(gUtwv{cP&tlyTmk>C|&+k gY7o=llbT{nVz5-@bj^ID!D0fBI0yf0>&3i(0YFoVQUCw| delta 1966 zcmZuxeQZ-z6u&X7Ti`~?1K;8Di$6Q1QG`U66Pi>Ll?dx29?Q{ zg7R#Njw4@xs6ax{5Df5$TSgok7^)!}5+VT%1aQJbs)B5~$)uip-z|xmx9NT7p5O2M z?m6e)_gZ3f;C=dGkao0k}~*JTA-p0mL7mRxXJJoF5NEebusX6Uwh=&yV|iSg)tZeNCdmJpr7 zBhQt3wj(LR7Za=#XeK9a<-`MgHu!v&&lBOEHAHuDn{Z|T7G!(^t1C zj%0A;#onS}F+V&=rPNr>IW<1_2x?taweOkKLv+V#dewO3h#JqjKY|bw=wKZ&oI|OU zaR_?y{CQi3OEx^P|C`_tcU!k$0H%*=UtnoBa4)MO zVT?dK8tJ9c=3cvFTRU9KpFQ)`U@GNk@77Lrv4cM8V#RbJPm2sin}<^CgKFHG&5P~n zyon$#m*GjP+8MN#aw}mRhSiEvGZv-Pc+K8eWT>lDBScG>z4;jZT4W&FJYdQl=21PJ zznF6W*wS*ckeh=6Cs{g1&LI4#1SfTHg}!KWpQ)e>uJIQ7! zEc4Jj@Rupxr|=8G6u$|ZA)7O2S~qz;ZEx`xO4 z$jc(v^f&NzxL&5vR;Et@T;&Sg&+T>yqus^r@A&RFxW12U6$)wnC9tnt@!mo-hd9WZ zeAB;Ibb630*m%vOfmSHq@py2I>GYV)g@PI4oNA~;j*1)?)^fAjmT8`=G*9gsH;ICAyUm+TRqmr9mgawrfy~=Y+ z>aCR>G`neaZT diff --git a/linux-receiver/main.c b/linux-receiver/main.c index cf54d14..6342254 100644 --- a/linux-receiver/main.c +++ b/linux-receiver/main.c @@ -58,10 +58,14 @@ lo_address osc_dest; // Receiver MAC start at byte 52 #define WLAN_DA_OFFSET 52 -/*our MAC address*/ +/* ESP receiver MAC address */ uint8_t sprejemnikMac[] = { 0x08, 0x3A, 0xF2, 0x50, 0xEF, 0x6C }; +/* linux wifi receiver MAC address */ +//uint8_t sprejemnikMac[] = { 0x9c, 0xb6, 0xd0, 0xc4, 0xe8, 0xb9 }; + uint8_t wlan_da[] = { 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }; + // ESPNOW packet identifier #define ESP_ID_OFFSET 82 uint8_t esp_id[] = { 0x18, 0xfe, 0x34, 0x04 }; @@ -74,7 +78,7 @@ uint8_t pkg_header[] = { 0x0, 0x0, 0x0, 0x0 }; #include "../src/sensor_msg.h" uint8_t odcitekId; -sensor_msg odcitki[ST_SPREJEMNIKOV]; +sensor_msg odcitki[ST_SPREJEMNIKOV]; bool poslji[ST_SPREJEMNIKOV]; #include @@ -190,21 +194,25 @@ void print_packet(uint8_t *data, int len) { // Ustvarim bundle (svezenj) svezenj = lo_bundle_new(LO_TT_IMMEDIATE); + sprintf(glava, "/ww/%d/bat", i); + m = lo_message_new(); + lo_message_add_float(m, odcitki[i].bat); + lo_bundle_add_message(svezenj, glava, m); + // Dodamo sporocila sprintf(glava, "/ww/%d/acc", i); m = lo_message_new(); lo_message_add_float(m, odcitki[i].aX); lo_message_add_float(m, odcitki[i].aY); lo_message_add_float(m, odcitki[i].aZ); - lo_bundle_add_message(svezenj, glava, m); + sprintf(glava, "/ww/%d/quat", i); m = lo_message_new(); lo_message_add_float(m, odcitki[i].qW); - lo_message_add_float(m, odcitki[i].aX); - lo_message_add_float(m, odcitki[i].aY); - lo_message_add_float(m, odcitki[i].aZ); - + lo_message_add_float(m, odcitki[i].qX); + lo_message_add_float(m, odcitki[i].qY); + lo_message_add_float(m, odcitki[i].qZ); lo_bundle_add_message(svezenj, glava, m); #ifdef DEBUG @@ -212,7 +220,9 @@ void print_packet(uint8_t *data, int len) { #endif lo_send_bundle(osc_dest, svezenj); - lo_bundle_free(svezenj); + lo_bundle_free_recursive(svezenj); + + poslji[i] = false; } } }