From 2c43fb419b812cd8b60f18193788e9e5148ef78f Mon Sep 17 00:00:00 2001 From: lonkaars Date: Wed, 23 Nov 2022 20:06:09 +0100 Subject: tiny details --- docs/img/Demo.PNG | Bin 14245 -> 0 bytes docs/img/RTTViewerConf.PNG | Bin 5453 -> 0 bytes docs/img/bluetooth_dongle_problem.png | Bin 0 -> 1419 bytes docs/img/bluetoothdongleProblem.PNG | Bin 1419 -> 0 bytes docs/img/demo.png | Bin 0 -> 14245 bytes docs/img/rtt_viewer_conf.png | Bin 0 -> 5453 bytes docs/research.md | 14 ++++++++------ 7 files changed, 8 insertions(+), 6 deletions(-) delete mode 100644 docs/img/Demo.PNG delete mode 100644 docs/img/RTTViewerConf.PNG create mode 100644 docs/img/bluetooth_dongle_problem.png delete mode 100644 docs/img/bluetoothdongleProblem.PNG create mode 100644 docs/img/demo.png create mode 100644 docs/img/rtt_viewer_conf.png diff --git a/docs/img/Demo.PNG b/docs/img/Demo.PNG deleted file mode 100644 index db84644..0000000 Binary files a/docs/img/Demo.PNG and /dev/null differ diff --git a/docs/img/RTTViewerConf.PNG b/docs/img/RTTViewerConf.PNG deleted file mode 100644 index 3da746d..0000000 Binary files a/docs/img/RTTViewerConf.PNG and /dev/null differ diff --git a/docs/img/bluetooth_dongle_problem.png b/docs/img/bluetooth_dongle_problem.png new file mode 100644 index 0000000..e706ad6 Binary files /dev/null and b/docs/img/bluetooth_dongle_problem.png differ diff --git a/docs/img/bluetoothdongleProblem.PNG b/docs/img/bluetoothdongleProblem.PNG deleted file mode 100644 index e706ad6..0000000 Binary files a/docs/img/bluetoothdongleProblem.PNG and /dev/null differ diff --git a/docs/img/demo.png b/docs/img/demo.png new file mode 100644 index 0000000..db84644 Binary files /dev/null and b/docs/img/demo.png differ diff --git a/docs/img/rtt_viewer_conf.png b/docs/img/rtt_viewer_conf.png new file mode 100644 index 0000000..3da746d Binary files /dev/null and b/docs/img/rtt_viewer_conf.png differ diff --git a/docs/research.md b/docs/research.md index ca5ac81..bbd307a 100644 --- a/docs/research.md +++ b/docs/research.md @@ -108,23 +108,25 @@ Bluetooth mesh networking implements a publish/subscribe message-oriented commun Provisioning is the process by which a Bluetooth device (unprovisioned device) joins the mesh network and becomes a Bluetooth mesh node. This process is controlled by a provisioner. A provisioner and the unprovisioned device follow a fixed procedure as defined in the Bluetooth Mesh Profile [4]. A provisioner is typically a smartphone running a provisioning application. For a more in-depth look at different aspects of provisioning see links number 13. ## Demo -For this demo we are trying too understand the basics behind bluetooth mesh( picture below). -![Figure 5](img/Demo.PNG) +For this demo we are trying to understand the basics behind bluetooth mesh (picture below). + +![Figure 5](img/demo.png) ### Difficulties + There were three difficulties for this demo: making the dongle work, making Bluetooth work on the dongle, and lastly debugging with RTT. The main problem was making the dongle work. After accidentally removing the bootloader in the dongle, it wasn't working properly. To solve this, a bootloader hex file is needed to erase and write in the dongle with a segger j-link and the nrf connect for desktop programmer. The bootloader will be referenced in GitHub. -To make example nrf/samples/bluetooth/mesh/light or switch work with the dongle a change is needed in the .conf file. +To make example `nrf/samples/bluetooth/mesh/light` or `switch` work with the dongle a change is needed in the `.conf` file. -![Figure 6](img/bluetoothdongleProblem.PNG) +![Figure 6](img/bluetooth_dongle_problem.png) After removing these two lines from the .conf file it will work exactly as you’d expect. For the development kit, it doesn't need to change. Lastly to make debugging work with the RTT viewer there needs to be configurations added to the .conf file(see below). -![Figure 7](img/RTTViewerConf.PNG) +![Figure 7](img/rtt_viewer_conf.png) # Manual nRF toolchain installation @@ -194,4 +196,4 @@ These are the links used for Bluetooth mesh research 10. [Repairing dongle](https://devzone.nordicsemi.com/f/nordic-q-a/40924/how-can-i-restore-the-original-bootloader-of-a-pca10059) 11. [Mesh concepts](https://developer.nordicsemi.com/nRF_Connect_SDK/doc/latest/nrf/ug_bt_mesh_concepts.html#mesh-concepts) 12. [Mesh networking](https://www.mathworks.com/help/bluetooth/ug/bluetooth-mesh-networking.html) -13. [provision Mesh network](https://www.bluetooth.com/blog/provisioning-a-bluetooth-mesh-network-part-1/) \ No newline at end of file +13. [Provision Mesh network](https://www.bluetooth.com/blog/provisioning-a-bluetooth-mesh-network-part-1/) -- cgit v1.2.3 From 51ade451fa9d5cf9f42f93ad1b20b9231ef3bbeb Mon Sep 17 00:00:00 2001 From: lonkaars Date: Wed, 23 Nov 2022 20:31:36 +0100 Subject: fix figure numbering and image size --- docs/gen/style.css | 15 +++++++++++++++ docs/research.md | 14 +++++++------- 2 files changed, 22 insertions(+), 7 deletions(-) diff --git a/docs/gen/style.css b/docs/gen/style.css index 7474846..eb47f5e 100644 --- a/docs/gen/style.css +++ b/docs/gen/style.css @@ -39,6 +39,15 @@ hyphens: auto; } + figcaption { + display: inline-block; + counter-increment: fig; + } + + figcaption::before { + content: "Figure " counter(fig) ": "; + } + table { border-collapse: collapse; border-style: solid; @@ -90,4 +99,10 @@ left: 0; content: attr(heading-num-fix); } + + img { + max-width: 13cm; + display: block; + margin: 0 auto; + } } diff --git a/docs/research.md b/docs/research.md index bbd307a..737664c 100644 --- a/docs/research.md +++ b/docs/research.md @@ -14,7 +14,7 @@ Flooding is used in computer networks routing algorithm in which every incoming A device is named "node" when it is added to a network. A node can contain several components that can be controlled independently of each other. For example, a luminaire can contain several lamps that can be switched on/off independently of each other. The different parts of a "single node" are called elements (figure 1). -![Figure 1](img/node_mesh_network.png) +![Node mesh network diagram](img/node_mesh_network.png) ### Elements @@ -22,7 +22,7 @@ Some nodes, such as sensors, run off batteries while other nodes, like light fix Some nodes are more complicated than others and consist of multiple independent parts called elements. Each node has at least one element, known as the primary element, and may have additional elements (Figure 2). -![Figure 2](img/node_composition.png) +![Node composition](img/node_composition.png) #### Low power node @@ -54,7 +54,7 @@ There are in total 3 model types a client, server and control type. A server mod Bluetooth mesh concepts is an overview of the operation and capabilities of the profile, as well as the life cycle of a mesh device. There are two different applications, the first is Bluetooth mesh and the second one is Bluetooth low energy (Figure 3). -![Figure 3](img/relations_applications.png) +![Relations and applications](img/relations_applications.png) For a more detailed understanding of concepts look for link number 11. @@ -101,7 +101,7 @@ A virtual address represents a set of destination addresses. Each virtual addres Bluetooth mesh networking implements a publish/subscribe message-oriented communication system. Such an approach ensures that different types of products can coexist in a mesh network without being affected by messages from devices they do not need to listen to. The act of sending a message is known as publishing. Based on the configuration, the mesh nodes select messages sent to specific addresses for processing. This technique is known as subscribing. A publisher node sends messages to those nodes that have subscribed to the publisher. Typically, mesh messages are addressed to group or virtual addresses. For example, look at figure 4. -![Figure 4](img/publish_subscribe.png) +![Publish and subscribe](img/publish_subscribe.png) ### Provisioning @@ -111,7 +111,7 @@ Provisioning is the process by which a Bluetooth device (unprovisioned device) j For this demo we are trying to understand the basics behind bluetooth mesh (picture below). -![Figure 5](img/demo.png) +![Demo set-up](img/demo.png) ### Difficulties @@ -121,13 +121,13 @@ After accidentally removing the bootloader in the dongle, it wasn't working prop To make example `nrf/samples/bluetooth/mesh/light` or `switch` work with the dongle a change is needed in the `.conf` file. -![Figure 6](img/bluetooth_dongle_problem.png) +![Dongle configuration](img/bluetooth_dongle_problem.png) After removing these two lines from the .conf file it will work exactly as you’d expect. For the development kit, it doesn't need to change. Lastly to make debugging work with the RTT viewer there needs to be configurations added to the .conf file(see below). -![Figure 7](img/rtt_viewer_conf.png) +![RTT viewer configuration](img/rtt_viewer_conf.png) # Manual nRF toolchain installation -- cgit v1.2.3