From b06c20bba6afd513992fd2b8c52bd840aea721cb Mon Sep 17 00:00:00 2001 From: unknown Date: Fri, 5 Jun 2020 23:05:18 +0200 Subject: [PATCH 1/2] Add keystore --- uploadKeys/upload-keystore.jks | Bin 0 -> 2155 bytes 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 uploadKeys/upload-keystore.jks diff --git a/uploadKeys/upload-keystore.jks b/uploadKeys/upload-keystore.jks new file mode 100644 index 0000000000000000000000000000000000000000..8cc1740f168e5ec34c4bd4b0ff7a8f2100c6f715 GIT binary patch literal 2155 zcmb`H`8(7L8^&kG7>u2qI+UXhy1cICk{I_6%zMekzPUq+! z#Zo{5foQ=10eS+kz~Is_Fcd5WVF!b0K~MtpmtDZtTv%S!DN+})E%!QF7;dUkeeWo! z>7M@BgyhKb;`8H^F6J7g3o~kesYh%QEkA80Bu^-0aYT<<`LPZ?ww;tA$WT^oC_JI}$Fnrkpk_oeqN8^zUg{N0cQs}miMPFj*#=2eUF@GINO8-gbiHZc*>v0zx8}w3 zo-Y0wkIa9E00{4c9k3mKmfWIGP0K-VSnUcO=p0{dx<>C+WB7C6G$={@4P@`umr&-H0hb$H**GFKJUkDFKUd8h41? z@aLm1wDtm1>~0tKBu>SPKuhF242S9;bormRRMV1UM!>PzRIpo%-!6)d>Nn1 zVO)1I*~S%ZqwN({m1+Uk5GkD5>x~Z!DM~G7lI%L7u#b1~D2H3}Yes&&y{h_^RFt@0 z?8>`}R`e1YQSUp0YgA|7J`(IDDoV04K{o|_${Fm?fkc!574w`L9!S~EhQYPMv9bDE z<(ATUZWg@D6va>+IA0Hj}eH;{5&(*VAD@elLfsCc_M`g z-7Sr)Q47;rvnH`1hOC}+q6rs)dXUMh zsf<>4K5aXwHurE#Krv^$bG-#56s|>^gL;{ zeKqdGQtEo~xOK5i9)Z=ogljXh4I%MYJ!DjDFj~&`)860R6HwK8nSqCdQ+i9?Rt(t{ zClt&4Q_P4O`06X_3Q_1GJAuv-yGA+9n9ntEI(~Xa%iQso>tEBJzBMQg>r5#oy&A(u z#rZ$1e>r^Jm6FSFkQ9fks0=Vxm2+O{24a}JKgcOVYnu!%7(`1@t-g?}sQg1oH~0=u zoOyKzBI}Emn{tsGj{b8ChYaFy)Xa*|Q4Kp^K>*cDJ@|kwbYnOgGV2w}+5c5-AknkJ zvE5~xFS=6Oarz_aeuEV2{?vT>4XnFWc}J`(-8GF$Bp#iHGk?M(E7U=;YFDX{4Q(0r zS94*rA3t5^@WW=K%Ysy4P|a$uD{zl|2%Eh2dNt8U4RZwE`Z#EcEscFJtApWfl4 zIA6X`O&1muix7T4)!r@kHRly z>^$CCBEQ6SNd$dZl%nZkItp$^enDPb;NP#>Q~iU0NEr}D+nNf;Sd5C3?dR#xXcT-tq8-BIbxM5GFRW%1)>gJW)etnF|$Z# zT#oK0t8mNu=nIlBo>{qJ(t&(KBs5rlXTt93XrJ_+9pbx;YaWBFR`vG_{5gJ@!({Uv zT_eZkB~$sI<@ea006tsdHf;jqy(Nh&X9OMW-CF@{9nV7~1?)ZXR8O(Mkdq>jdHEGe z@sJAmTPs(qi1k1$q=q}cziHRFRW;qP>jcp?T-(=~V*F(`c}q2Jak4BdO!W3UqKEs4 zm}q&AjiADgGBz!tt!B`$6`P|6VYd`camMi_eq2IkQkA$ywJnADo3(F=S5adIN|RHu zztZ1Sy}vrrXBOo$DQInf1407^fpbLxVL~@CZ1=1ZXy^2SFSHGjUA3kHj%C%S<*G0$a(6F)@h{*KMnOTT5fa2)T&+?mqXRWpZ<+^^=rP zdrS%7ToxX~J>Fydo<;REo6%^29X@%?_GsWiZ^^0646&#d>R{e-t8TGLswKmVQ7wNv zsWbwpm(=me_$Zk5y>;(|Yp)N@aDA97$}Ka$(wr=cM%_P-5OXDxujF-O);PoW%_gT0 z@S5H^m4y$AOkRj?s=y|UW22z! Date: Fri, 5 Jun 2020 23:17:54 +0200 Subject: [PATCH 2/2] Activate mavsdk backend --- app/src/main/java/ch/epfl/sdp/drone/DroneInstanceProvider.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/main/java/ch/epfl/sdp/drone/DroneInstanceProvider.kt b/app/src/main/java/ch/epfl/sdp/drone/DroneInstanceProvider.kt index fe9039ef1..96ecb17ef 100644 --- a/app/src/main/java/ch/epfl/sdp/drone/DroneInstanceProvider.kt +++ b/app/src/main/java/ch/epfl/sdp/drone/DroneInstanceProvider.kt @@ -4,7 +4,7 @@ import io.mavsdk.System import io.mavsdk.mavsdkserver.MavsdkServer object DroneInstanceProvider { - private const val USE_REMOTE_BACKEND = true // False for running MavsdkServer locally, True to connect to a remote instance + private const val USE_REMOTE_BACKEND = false // False for running MavsdkServer locally, True to connect to a remote instance private const val REMOTE_BACKEND_IP_ADDRESS = "10.0.2.2" //IP of the remote instance private const val REMOTE_BACKEND_PORT = 50051 // Port of the remote instance