Skip to content

Commit ff282f2

Browse files
committed
More reformatting
1 parent dab188c commit ff282f2

File tree

15 files changed

+234
-259
lines changed

15 files changed

+234
-259
lines changed

docs/SiNE.md

Lines changed: 18 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
1-
![](/images/800px-SiNE_Front_Angle.JPG "SiNE Front Angle")
1+
**S**iNE: **I**nvestigating the **N**eighbourhood of **E**MW
2+
3+
![](images/800px-SiNE_Front_Angle.jpeg "SiNE Front Angle")
24

35
## About SiNE
46

5-
SiNE: Investigating the Neighbourhood of EMW
67
Each attendee of Electromagnetic Wave receives a SiNE badge which has
78
two purposes; firstly it allows you to take part in a treasure hunt
89
based around the boat. By solving the clues you will be directed to an
@@ -32,10 +33,7 @@ preserved even if you remove the power
3233

3334
#### Clue List
3435

35-
Now EMWave has past here is the clue list: (Will add answers soon
36-
--<a href="User:Dpslwk" class="wikilink" title="Dpslwk">Dpslwk</a>
37-
(<a href="User_talk:Dpslwk" class="wikilink" title="talk">talk</a>)
38-
14:21, 6 May 2013 (UTC))
36+
Now EMWave has passed here is the clue list:
3937

4038
- A: I can't believe it's not butter!
4139
- B: Bond would be comfortable here and he has a licence.
@@ -60,14 +58,16 @@ Now EMWave has past here is the clue list: (Will add answers soon
6058

6159
### Locator ID
6260

63-
![](800px-SiNE_Front_Buttons.jpeg "800px-SiNE_Front_Buttons.jpeg") Each
61+
<!-- BC: AFAICT these images are *gone* unless we have a backup of the 2012 wiki
62+
![](../images/800px-SiNE_Front_Buttons.jpeg "800px-SiNE_Front_Buttons.jpeg") -->
63+
Each
6464
badge is programmed with a unique ID, that is transmitted about 5 times
6565
a second. There will be Raspberry Pi's doted around the ship, collecting
6666
data.
6767
EMF will not know your badge ID, as there are handed out at random.
6868
A badge's ID is shown on the LED using binary encoding. This is done at
6969
power up, or by pressing and holding the "ID" button
70-
If you **do not** wish to have your badge trasnmitting an ID you can
70+
If you **do not** wish to have your badge transmitting an ID you can
7171
clear it by holding the "Erase" button for about 5 seconds.
7272

7373
The badge ID is 9 bit's long, these are displayed across the A-I LED's,
@@ -78,14 +78,11 @@ Example if LED's A D E and H are lit then we have 010011001 in binary or
7878
Unfortunately due to a lack of time the Raspberry Pi's were never setup,
7979
as so no data was collected.
8080

81-
<div style="clear: both">
82-
83-
</div>
84-
8581
## Sponsors
8682

87-
![](800px-SiNE_Back_Angle.JPG "800px-SiNE_Back_Angle.JPG") SiNE was only
88-
possible thanks to our sponsors:
83+
<!-- BC: AFAICT these images are *gone* unless we have a backup of the 2012 wiki
84+
![](../images/800px-SiNE_Back_Angle.JPG "800px-SiNE_Back_Angle.JPG") -->
85+
SiNE was only possible thanks to our sponsors:
8986

9087
- [Twilio](http://www.twilio.com) A Cloud communications company
9188
sponsored the parts need to make badges.
@@ -99,7 +96,9 @@ possible thanks to our sponsors:
9996

10097
### DevBoards
10198

102-
![](DevBoards.JPG "DevBoards.JPG") Before designing the final SiNE badge
99+
<!-- BC: AFAICT these images are *gone* unless we have a backup of the 2012 wiki
100+
![](../images/DevBoards.JPG "DevBoards.JPG") -->
101+
Before designing the final SiNE badge
103102
we built three development boards, not bothered about the looks, they
104103
were built to test the hardware and wiring between the parts.
105104
Once it was confirmed that the parts worked together they were passed
@@ -108,19 +107,16 @@ scavenger hunt and location tracking.
108107
Using these development boards meant the software was ready to go around
109108
the same time as the final badges were produced.
110109

111-
<div style="clear: both">
112-
113-
</div>
114-
115110
## Badge Hacking
116111

117-
![](800px-SiNE_Schematic.png "800px-SiNE_Schematic.png") We actively
118-
encourage users to hack there badge better and hope the information
112+
<!-- BC: AFAICT these images are *gone* unless we have a backup of the 2012 wiki
113+
![](../images/800px-SiNE_Schematic.png "800px-SiNE_Schematic.png") -->
114+
We actively encourage users to hack their badge better and hope the information
119115
provided below will help
120116

121117
### Flashing and Fuses
122118

123-
We use avrdude and an ISP programer to flash the ATTiny44A Example
119+
We use avrdude and an ISP programmer to flash the ATTiny44A Example
124120
command lines can be found in the Makefile in the SiNE-Firmware github
125121

126122
avrdude part flag (-p) is t44
@@ -148,6 +144,3 @@ The following parts were used: (data-sheet links to come)
148144

149145
- [PCB](https://github.com/EMF-TiLDA/SiNE-PCB)
150146
- [Firmware](https://github.com/EMF-TiLDA/SiNE-Firmware)
151-
152-
<a href="Category:Badges" class="wikilink"
153-
title="Category:Badges">Category:Badges</a>

docs/TiLDA_MK3/Badge16_Ideas.md

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
This was our original list of ideas and plans for the 2016 badge and is preserved
2+
here for historical interest
3+
14
## Software
25

36
- Interpreter for high level functionality
@@ -59,4 +62,4 @@
5962
- supply little bags of LEDs and thread for say £2
6063
- extra GPIO broken out
6164
- ardiuno footprint?
62-
- python/LUA would allow for beginners to hack the badge
65+
- python/LUA would allow for beginners to hack the badge

docs/TiLDA_MK3/Ideas.md

Lines changed: 8 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -6,26 +6,21 @@ page for the project and link it here.
66

77
### Small things
88

9-
\- Replace snake's block colours with images
10-
11-
\- Accelerometer ball bounce
12-
13-
\- Network synced clock
9+
- Replace snake's block colours with images
10+
- Accelerometer ball bounce
11+
- Network synced clock
1412

1513
### Larger projects
1614

17-
\- IRC relay
18-
19-
-Location based on wifi RSSI ( badge team are looking for someone to
15+
- IRC relay
16+
- Location based on wifi RSSI ( badge team are looking for someone to
2017
write a good library for this)
21-
22-
\- [High altitude balloon
18+
- [High altitude balloon
2319
tracker](https://badge.emfcamp.org/wiki/TiLDA_MK3/Ideas/hab)
2420

2521
## apps
2622

27-
\- Network Map for location approximation:
23+
- Network Map for location approximation:
2824
<a href="TiLDA_MK3/apps/nmap" class="wikilink"
2925
title="tilda-nmap">tilda-nmap</a>
30-
31-
\- Interactive python prompt
26+
- Interactive python prompt

docs/TiLDA_MK3/Introduction_to_badge_hacking.md

Lines changed: 49 additions & 53 deletions
Original file line numberDiff line numberDiff line change
@@ -8,19 +8,11 @@ You should have received an LED and a resistor with your badge. First,
88
grab the resistor. Bend the legs over so they fit in the holes in the
99
board, using the resistor lead bender.
1010

11-
<figure>
12-
<img src="Hackpad.com_Rs7awClTQDH_p.554927_1470420913282_legbender.jpg"
13-
title="Hackpad.com_Rs7awClTQDH_p.554927_1470420913282_legbender.jpg" />
14-
<figcaption>Hackpad.com_Rs7awClTQDH_p.554927_1470420913282_legbender.jpg</figcaption>
15-
</figure>
11+
![](../images/Hackpad.com_Rs7awClTQDH_p.554927_1470420913282_legbender.jpg)
1612

1713
It doesn't matter way round the resistor goes.
1814

19-
<figure>
20-
<img src="Hackpad.com_Rs7awClTQDH_p.554927_1470307053798_P1010517.jpg"
21-
title="Hackpad.com_Rs7awClTQDH_p.554927_1470307053798_P1010517.jpg" />
22-
<figcaption>Hackpad.com_Rs7awClTQDH_p.554927_1470307053798_P1010517.jpg</figcaption>
23-
</figure>
15+
![](../images/Hackpad.com_Rs7awClTQDH_p.554927_1470307053798_P1010517.jpg)
2416

2517
Flip over your board and solder the resistor in place, then trim down
2618
the legs to be flush against the board.
@@ -29,11 +21,7 @@ Next, the LED. It does matter which way round the LED goes - look for a
2921
flat side on the LED and match it up with the flat side on the board.
3022
Pull your LED out about a centimetre and bend it over a bit.
3123

32-
<figure>
33-
<img src="Hackpad.com_Rs7awClTQDH_p.554927_1470307470838_P1010533.jpg"
34-
title="Hackpad.com_Rs7awClTQDH_p.554927_1470307470838_P1010533.jpg" />
35-
<figcaption>Hackpad.com_Rs7awClTQDH_p.554927_1470307470838_P1010533.jpg</figcaption>
36-
</figure>
24+
![](../images/Hackpad.com_Rs7awClTQDH_p.554927_1470307470838_P1010533.jpg)
3725

3826
Flip the board over and solder the LED into place.
3927

@@ -47,9 +35,11 @@ because you'll see three \> symbols.
4735

4836
Type the following at the prompt. This should turn your LED on!
4937

50-
`import pyb`
51-
`pin = pyb.Pin("LED_TORCH")`
52-
`pin.high()`
38+
```python
39+
import pyb
40+
pin = pyb.Pin("LED_TORCH")
41+
pin.high()
42+
```
5343

5444
Of course, thats a bit of a pain to do every time we want the LED on, so
5545
let's make an app!
@@ -65,53 +55,59 @@ file. Open it in a text editor.
6555
First, we need to tell the badge some details about your app. This is
6656
done in a header section at the top of the file
6757

68-
`# Author: Your Name `
69-
`# Description: Torch `
70-
`# Category: Flashy `
71-
`# License: MIT `
72-
`# Appname : Torch `
73-
`# Built-in: no `
58+
```python
59+
# Author: Your Name 
60+
# Description: Torch 
61+
# Category: Flashy 
62+
# License: MIT 
63+
# Appname : Torch 
64+
# Built-in: no 
65+
```
7466

7567
You could save and run your app now, but it wont actually do anything
7668
yet. Lets add the code:
7769

78-
`# Author: Your Name `
79-
`# Description: Torch `
80-
`# Category: Flashy `
81-
`# License: MIT `
82-
`# Appname : Torch `
83-
`# Built-in: no `
84-
85-
`import pyb`
86-
`pin = pyb.Pin("LED_TORCH")`
87-
`pin.high() `
88-
`while True:`
89-
`  pass`
70+
```python
71+
# Author: Your Name 
72+
# Description: Torch 
73+
# Category: Flashy 
74+
# License: MIT 
75+
# Appname : Torch 
76+
# Built-in: no 
77+
78+
import pyb
79+
pin = pyb.Pin("LED_TORCH")
80+
pin.high() 
81+
while True:
82+
  pass
83+
```
9084

9185
Save, and run your app. When you run it the LED should turn on, brill!
9286

9387
Of course, we're not showing anything on the screen. Lets have a nice
9488
notice box to show we're in the torch instead of that while loop.
9589

96-
`# Author: Your Name `
97-
`# Description: Torch `
98-
`# Category: Flashy `
99-
`# License: MIT `
100-
`# Appname : Torch `
101-
`# Built-in: no `
102-
103-
`import pyb`
104-
`import ugfx`
105-
`import dialogs`
106-
107-
`pin = pyb.Pin("LED_TORCH")`
108-
`pin.high() `
109-
`ugfx.init()`
110-
`ugfx.clear(ugfx.html_color(0x7c1143))`
111-
`dialogs.notice("Shine a light!", title="Torch", close_text="Exit")`
90+
```python
91+
# Author: Your Name 
92+
# Description: Torch 
93+
# Category: Flashy 
94+
# License: MIT 
95+
# Appname : Torch 
96+
# Built-in: no 
97+
98+
import pyb
99+
import ugfx
100+
import dialogs
101+
102+
pin = pyb.Pin("LED_TORCH")
103+
pin.high() 
104+
ugfx.init()
105+
ugfx.clear(ugfx.html_color(0x7c1143))
106+
dialogs.notice("Shine a light!"title="Torch"close_text="Exit")
107+
```
112108

113109
Run your app again and you should have a nice button you can press to
114110
shine a light in the camp!
115111

116112
You can unplug the badge from your computer when the LED has finished
117-
flashing, but we recommend you eject the drive first.
113+
flashing, but we recommend you eject the drive first.

docs/TiLDA_MK3/adc.md

Lines changed: 17 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -6,23 +6,29 @@ All ADC readings are referenced to the supply rail, which is about 3.3V.
66
To increase the ADC accuracy, the internal voltage reference can be
77
read, and used to offset variations in the supply rail.
88

9-
adcin = pyb.ADC(channel_to_read).read()
10-
ref_reading = pyb.ADC(0).read()
11-
supply_voltage = 4095/ref_reading*1.21 # or change 1.21 with the calibrated value - see below
12-
adc_voltage = adcin / 4095 * supply_voltage
9+
```python
10+
adcin = pyb.ADC(channel_to_read).read()
11+
ref_reading = pyb.ADC(0).read()
12+
supply_voltage = 4095/ref_reading*1.21 # or change 1.21 with the calibrated value - see below
13+
adc_voltage = adcin / 4095 * supply_voltage
14+
```
1315

1416
Note, the factory reads the internal reference with a supply voltage of
1517
3.0V, and stores this reading. This can then be used to get the actual
1618
voltage reference. For example
1719

18-
import stm
19-
factory_reading = stm.mem16[0x1FFF75AA]
20-
reference_voltage = factory_reading/4095*3 # will be approximately 1.21V
20+
```python
21+
import stm
22+
factory_reading = stm.mem16[0x1FFF75AA]
23+
reference_voltage = factory_reading/4095*3 # will be approximately 1.21V
24+
```
2125

2226
For convenience, the library \`onboard' provides the following functions
2327
for reading the battery voltage, unregulated voltage, or light level
2428

25-
import onboard
26-
onboard.get_battery_voltage()
27-
onboard.get_unreg_voltage()
28-
onboard.get_light()
29+
```python
30+
import onboard
31+
onboard.get_battery_voltage()
32+
onboard.get_unreg_voltage()
33+
onboard.get_light()
34+
```

docs/TiLDA_MK3/apps.md

Lines changed: 0 additions & 6 deletions
This file was deleted.

docs/TiLDA_MK3/memory_problems.md

Lines changed: 0 additions & 4 deletions
This file was deleted.

docs/TiLDA_MK3/modtilda.md

Lines changed: 0 additions & 2 deletions
This file was deleted.

docs/TiLDA_MK3/rtc.md

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,16 @@ docs
33
[1](https://docs.micropython.org/en/latest/pyboard/library/pyb.RTC.html)
44
for more information.
55

6-
# Create a RTC object
7-
rtc = pyb.RTC()
6+
```python
7+
# Create a RTC object
8+
rtc = pyb.RTC()
89

9-
# If the RTC isn't running, call
10-
rtc.init()
10+
# If the RTC isn't running, call
11+
rtc.init()
1112

12-
# Set the time
13-
rtc.datetime((2016, 5, 1, 4, 13, 0, 0, 0))
13+
# Set the time
14+
rtc.datetime((2016, 5, 1, 4, 13, 0, 0, 0))
1415

15-
# Get the time
16-
print(rtc.datetime())
16+
# Get the time
17+
print(rtc.datetime())
18+
```

0 commit comments

Comments
 (0)