From cc0a27d7f89c8063f2a64e149cef4e8bb03294eb Mon Sep 17 00:00:00 2001 From: GitHub Action Date: Wed, 13 Nov 2024 19:59:47 +0000 Subject: [PATCH 1/3] Render README.qmd files to README.md --- docs/README.md | 33 +++++++++++++++++++++++---------- firmware/README.md | 23 ++++++++++++++++++----- hardware/README.md | 23 ++++++++++++++++++----- overleaf/README.md | 23 ++++++++++++++++++----- rstudio/README.md | 27 ++++++++++++++++++++++----- software/README.md | 38 ++++++++++++++++++++++++++++---------- 6 files changed, 127 insertions(+), 40 deletions(-) diff --git a/docs/README.md b/docs/README.md index e61743a..5cf5c68 100644 --- a/docs/README.md +++ b/docs/README.md @@ -1,8 +1,17 @@ - +--- +editor: visual +editor_options: + chunk_output_type: console +execute: + echo: false + message: false + warning: false +toc-title: Table of contents +--- # Smart System Education Platform -## Location: /docs/README.qmd +## Location: /work/Smart-System-Platform/Smart-System-Platform/docs/README.qmd ### Description @@ -12,6 +21,8 @@ This directory hosts the website. The repository has the following directory tree. +::: cell +::: {.cell-output .cell-output-stdout} . ├── README.md ├── README.qmd @@ -23,14 +34,16 @@ The repository has the following directory tree. ├── start.html ├── technology.html └── tools.html +::: +::: A short description of the directories can be found below. -| name | description | contribution | -|-----------------|------------------------|--------------| -| index.html | Main page | Nick | -| mission.html | Mission statement | Nick | -| technology.html | Technology explanation | Nick | -| tools.html | Tool links | Nick | -| community.html | Community | Nick | -| start.html | … | Nick | + name description contribution + ----------------- ------------------------ -------------- + index.html Main page Nick + mission.html Mission statement Nick + technology.html Technology explanation Nick + tools.html Tool links Nick + community.html Community Nick + start.html ... Nick diff --git a/firmware/README.md b/firmware/README.md index 299dc11..2a9b208 100644 --- a/firmware/README.md +++ b/firmware/README.md @@ -1,8 +1,17 @@ - +--- +editor: visual +editor_options: + chunk_output_type: console +execute: + echo: false + message: false + warning: false +toc-title: Table of contents +--- # Smart System Education Platform -## Location: /firmware/README.qmd +## Location: /work/Smart-System-Platform/Smart-System-Platform/firmware/README.qmd ### Description @@ -12,13 +21,17 @@ This directory will host the custom firmware. The repository has the following directory tree. +::: cell +::: {.cell-output .cell-output-stdout} . ├── README.md ├── README.qmd └── README.rmarkdown +::: +::: A short description of the directories can be found below. -| name | description | contribution | -|------|-------------|--------------| -| NA | NA | Nick | + name description contribution + ------ ------------- -------------- + NA NA Nick diff --git a/hardware/README.md b/hardware/README.md index 1be2f29..e052599 100644 --- a/hardware/README.md +++ b/hardware/README.md @@ -1,8 +1,17 @@ - +--- +editor: visual +editor_options: + chunk_output_type: console +execute: + echo: false + message: false + warning: false +toc-title: Table of contents +--- # Smart System Education Platform -## Location: /hardware/README.qmd +## Location: /work/Smart-System-Platform/Smart-System-Platform/hardware/README.qmd ### Description @@ -12,13 +21,17 @@ This directory will host files about the smart system hardware. The repository has the following directory tree. +::: cell +::: {.cell-output .cell-output-stdout} . ├── README.md ├── README.qmd └── README.rmarkdown +::: +::: A short description of the directories can be found below. -| name | description | contribution | -|------|-------------|--------------| -| NA | NA | Nick | + name description contribution + ------ ------------- -------------- + NA NA Nick diff --git a/overleaf/README.md b/overleaf/README.md index 9dd70f9..bebe73a 100644 --- a/overleaf/README.md +++ b/overleaf/README.md @@ -1,8 +1,17 @@ - +--- +editor: visual +editor_options: + chunk_output_type: console +execute: + echo: false + message: false + warning: false +toc-title: Table of contents +--- # Smart System Education Platform -## Location: /overleaf/README.qmd +## Location: /work/Smart-System-Platform/Smart-System-Platform/overleaf/README.qmd ### Description @@ -12,13 +21,17 @@ This directory hosts the latex thesis report. The repository has the following directory tree. +::: cell +::: {.cell-output .cell-output-stdout} . ├── README.md ├── README.qmd └── README.rmarkdown +::: +::: A short description of the directories can be found below. -| name | description | contribution | -|------|-------------|--------------| -| NA | NA | Nick | + name description contribution + ------ ------------- -------------- + NA NA Nick diff --git a/rstudio/README.md b/rstudio/README.md index 3491795..de41211 100644 --- a/rstudio/README.md +++ b/rstudio/README.md @@ -1,8 +1,17 @@ - +--- +editor: visual +editor_options: + chunk_output_type: console +execute: + echo: false + message: false + warning: false +toc-title: Table of contents +--- # Smart System Education Platform -## Location: /rstudio/README.qmd +## Location: /work/Smart-System-Platform/Smart-System-Platform/rstudio/README.qmd ### Description @@ -12,14 +21,22 @@ This directory hosts the rstudio files. The repository has the following directory tree. +::: cell +::: {.cell-output .cell-output-stdout} . ├── README.md ├── README.qmd ├── README.rmarkdown └── exampleREADME.qmd +::: +::: A short description of the directories can be found below. -| name | description | contribution | -|----|----|----| -| exampleREADME.qmd | This is the example README used to generate all the README.md | Nick | + --------------------------------------------------------------------------------- + name description contribution + ------------------- ---------------------------------------------- -------------- + exampleREADME.qmd This is the example README used to generate Nick + all the README.md + + --------------------------------------------------------------------------------- diff --git a/software/README.md b/software/README.md index f889fb9..e9d2ee0 100644 --- a/software/README.md +++ b/software/README.md @@ -1,8 +1,17 @@ - +--- +editor: visual +editor_options: + chunk_output_type: console +execute: + echo: false + message: false + warning: false +toc-title: Table of contents +--- # Smart System Education Platform -## Location: /software/README.qmd +## Location: /work/Smart-System-Platform/Smart-System-Platform/software/README.qmd ### Description @@ -12,6 +21,8 @@ This directory hosts code for the smart modules. The repository has the following directory tree. +::: cell +::: {.cell-output .cell-output-stdout} . ├── README.md ├── README.qmd @@ -46,21 +57,28 @@ The repository has the following directory tree. ├── config.py ├── examples └── networking.py +::: +::: A short description of the directories can be found below. -| name | description | contribution | -|--------------|-----------------------------------------|--------------| -| libraries | Useful libraries for inputs and outputs | Nick | -| networking | Smart Module Networking library | Nick | -| applications | Various coding tools and applications | Nick | -| archive | Old or outdated code or examples | Nick | + ------------------------------------------------------------------------ + name description contribution + -------------- ------------------------------------------ -------------- + libraries Useful libraries for inputs and outputs Nick + + networking Smart Module Networking library Nick + + applications Various coding tools and applications Nick + + archive Old or outdated code or examples Nick + ------------------------------------------------------------------------ ### Helpful links: -ESP-NOW +ESP-NOW \ Networking - +\ AP / WiFi From 5def2b09a27968129a1417f7ada88b7d8d38999f Mon Sep 17 00:00:00 2001 From: Nick Art Date: Wed, 13 Nov 2024 16:13:57 -0500 Subject: [PATCH 2/3] added fail, success and confirm response messages added fail, success and confirm response messages, also try and except for most commands --- .DS_Store | Bin 10244 -> 10244 bytes docs/.DS_Store | Bin 8196 -> 8196 bytes docs/images/.DS_Store | Bin 6148 -> 6148 bytes software/.DS_Store | Bin 8196 -> 8196 bytes software/applications/.DS_Store | Bin 8196 -> 10244 bytes .../githubfiledownload/filedownload.py | 13 +++ software/networking/.DS_Store | Bin 6148 -> 6148 bytes software/networking/networking.py | 88 +++++++++++++++--- 8 files changed, 88 insertions(+), 13 deletions(-) create mode 100644 software/applications/githubfiledownload/filedownload.py diff --git a/.DS_Store b/.DS_Store index 1c2c5f33bf9534e241ffde756f399d34d26a4054..88f2c6760e6687d162c9657c135b5fc9c66235b4 100644 GIT binary patch delta 812 zcmZn(XbG4g&dJTdz{tVCAi+IRL0y)a0muVleIN$11sE8L7;+iP84`hX>cqswlMPf@ zSV0O{Chr%&F}YA$W@92V+h%qS77j+m$PW-YucPwrGRc$$3SSA4(`8m|~OV zCHWW?HtR`hGcvJWn;b2rz_xT3SY4x(5`rl`s-Squ!EK$WfxjtnjgzCcL2MCZqw5}nj6UWF zRy0$dhXYxFzaYafI5|JJ0O&jh1~!Mu7vwbSle)SfkuTf&YxqROY>l`qJE zSO(O?z`)wDxmiMpkr~L`JVSCbD_dLko`qARCkM()!I*{e(je){0*oS)cL?zFf-KYf z4+db-8(;tCvcOV@{iO)n4^o4ih(iwz<$d7rp4RE@~wAL7CjEBFOLd>~NZ1`@8onB)P* f;CJT9{3@1{?Rg|7$EYma%qZ){1Pe+MLe&)jkus&a diff --git a/docs/.DS_Store b/docs/.DS_Store index 290d3efead0915b26ea7cf60f3f751f40603d372..78ce0ae9d3d3df1e129229fc3c5522e5b5c09c8c 100644 GIT binary patch delta 427 zcmZp1XmOa}FD%T!z`)4BAi%(on3HZ8oSdIqu(5C&`@{zR&Fma39Q7c1Rt7zWOokMO zRD>F!C=iI=1`ISlzghvYNFGZcdzl>-#f1G38)(miwXlc7NX3{!^nKs;}9kgzi&@8mdP2{DE` atO~k>H*PHRW7^Cv@q>jEp${zV%>)1^mSjr+ delta 77 zcmV-T0J8stK!iY$PZbFO0003101yBGbpUPvX#jKpc>pf4ah3;>fDN+;2m}ZL3A2n4 j9Rrgw6f~2e6gZO;6{eF!92~P(46p;U2N?JSv3dmqxhE6o diff --git a/docs/images/.DS_Store b/docs/images/.DS_Store index 2609e41e4adea06bf6ee1a66afb86cb9f9a25c50..41602ab80f3884ea9650afb193e572bea743c281 100644 GIT binary patch delta 60 zcmZoMXffDO&nhSRZz}@>12aQDLk>eqZoZ34QcivnP=w>mLZ5w)C(mV-WQDMHvq~{Z L1#G^~sw)HlQ$7@e delta 60 zcmZoMXffDO&nm|N2Fwik3^@!bx%nXFs1BQWvzyQu{ zQLKb>U-g>SFkl$?FBuT~gN-U=E|eW5<<@~lrT~zmcq|L9kq1Z}JCwOlc9fK=7*k~r zEL3G-ioujR`fUM+%!RU}q*5oQ)QN>}W?_cH!;8dTy&x3-#W)HQ#GAv)RuqH8MJOWZW9JCan9; z25&jdQgf@3FV*jgyW5=mZuh$6u6mVLaq`3>51J(}sMMu`SFQkZ?~WIgc`MJif^tLZ zI;z7;Tj}EDsdhV?u@`19?quxt<=NScJwLawvy-+?p1W{$rMT%=1O8afpIEq=&~bI& zYoFjM(K>&9##!Ulnnbe~U-!aRd7%(8VSQgd{pnSG_uAh0@*m-A8 zgNpiS_jxbsVv&76?TyrYMbcMCDS&^P)WX-kI&H#R0j=xtMsG30sJCKuBL4b!_lsD| zbbo!h0XAZBQIBoE?s+T$+xOY;u$tGHjn~J&f7_`CJ`dK>FCsEcE3|}_R-l`Z(^RFh z?pO8$DBZ8R#=~Kqlo&m#GltmV`1ylteCVW!AazE+y~LQ2-YAdGhbwGuRqjq2qR(DD zLg!3II$m-J%ZRdRO631b$>0AEq2F+%K#fKIE6g!x_^vxJGxTj+BWI~R8a)3 zqoh3uQ-1JVDv_4*??c_#62`>{+d!R_6RS=f4d41JL{e D6FyPG delta 276 zcmZp1XmOa}FDlN!z`)4BAi%(o$xz0S>Y02Hwr=94s7+;*)O)`Y}z8 zm>eJ^GTBaui>>J9s&A*lCi@8~z?daMN=yt4ljTIjHm?(sVr1fS0I?@O5awaah*!A4ToZP(p9-wPM4hFgy40xe5jOv{nB&x==&0%tts0y3sg(Z*wg-yO7Dm8hZ jC=Y_G&cyIx@=sBX&Fx|hj2jyam^QOZd}G;I!Ojc-;ebxb diff --git a/software/applications/.DS_Store b/software/applications/.DS_Store index e89e0aac4c5631d567f52cd8d39a000efd8facda..b5c09c0d79263d8407a230e9a3eddf04ef4772f2 100644 GIT binary patch literal 10244 zcmeHMPiqrF6o1=9v#}~c)Po|dcu=9%BsRs^ON`Bvf)# zwCE=g1W#VPS@0}=1aE?$z?+~aeKR{vW_Od2T#DKmn0>SR-kZGld-G=VW&uFSx6BlP z1^_B{N)!9>GN4gD?V&cspPWXjpgzDkAlPeAhGs}wK9C4V1SA3y0f~S_;BPY#Y)pzvQ-c!i>{Uq?NSiGz~!sJu!9Bm!XsXzhLg46NG; z)P41P85-bTv&pJq69c7aVqL~Q`H0rkHHj~LO%2Xt}XKzf6snhCx zy-M18v(#+4`BLL9y;~y0HnztlW7#UVR}zP>5T{wPoN|LHSY{bT?%lE+leF`s<(Mwh z)jft9SK}**W1UWFE|Zzj=F-WH8LgAbUc{ShHnXu2SC5=Jzp%LS$gVl$1@i(FzNsJ* z{!Dz!6dN)%CMmH$PK6N1$IL=7bvcs%X(GYS@VR*Y$>D z6Q_bw6oD9+V1bM4z=je$4#fUFN{F!!NdGtS4*2Dd@$G|QoW!`k`}8fw;~JPpjOB1C zfBe|O3d|FT*&(Q4%$iVz7H0879NT#MW@0wC!ND=XNSXs8`C7>0vE~rs`(elP`Dmw; zoYCgf8Jf)5bQ%-;!h9f?pJHUN4bA0e$Q;X4f5h3OW9f|9gyO(m}2 zeF2TNunzmrBJOt70@)-25&?;TL_i|2dl86uu50xCzc~E+|Lz4ydM**z1qdk7f?mj@ zqua+|L7(YayN3M%cG{?1*P~1YFYGuTDLanG8+sgn20N8aQc4?+bDVZPichfZ_{V^e qrzQSsh#5F$4PWS;)=gT&i>E`A>iR1zX0NRO4a7l}_5aY*u+2Y*`S3OX delta 125 zcmZn(XmOBWU|?W$DortDU;r^WfEYvza8E20o2aMAD77(QH$S7)WF7&z%_#zh7&nIq zl`~Fe7b~BbU#*!o^L1v&HAduh&60RWa8wB)qu~2NHo+2aL!~pBf0*noeKvs`wJqJT7Lj^-3LoP!BLk^H#oRe-C zoSdIqzyJpP*+2?IO>Vx6OHxjL5=idO3CJ*u~2NHo+2aD!~pBb1|lqz`I(G1-(=Eb-K@YY!L*s3gP#MaXtN;m Wcjn3bB8H3%lWlmUH^+#qU Date: Wed, 13 Nov 2024 16:58:08 -0500 Subject: [PATCH 3/3] bug fix for message type bug fix --- software/networking/networking.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/software/networking/networking.py b/software/networking/networking.py index 6fbf400..2f53337 100644 --- a/software/networking/networking.py +++ b/software/networking/networking.py @@ -773,9 +773,9 @@ def __handle_inf(sender_mac, subtype, stimestamp, rtimestamp, payload_type, payl payload = __decode_payload(payload_type, payload) self.master._iprint(f"Message received from {sender_mac} ({self.peer_name(sender_mac)}): {payload}") self._received_messages.append((sender_mac, payload, rtimestamp)) - self.received_messages_size.append(payloadlength) - while len(self.received_messages) > 2048 or sum(self._received_messages_size) > 20000: - self.master._dprint(f"Maximum buffer size reached: {len(self.received_messages)}, {sum(self._received_messages_size)} bytes; Reducing!") + self._received_messages_size.append(payloadlength) + while len(self._received_messages) > 2048 or sum(self._received_messages_size) > 20000: + self.master._dprint(f"Maximum buffer size reached: {len(self._received_messages)}, {sum(self._received_messages_size)} bytes; Reducing!") self._received_messages.pop(0) self._received_messages_size.pop(0) #self._compose(sender_mac, ["Other (\x20)", payload], 0x03, 0x13) #confirm message recv @@ -815,7 +815,7 @@ def __handle_ack(sender_mac, subtype, stimestamp, rtimestamp, payload_type, payl if data: rtimestamp = time.ticks_ms() if sender_mac != None and data != None: - #self.received_messages.append((sender_mac, data, rtimestamp))#Messages will be saved here, this is only for debugging purposes + #self._received_messages.append((sender_mac, data, rtimestamp))#Messages will be saved here, this is only for debugging purposes __process_message(sender_mac, data, rtimestamp) if not self._aen.any():#this is necessary as the for loop gets stuck and does not exit properly. break