Przeglądaj źródła

Set default sound volume for mesh client

Bob Mottram 8 lat temu
rodzic
commit
2a6bcf2e04
Brak konta powiązanego z e-mailem autora

+ 1
- 1
doc/EN/mesh.org Wyświetl plik

@@ -148,7 +148,7 @@ And by selecting the user from the list on the left hand side the chat can begin
148 148
 [[file:images/mesh_text_chat.jpg]]
149 149
 #+END_CENTER
150 150
 
151
-One important point is that by default sound and microphone is turned off. In the top right corner of the screen you can increase the sound volume and enable the microphone if you're doing voice chat or need audible notifications.
151
+One important point is that by default the microphone is turned off. When doing voice chat you can select the microphone volume with the drop down slider in the top right corner of the screen.
152 152
 
153 153
 At present video doesn't work reliably, but text and voice chat do work well. In future IPFS or Tahoe-LAFS may be added to create a distributed filesystem for the mesh.
154 154
 

BIN
img/backgrounds/freedombone_mesh_initial_background.png Wyświetl plik


+ 8
- 1
src/freedombone-image-customise Wyświetl plik

@@ -95,7 +95,7 @@ WIFI_NETWORKS_FILE=~/${PROJECT_NAME}-wifi.cfg
95 95
 INSECURE='no'
96 96
 
97 97
 # optional desktop background image for mesh
98
-MESH_DESKTOP_BACKGROUND_IMAGE=/usr/local/share/${PROJECT_NAME}_mesh_background.png
98
+MESH_DESKTOP_BACKGROUND_IMAGE=/usr/local/share/${PROJECT_NAME}_mesh_initial_background.png
99 99
 
100 100
 # The browser application to use
101 101
 BROWSER=iceweasel
@@ -628,6 +628,10 @@ function mesh_client_startup_applications {
628 628
     echo "echo 'export DBUS_SESSION_BUS_ADDRESS' >> /home/$MY_USERNAME/.dbus/Xdbus" >> $START_DESKTOP
629 629
 
630 630
     echo '' >> $START_DESKTOP
631
+    echo "amixer set 'Master' unmute" >> $START_DESKTOP
632
+    echo "amixer set 'Master' 50%" >> $START_DESKTOP
633
+    echo '' >> $START_DESKTOP
634
+    echo '' >> $START_DESKTOP
631 635
     echo "if [ ! -f $FIRST_BOOT ]; then" >> $START_DESKTOP
632 636
     echo "  $TAHOE_COMMAND start" >> $START_DESKTOP
633 637
     echo '  exit 0' >> $START_DESKTOP
@@ -730,6 +734,9 @@ function configure_user_interface {
730 734
     # a sane editor
731 735
     chroot "$rootdir" apt-get -y install emacs24
732 736
 
737
+    # for sound level control
738
+    chroot "$rootdir" apt-get -y install alsa-utils
739
+
733 740
     # android adb to allow phones to be connected and for example transfer photos/documents
734 741
     chroot "$rootdir" apt-get -y install android-tools-adb
735 742
 

+ 8
- 0
src/freedombone-image-mesh Wyświetl plik

@@ -833,6 +833,14 @@ if [ -f $MESH_INSTALL_SETUP ]; then
833 833
             touch $FIRST_BOOT
834 834
             chown ${MY_USERNAME}:${MY_USERNAME} $FIRST_BOOT
835 835
         fi
836
+
837
+        # set the desktop background
838
+        if [ -d /home/$MY_USERNAME/Desktop ]; then
839
+            MESH_DESKTOP_BACKGROUND_IMAGE=/usr/local/share/${PROJECT_NAME}_mesh_background.png
840
+            cp $MESH_DESKTOP_BACKGROUND_IMAGE /usr/share/images/desktop-base/${PROJECT_NAME}_mesh_background.png
841
+            rm /usr/share/images/desktop-base/desktop-background
842
+            ln -s /usr/share/images/desktop-base/${PROJECT_NAME}_mesh_background.png /usr/share/images/desktop-base/desktop-background
843
+        fi
836 844
         reboot
837 845
     fi
838 846
 fi

+ 20
- 20
website/EN/mesh.html Wyświetl plik

@@ -3,7 +3,7 @@
3 3
 "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
4 4
 <html xmlns="http://www.w3.org/1999/xhtml" lang="en" xml:lang="en">
5 5
 <head>
6
-<!-- 2016-08-31 Wed 12:14 -->
6
+<!-- 2016-08-31 Wed 14:18 -->
7 7
 <meta http-equiv="Content-Type" content="text/html;charset=utf-8" />
8 8
 <meta name="viewport" content="width=device-width, initial-scale=1" />
9 9
 <title></title>
@@ -256,12 +256,12 @@ for the JavaScript code in this tag.
256 256
 Mesh networks are useful as a quick way to make a fully decentralised communications system which is not connected to or reliant upon the internet. Think festivals, hacker conferences, onboard ships at sea, disaster/war zones, small business internal office communications, protests, remote areas of the world, temporary "digital blackouts", scientific expeditions and off-world space colonies. The down side is that you can't access any internet content. The upside is that you can securely communicate with anyone on the local mesh. No ISPs. No payments or subscriptions beyond the cost of obtaining the hardware. Systems need to be within wifi range of each other for the mesh to be created. It can be an ultra-convenient way to do purely local communications.
257 257
 </p>
258 258
 
259
-<div id="outline-container-org06bccd9" class="outline-2">
260
-<h2 id="org06bccd9">Ready made images</h2>
261
-<div class="outline-text-2" id="text-org06bccd9">
262
-</div><div id="outline-container-org4c2c622" class="outline-3">
263
-<h3 id="org4c2c622">Client images</h3>
264
-<div class="outline-text-3" id="text-org4c2c622">
259
+<div id="outline-container-org092f9d1" class="outline-2">
260
+<h2 id="org092f9d1">Ready made images</h2>
261
+<div class="outline-text-2" id="text-org092f9d1">
262
+</div><div id="outline-container-orgbbb82fc" class="outline-3">
263
+<h3 id="orgbbb82fc">Client images</h3>
264
+<div class="outline-text-3" id="text-orgbbb82fc">
265 265
 <p>
266 266
 "Client" isn't exactly the right term, but it's a mesh peer with a user interface. These images can be copied to a USB drive, then you can plug it into a laptop/netbook/desktop machine and boot from it. You will probably also need an Atheros USB wifi dongle, because most built-in wifi usually requires proprietary firmware. In the commands below substitute /dev/sdX with the USB drive device, excluding any trailing numbers (eg. /dev/sdb).
267 267
 </p>
@@ -302,16 +302,16 @@ sudo dd <span class="org-variable-name">bs</span>=1M <span class="org-variable-n
302 302
 </div>
303 303
 </div>
304 304
 
305
-<div id="outline-container-org4c09853" class="outline-3">
306
-<h3 id="org4c09853">Router images</h3>
307
-<div class="outline-text-3" id="text-org4c09853">
305
+<div id="outline-container-orge3a4e42" class="outline-3">
306
+<h3 id="orge3a4e42">Router images</h3>
307
+<div class="outline-text-3" id="text-orge3a4e42">
308 308
 <p>
309 309
 Routers are intended to build network coverage for an area using small and low cost hardware. You can bolt them to walls or leave them on window ledges. They don't have any user interface and their only job is to haul network traffic across the mesh. Copy the image to a microSD card and insert it into the router, plug in an Atheros wifi dongle and power on. That should be all you need to do.
310 310
 </p>
311 311
 </div>
312
-<div id="outline-container-orgfd163b9" class="outline-4">
313
-<h4 id="orgfd163b9">Beaglebone Black</h4>
314
-<div class="outline-text-4" id="text-orgfd163b9">
312
+<div id="outline-container-org5ab7672" class="outline-4">
313
+<h4 id="org5ab7672">Beaglebone Black</h4>
314
+<div class="outline-text-4" id="text-org5ab7672">
315 315
 <div class="org-src-container">
316 316
 
317 317
 <pre class="src src-bash">sudo apt-get install xz-utils wget
@@ -333,9 +333,9 @@ If you have a few Beaglebone Blacks to use as routers then repeat the <i>dd</i>
333 333
 </div>
334 334
 </div>
335 335
 
336
-<div id="outline-container-org7bcac50" class="outline-2">
337
-<h2 id="org7bcac50">To build the disk image yourself</h2>
338
-<div class="outline-text-2" id="text-org7bcac50">
336
+<div id="outline-container-orgfbacb16" class="outline-2">
337
+<h2 id="orgfbacb16">To build the disk image yourself</h2>
338
+<div class="outline-text-2" id="text-orgfbacb16">
339 339
 <p>
340 340
 It's better not to trust images downloaded from random places on the interwebs. Chances are that unless you are in the web of trust of the above GPG signatures then they don't mean very much to you. If you actually want something trustworthy then build the images from scratch. It will take some time. Here's how to do it.
341 341
 </p>
@@ -426,9 +426,9 @@ The resulting image can be copied to a microSD card, inserted into a Beaglebone
426 426
 </div>
427 427
 </div>
428 428
 
429
-<div id="outline-container-orgaff7264" class="outline-2">
430
-<h2 id="orgaff7264">How to use it</h2>
431
-<div class="outline-text-2" id="text-orgaff7264">
429
+<div id="outline-container-orgb1a953b" class="outline-2">
430
+<h2 id="orgb1a953b">How to use it</h2>
431
+<div class="outline-text-2" id="text-orgb1a953b">
432 432
 <p>
433 433
 When you first boot from the USB drive the system will create some encryption keys, assign a unique network address to the system and then reboot itself. When that's done you should see a prompt asking for a username. This username just makes it easy for others to initially find you on the mesh and will appear in the list of users.
434 434
 </p>
@@ -482,7 +482,7 @@ And by selecting the user from the list on the left hand side the chat can begin
482 482
 </div>
483 483
 
484 484
 <p>
485
-One important point is that by default sound and microphone is turned off. In the top right corner of the screen you can increase the sound volume and enable the microphone if you're doing voice chat or need audible notifications.
485
+One important point is that by default the microphone is turned off. When doing voice chat you can select the microphone volume with the drop down slider in the top right corner of the screen.
486 486
 </p>
487 487
 
488 488
 <p>