Merge branch 'master' into simplified-eventing

Conflicts:
	inc/MicroBitMessageBus.h
This commit is contained in:
Joe Finney 2015-10-18 18:20:03 +01:00
commit 424b825185
56 changed files with 12475 additions and 370 deletions

3
CHANGES.md Normal file
View file

@ -0,0 +1,3 @@
# micro:bit BLE profile : Changes
See ble _ issue _ tracker.md for Bluetooth Low Energy profile related issues

Binary file not shown.

Binary file not shown.

View file

@ -0,0 +1,259 @@
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
<html lang="en">
<head><title>Bluetooth Developer Studio - Level 1 Profile Report</title>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
<link rel="stylesheet" type="text/css" href="style.css" />
<script language="javascript" type="text/javascript" src="functions.js"></script>
</head>
<body onLoad="init()">
<div id="id_container" class="container">
<div class="main_heading">
<div id="id_date" class="date">The Date</div>
<div class="heading_title">Bluetooth Developer Studio Level 1 Profile Report</div>
<div class="icon"><img src="BluetoothSIG.png"/></div>
</div>
<!-- Profile Block -->
<div class="section_hdg">
<div class="profile_hdg_text"><p>PROFILE</p></div>
</div>
<div class="profile_item">
<div class="profile_label">Profile Name</div>
</div>
<div class="profile_item">
<div class="profile_value">BBC MICROBIT</div>
</div>
<div class="profile_item">
<div class="profile_label">Abstract:</div>
</div>
<div class="profile_item">
<div class="text_block"><pre>Default 'out of the box' profile for the BBC Micro Bit</pre></div>
</div>
<div class="profile_item">
<div class="profile_label">Summary:</div>
</div>
<div class="profile_item">
<div class="text_block"><pre>Version 1.6 - 17th October 2015
Removed the Battery Service. No way to establish battery levels on the micro:bit
Added a simple Temperature Service to exploit temperature sensors in micro:bit processors with Temperature and Temperature Period characteristics.
Accelerometer and Magnetometer period characteristics now have uint16 fields instead of uint8 which required scaling up by multipling by 10.
Accelerometer Data and Magnetometer Data characteristics now use signed 16 bit integer fields for each of their X, Y and Z parts.
Accelerometer Data and Magnetometer Data characteristics now use signed 16 bit integer fields for each of their X, Y and Z parts.
New characteristic Magnetometer Heading added to the Magnetometer Service. Provides current heading in degrees.
Removed IO Parallel Port characteristic due to complexity and memory considerations.
Added Generic Attribute Service (previously absent in the repository)
Changed the LED Matrix State characteristic field so that we now have one octet per row of LEDs for ease of use.
Version 1.5 - 10th September 2015
Button State 2 characteristic given new, distinct UUID of E95DDA91-251D-470A-A062-FA1922DFA9A8
Removed the System LED State characteristic from the LED Service since it cannot be controlled from the BLE MCU.
Removed the Scrolling State characteristic from the LED Service due to complexity and memory constraints.
Changed LED Matrix State use of “Write Without Response” to “Write” so that no further writes can be made until theres been an ACK back from the previous one.
Removed Write property from MicroBit Requirements characteristic.</pre></div>
</div>
<div class="profile_item">
<div class="profile_label">Base UUID</div>
<div class="profile_value">E95D0000251D470AA062FA1922DFA9A8</div>
</div>
<div class="profile_item">
<div class="profile_label">Server Role</div>
<div class="profile_value"></div>
</div>
<div class="profile_item">
<div class="profile_label">Client Role</div>
<div class="profile_value"></div>
</div>
<!-- End of Profile Block -->
<!-- Services Section -->
<div class="services_section_hdg">
<div class="services_hdg_text"><p>SERVICES</p></div>
</div>
<!-- Service Block -->
<div class="service_hdg">
<div><p class="service_hdg_text1">Generic Access</p></div>
<div class="service_hdg_text2"><p>0000180000001000800000805F9B34FB</p></div>
</div>
<div class="characteristic_hdg">
<div class="characteristic_summary"><p>Device Name : 00002A0000001000800000805F9B34FB</p></div>
</div>
<div class="characteristic_hdg">
<div class="characteristic_summary"><p>Appearance : 00002A0100001000800000805F9B34FB</p></div>
</div>
<div class="characteristic_hdg">
<div class="characteristic_summary"><p>Peripheral Preferred Connection Parameters : 00002A0400001000800000805F9B34FB</p></div>
</div>
<!-- Service Block -->
<div class="service_hdg">
<div><p class="service_hdg_text1">Generic Attribute</p></div>
<div class="service_hdg_text2"><p>0000180100001000800000805F9B34FB</p></div>
</div>
<div class="characteristic_hdg">
<div class="characteristic_summary"><p>Service Changed : 2A05</p></div>
</div>
<!-- Service Block -->
<div class="service_hdg">
<div><p class="service_hdg_text1">Device Information</p></div>
<div class="service_hdg_text2"><p>0000180A00001000800000805F9B34FB</p></div>
</div>
<div class="characteristic_hdg">
<div class="characteristic_summary"><p>Manufacturer Name String : 00002A2900001000800000805F9B34FB</p></div>
</div>
<div class="characteristic_hdg">
<div class="characteristic_summary"><p>Model Number String : 00002A2400001000800000805F9B34FB</p></div>
</div>
<div class="characteristic_hdg">
<div class="characteristic_summary"><p>Serial Number String : 00002A2500001000800000805F9B34FB</p></div>
</div>
<div class="characteristic_hdg">
<div class="characteristic_summary"><p>Hardware Revision String : 00002A2700001000800000805F9B34FB</p></div>
</div>
<div class="characteristic_hdg">
<div class="characteristic_summary"><p>Firmware Revision String : 00002A2600001000800000805F9B34FB</p></div>
</div>
<div class="characteristic_hdg">
<div class="characteristic_summary"><p>Software Revision String : 00002A2800001000800000805F9B34FB</p></div>
</div>
<!-- Service Block -->
<div class="service_hdg">
<div><p class="service_hdg_text1">ACCELEROMETER SERVICE</p></div>
<div class="service_hdg_text2"><p>E95D0753251D470AA062FA1922DFA9A8</p></div>
</div>
<div class="characteristic_hdg">
<div class="characteristic_summary"><p>Accelerometer Data : E95DCA4B251D470AA062FA1922DFA9A8</p></div>
</div>
<div class="characteristic_hdg">
<div class="characteristic_summary"><p>Accelerometer Period : E95DFB24251D470AA062FA1922DFA9A8</p></div>
</div>
<!-- Service Block -->
<div class="service_hdg">
<div><p class="service_hdg_text1">MAGNETOMETER SERVICE</p></div>
<div class="service_hdg_text2"><p>E95DF2D8251D470AA062FA1922DFA9A8</p></div>
</div>
<div class="characteristic_hdg">
<div class="characteristic_summary"><p>Magnetometer Data : E95DFB11251D470AA062FA1922DFA9A8</p></div>
</div>
<div class="characteristic_hdg">
<div class="characteristic_summary"><p>Magnetometer Period : E95D386C251D470AA062FA1922DFA9A8</p></div>
</div>
<div class="characteristic_hdg">
<div class="characteristic_summary"><p>Magnetometer Bearing : E95D9715251D470AA062FA1922DFA9A8</p></div>
</div>
<!-- Service Block -->
<div class="service_hdg">
<div><p class="service_hdg_text1">Button Service</p></div>
<div class="service_hdg_text2"><p>E95D9882251D470AA062FA1922DFA9A8</p></div>
</div>
<div class="characteristic_hdg">
<div class="characteristic_summary"><p>Button 1 State : E95DDA90251D470AA062FA1922DFA9A8</p></div>
</div>
<div class="characteristic_hdg">
<div class="characteristic_summary"><p>Button 2 State : E95DDA91251D470AA062FA1922DFA9A8</p></div>
</div>
<!-- Service Block -->
<div class="service_hdg">
<div><p class="service_hdg_text1">IO PIN SERVICE</p></div>
<div class="service_hdg_text2"><p>E95D127B251D470AA062FA1922DFA9A8</p></div>
</div>
<div class="characteristic_hdg">
<div class="characteristic_summary"><p>Pin Data : E95D8D00251D470AA062FA1922DFA9A8</p></div>
</div>
<div class="characteristic_hdg">
<div class="characteristic_summary"><p>Pin AD Configuration : E95D5899251D470AA062FA1922DFA9A8</p></div>
</div>
<div class="characteristic_hdg">
<div class="characteristic_summary"><p>Pin IO Configuration : E95DB9FE251D470AA062FA1922DFA9A8</p></div>
</div>
<!-- Service Block -->
<div class="service_hdg">
<div><p class="service_hdg_text1">LED SERVICE</p></div>
<div class="service_hdg_text2"><p>E95DD91D251D470AA062FA1922DFA9A8</p></div>
</div>
<div class="characteristic_hdg">
<div class="characteristic_summary"><p>LED Matrix State : E95D7B77251D470AA062FA1922DFA9A8</p></div>
</div>
<div class="characteristic_hdg">
<div class="characteristic_summary"><p>LED Text : E95D93EE251D470AA062FA1922DFA9A8</p></div>
</div>
<div class="characteristic_hdg">
<div class="characteristic_summary"><p>Scrolling Delay : E95D0D2D251D470AA062FA1922DFA9A8</p></div>
</div>
<!-- Service Block -->
<div class="service_hdg">
<div><p class="service_hdg_text1">EVENT SERVICE</p></div>
<div class="service_hdg_text2"><p>E95D93AF251D470AA062FA1922DFA9A8</p></div>
</div>
<div class="characteristic_hdg">
<div class="characteristic_summary"><p>MicroBit Requirements : E95DB84C251D470AA062FA1922DFA9A8</p></div>
</div>
<div class="characteristic_hdg">
<div class="characteristic_summary"><p>MicroBit Event : E95D9775251D470AA062FA1922DFA9A8</p></div>
</div>
<div class="characteristic_hdg">
<div class="characteristic_summary"><p>Client Requirements : E95D23C4251D470AA062FA1922DFA9A8</p></div>
</div>
<div class="characteristic_hdg">
<div class="characteristic_summary"><p>Client Event : E95D5404251D470AA062FA1922DFA9A8</p></div>
</div>
<!-- Service Block -->
<div class="service_hdg">
<div><p class="service_hdg_text1">DFU CONTROL SERVICE</p></div>
<div class="service_hdg_text2"><p>E95D93B0251D470AA062FA1922DFA9A8</p></div>
</div>
<div class="characteristic_hdg">
<div class="characteristic_summary"><p>DFU Control : E95D93B1251D470AA062FA1922DFA9A8</p></div>
</div>
<div class="characteristic_hdg">
<div class="characteristic_summary"><p>DFU Flash Code : E95D93B2251D470AA062FA1922DFA9A8</p></div>
</div>
<!-- Service Block -->
<div class="service_hdg">
<div><p class="service_hdg_text1">TEMPERATURE SERVICE</p></div>
<div class="service_hdg_text2"><p>E95D6100251D470AA062FA1922DFA9A8</p></div>
</div>
<div class="characteristic_hdg">
<div class="characteristic_summary"><p>Temperature : E95D9250251D470AA062FA1922DFA9A8</p></div>
</div>
<div class="characteristic_hdg">
<div class="characteristic_summary"><p>Temperature Period : E95D1B25251D470AA062FA1922DFA9A8</p></div>
</div>
</div>
</body>
</html>

Binary file not shown.

After

Width:  |  Height:  |  Size: 6.9 KiB

View file

@ -0,0 +1,5 @@
function init() {
var d = new Date();
var n = d.toLocaleDateString();
document.getElementById("id_date").innerHTML = n;
}

463
docs/Report 1/style.css Normal file
View file

@ -0,0 +1,463 @@
html,body {
height: 100%;
}
* {
padding: 0;
margin: 0;
}
body {
background-color: #ffffff;
padding: 0px;
margin: 0px;
font-family: "lucida sans", verdana, arial, helvetica, sans-serif;
font-size: 75%;
}
p
{
padding-left:5px;
}
.centred_text {
text-align:center
}
/* 8 pixels included for border width 1 between panels */
.container {
background-color: #FFFFFF;
width: 1280px;
margin: 0 auto;
}
.main_heading {
width: 1280px;
line-height: 79px;
height: 79px;
float:left;
font-size: 18px;
font-weight:bold;
color:#000000;
}
.date {
width: 100px;
line-height: 79px;
height: 79px;
float:left;
}
.heading_title {
width: 980px;
line-height: 79px;
height: 79px;
float:left;
text-align:center;
}
.icon {
width: 200px;
line-height: 79px;
height: 79;
float:left;
}
.section_hdg {
float:left;
width:1280px;
height:33px;
border-width: 1px;
border-style: solid;
border-color: #FFFFFF;
}
/* setting line-height to equal the height property causes the text to be centred vertically */
.profile_hdg_text {
font-size: 18px;
font-weight:bold;
color:#ffffff;
float:left;
width:1280px;
height:33px;
line-height: 33px;
background-color: #4F81BD
}
.profile_item {
float:left;
width:1265px;
border-width: 1px;
border-style: solid;
border-color: #FFFFFF;
padding-left: 15px;
background-color: #66CCFF
}
.profile_label {
width: 300px;
font-size: 14px;
font-weight:bold;
line-height: 33px;
height: 33px;
float:left;
}
.profile_value {
font-size: 14px;
line-height: 33px;
height: 33px;
float:left;
}
.text_block {
font-size: 14px;
float:left;
padding-top: 5px;
padding-bottom: 5px;
}
.services_section_hdg {
float:left;
width:1280px;
height:33px;
border-width: 1px;
border-style: solid;
border-color: #FFFFFF;
padding-top: 15px
}
.services_hdg_text {
font-size: 18px;
font-weight:bold;
color:#ffffff;
float:left;
width:1280px;
height:33px;
line-height: 33px;
background-color: #21610B;
}
.service_hdg {
float:left;
width:1280px;
height:33px;
border-width: 1px;
border-style: solid;
border-color: #FFFFFF;
}
.service_hdg_text1 {
font-size: 18px;
font-weight:bold;
color:#ffffff;
float:left;
width:800px;
padding-left: 10px;
height:33px;
line-height: 33px;
background-color: #339933
}
.service_hdg_text2 {
font-size: 18px;
font-weight:bold;
color:#ffffff;
float:left;
width:470px;
height:33px;
line-height: 33px;
background-color: #339933
}
.service_item {
float:left;
width:1265px;
height:33px;
border-width: 1px;
border-style: solid;
border-color: #FFFFFF;
padding-left: 15px;
background-color: #00FFBF;
}
.service_label {
width: 300px;
font-size: 12px;
font-weight:bold;
line-height: 33px;
height: 33px;
float:left;
}
.service_value {
font-size: 12px;
line-height: 33px;
height: 33px;
float:left;
}
.characteristics_section_hdg {
float:left;
width:1280px;
height:33px;
border-width: 1px;
border-style: solid;
border-color: #FFFFFF;
}
.characteristics_hdg_text {
font-size: 18px;
font-weight:bold;
color:#ffffff;
float:left;
height:33px;
line-height: 33px;
background-color: #FF6633;
width:1265px;
padding-left: 15px;
}
.characteristic_hdg {
float:left;
width:1280px;
height:33px;
border-width: 1px;
border-style: solid;
border-color: #FFFFFF;
}
.characteristic_hdg_text {
font-size: 18px;
font-weight:bold;
color:#ffffff;
float:left;
width:1250px;
padding-left: 30px;
height:33px;
line-height: 33px;
background-color: #FFCC33
}
.characteristic_item {
float:left;
width:1280px;
height:33px;
border-width: 1px;
border-style: solid;
border-color: #FFFFFF;
background-color: #F5F6CE
}
.characteristic_summary {
float:left;
width:1250px;
height:33px;
line-height: 33px;
padding-left: 30px;
border-width: 1px;
border-style: solid;
border-color: #FFFFFF;
background-color: #F5F6CE
}
.characteristic_label {
width: 300px;
font-size: 12px;
font-weight:bold;
line-height: 33px;
height: 33px;
float:left;
padding-left: 45px;
}
.characteristic_value {
width: 935px;
font-size: 12px;
line-height: 33px;
height: 33px;
float:left;
}
.characteristic_field {
float:left;
width:1280px;
border-width: 1px;
border-style: solid;
border-color: #FFFFFF;
background-color: #F5F6CE;
padding-top: 10px;
}
.characteristic_field_label {
width: 300px;
font-size: 12px;
font-weight:bold;
min-height: 33px;
float:left;
padding-left: 45px;
}
.characteristic_field_value {
width: 935px;
font-size: 12px;
float:left;
}
.descriptors_section_hdg {
float:left;
width:1280px;
height:33px;
border-width: 1px;
border-style: solid;
border-color: #FFFFFF;
}
.descriptors_hdg_text {
font-size: 18px;
font-weight:bold;
color:#ffffff;
float:left;
height:33px;
line-height: 33px;
background-color: #6600CC;
width:1235px;
padding-left: 45px;
}
.descriptor_hdg {
float:left;
width:1280px;
height:33px;
border-width: 1px;
border-style: solid;
border-color: #FFFFFF;
}
.descriptor_hdg_text {
font-size: 18px;
font-weight:bold;
color:#ffffff;
float:left;
width:1230px;
padding-left: 50px;
height:33px;
line-height: 33px;
background-color: #BE81F7;
}
.descriptor_item {
float:left;
width:1280px;
height:33px;
border-width: 1px;
border-style: solid;
border-color: #FFFFFF;
background-color: #D8CEF6
}
.descriptor_label {
width: 300px;
font-size: 12px;
font-weight:bold;
line-height: 33px;
height: 33px;
float:left;
padding-left: 60px;
}
.descriptor_value {
width: 920px;
font-size: 12px;
line-height: 33px;
height: 33px;
float:left;
}
.char_fields_section_hdg {
float:left;
width:1280px;
height:33px;
border-width: 1px;
border-style: solid;
border-color: #FFFFFF;
}
.char_fields_hdg_text {
font-size: 18px;
font-weight:bold;
color:#ffffff;
float:left;
height:33px;
line-height: 33px;
background-color: #A4A4A4;
width:1235px;
padding-left: 45px;
}
.char_field_hdg {
float:left;
width:1280px;
height:33px;
border-width: 1px;
border-style: solid;
border-color: #FFFFFF;
}
.char_field_text {
font-size: 18px;
font-weight:bold;
color:#ffffff;
float:left;
width:1230px;
padding-left: 50px;
height:33px;
line-height: 33px;
background-color: #BE81F7;
}
.char_field_hdg_text {
font-size: 18px;
font-weight:bold;
color:#ffffff;
float:left;
width:1225px;
padding-left: 55px;
height:33px;
line-height: 33px;
background-color: #E6E6E6;
}
.char_field_item {
float:left;
width:1280px;
height:33px;
border-width: 1px;
border-style: solid;
border-color: #FFFFFF;
background-color: #FAFAFA
}
.char_field_label {
width: 300px;
font-size: 12px;
font-weight:bold;
line-height: 33px;
height: 33px;
float:left;
padding-left: 60px;
}
.char_field_value {
width: 920px;
font-size: 12px;
line-height: 33px;
height: 33px;
float:left;
}
.align_right
{
text-align: right;
}

File diff suppressed because it is too large Load diff

Binary file not shown.

After

Width:  |  Height:  |  Size: 6.9 KiB

View file

@ -0,0 +1,5 @@
function init() {
var d = new Date();
var n = d.toLocaleDateString();
document.getElementById("id_date").innerHTML = n;
}

467
docs/Report 2/style.css Normal file
View file

@ -0,0 +1,467 @@
html,body {
height: 100%;
}
* {
padding: 0;
margin: 0;
}
body {
background-color: #ffffff;
padding: 0px;
margin: 0px;
font-family: "lucida sans", verdana, arial, helvetica, sans-serif;
font-size: 75%;
}
p
{
padding-left:5px;
}
.centred_text {
text-align:center
}
/* 8 pixels included for border width 1 between panels */
.container {
background-color: #FFFFFF;
width: 1280px;
margin: 0 auto;
}
.main_heading {
width: 1280px;
line-height: 79px;
height: 79px;
float:left;
font-size: 18px;
font-weight:bold;
color:#000000;
}
.date {
width: 100px;
line-height: 79px;
height: 79px;
float:left;
}
.heading_title {
width: 980px;
line-height: 79px;
height: 79px;
float:left;
text-align:center;
}
.icon {
width: 200px;
line-height: 79px;
height: 79;
float:left;
}
.section_hdg {
float:left;
width:1280px;
height:33px;
border-width: 1px;
border-style: solid;
border-color: #FFFFFF;
}
/* setting line-height to equal the height property causes the text to be centred vertically */
.profile_hdg_text {
font-size: 18px;
font-weight:bold;
color:#ffffff;
float:left;
width:1280px;
height:33px;
line-height: 33px;
background-color: #4F81BD
}
.profile_item {
float:left;
width:1265px;
border-width: 1px;
border-style: solid;
border-color: #FFFFFF;
padding-left: 15px;
background-color: #66CCFF
}
.profile_label {
width: 300px;
font-size: 14px;
font-weight:bold;
line-height: 33px;
height: 33px;
float:left;
}
.profile_value {
font-size: 14px;
line-height: 33px;
height: 33px;
float:left;
}
.text_block {
font-size: 14px;
float:left;
padding-top: 5px;
padding-bottom: 5px;
}
.services_section_hdg {
float:left;
width:1280px;
height:33px;
border-width: 1px;
border-style: solid;
border-color: #FFFFFF;
padding-top: 15px
}
.services_hdg_text {
font-size: 18px;
font-weight:bold;
color:#ffffff;
float:left;
width:1280px;
height:33px;
line-height: 33px;
background-color: #21610B;
}
.service_hdg {
float:left;
width:1280px;
height:33px;
border-width: 1px;
border-style: solid;
border-color: #FFFFFF;
}
.service_hdg_text {
font-size: 18px;
font-weight:bold;
color:#ffffff;
float:left;
width:1270px;
padding-left: 10px;
height:33px;
line-height: 33px;
background-color: #339933
}
.service_item {
float:left;
width:1265px;
border-width: 1px;
border-style: solid;
border-color: #FFFFFF;
padding-left: 15px;
background-color: #00FFBF;
}
.service_label {
width: 300px;
font-size: 12px;
font-weight:bold;
line-height: 33px;
height: 33px;
float:left;
}
.service_value {
font-size: 12px;
line-height: 33px;
height: 33px;
float:left;
}
.characteristics_section_hdg {
float:left;
width:1280px;
height:33px;
border-width: 1px;
border-style: solid;
border-color: #FFFFFF;
}
.characteristics_hdg_text {
font-size: 18px;
font-weight:bold;
color:#ffffff;
float:left;
height:33px;
line-height: 33px;
background-color: #FF6633;
width:1265px;
padding-left: 15px;
}
.characteristic_hdg {
float:left;
width:1280px;
height:33px;
border-width: 1px;
border-style: solid;
border-color: #FFFFFF;
}
.characteristic_hdg_text {
font-size: 18px;
font-weight:bold;
color:#ffffff;
float:left;
width:1250px;
padding-left: 30px;
height:33px;
line-height: 33px;
background-color: #FFCC33
}
.characteristic_item {
float:left;
width:1280px;
border-width: 1px;
border-style: solid;
border-color: #FFFFFF;
background-color: #F5F6CE
}
.characteristic_summary {
float:left;
width:1250px;
height:33px;
line-height: 33px;
padding-left: 30px;
border-width: 1px;
border-style: solid;
border-color: #FFFFFF;
background-color: #F5F6CE
}
.characteristic_label {
width: 300px;
font-size: 12px;
font-weight:bold;
line-height: 33px;
height: 33px;
float:left;
padding-left: 45px;
}
.char_text_block {
font-size: 14px;
float:left;
padding-top: 5px;
padding-bottom: 5px;
padding-left: 45px;
}
.characteristic_value {
width: 935px;
font-size: 12px;
line-height: 33px;
height: 33px;
float:left;
}
.characteristic_field {
float:left;
width:1280px;
border-width: 1px;
border-style: solid;
border-color: #FFFFFF;
background-color: #F5F6CE;
padding-top: 10px;
}
.characteristic_field_label {
width: 300px;
font-size: 12px;
font-weight:bold;
min-height: 33px;
float:left;
padding-left: 45px;
}
.characteristic_field_value {
width: 935px;
font-size: 12px;
float:left;
}
.descriptors_section_hdg {
float:left;
width:1280px;
height:33px;
border-width: 1px;
border-style: solid;
border-color: #FFFFFF;
}
.descriptors_hdg_text {
font-size: 18px;
font-weight:bold;
color:#ffffff;
float:left;
height:33px;
line-height: 33px;
background-color: #6600CC;
width:1235px;
padding-left: 45px;
}
.descriptor_hdg {
float:left;
width:1280px;
height:33px;
border-width: 1px;
border-style: solid;
border-color: #FFFFFF;
}
.descriptor_hdg_text {
font-size: 18px;
font-weight:bold;
color:#ffffff;
float:left;
width:1230px;
padding-left: 50px;
height:33px;
line-height: 33px;
background-color: #BE81F7;
}
.descriptor_item {
float:left;
width:1280px;
height:33px;
border-width: 1px;
border-style: solid;
border-color: #FFFFFF;
background-color: #D8CEF6
}
.descriptor_label {
width: 300px;
font-size: 12px;
font-weight:bold;
line-height: 33px;
height: 33px;
float:left;
padding-left: 60px;
}
.descriptor_value {
width: 920px;
font-size: 12px;
line-height: 33px;
height: 33px;
float:left;
}
.char_fields_section_hdg {
float:left;
width:1280px;
height:33px;
border-width: 1px;
border-style: solid;
border-color: #FFFFFF;
}
.char_fields_hdg_text {
font-size: 18px;
font-weight:bold;
color:#ffffff;
float:left;
height:33px;
line-height: 33px;
background-color: #A4A4A4;
width:1235px;
padding-left: 45px;
}
.char_field_hdg {
float:left;
width:1280px;
height:33px;
border-width: 1px;
border-style: solid;
border-color: #FFFFFF;
}
.char_field_text {
font-size: 18px;
font-weight:bold;
color:#ffffff;
float:left;
width:1230px;
padding-left: 50px;
height:33px;
line-height: 33px;
background-color: #BE81F7;
}
.char_field_hdg_text {
font-size: 18px;
font-weight:bold;
color:#ffffff;
float:left;
width:1225px;
padding-left: 55px;
height:33px;
line-height: 33px;
background-color: #E6E6E6;
}
.char_field_item {
float:left;
width:1280px;
height:33px;
border-width: 1px;
border-style: solid;
border-color: #FFFFFF;
background-color: #FAFAFA
}
.char_field_label {
width: 300px;
font-size: 12px;
font-weight:bold;
line-height: 33px;
height: 33px;
float:left;
padding-left: 60px;
}
.char_field_value {
width: 920px;
font-size: 12px;
line-height: 33px;
height: 33px;
float:left;
}
.align_right
{
text-align: right;
}
.mandatory_property {
width: 935px;
font-size: 12px;
line-height: 33px;
height: 33px;
float:left;
font-weight:bold;
color:#ff0000;
}

File diff suppressed because it is too large Load diff

Binary file not shown.

After

Width:  |  Height:  |  Size: 6.9 KiB

View file

@ -0,0 +1,5 @@
function init() {
var d = new Date();
var n = d.toLocaleDateString();
document.getElementById("id_date").innerHTML = n;
}

467
docs/Report 3/style.css Normal file
View file

@ -0,0 +1,467 @@
html,body {
height: 100%;
}
* {
padding: 0;
margin: 0;
}
body {
background-color: #ffffff;
padding: 0px;
margin: 0px;
font-family: "lucida sans", verdana, arial, helvetica, sans-serif;
font-size: 75%;
}
p
{
padding-left:5px;
}
.centred_text {
text-align:center
}
/* 8 pixels included for border width 1 between panels */
.container {
background-color: #FFFFFF;
width: 1280px;
margin: 0 auto;
}
.main_heading {
width: 1280px;
line-height: 79px;
height: 79px;
float:left;
font-size: 18px;
font-weight:bold;
color:#000000;
}
.date {
width: 100px;
line-height: 79px;
height: 79px;
float:left;
}
.heading_title {
width: 980px;
line-height: 79px;
height: 79px;
float:left;
text-align:center;
}
.icon {
width: 200px;
line-height: 79px;
height: 79;
float:left;
}
.section_hdg {
float:left;
width:1280px;
height:33px;
border-width: 1px;
border-style: solid;
border-color: #FFFFFF;
}
/* setting line-height to equal the height property causes the text to be centred vertically */
.profile_hdg_text {
font-size: 18px;
font-weight:bold;
color:#ffffff;
float:left;
width:1280px;
height:33px;
line-height: 33px;
background-color: #4F81BD
}
.profile_item {
float:left;
width:1265px;
border-width: 1px;
border-style: solid;
border-color: #FFFFFF;
padding-left: 15px;
background-color: #66CCFF
}
.profile_label {
width: 300px;
font-size: 14px;
font-weight:bold;
line-height: 33px;
height: 33px;
float:left;
}
.profile_value {
font-size: 14px;
line-height: 33px;
height: 33px;
float:left;
}
.text_block {
font-size: 14px;
float:left;
padding-top: 5px;
padding-bottom: 5px;
}
.services_section_hdg {
float:left;
width:1280px;
height:33px;
border-width: 1px;
border-style: solid;
border-color: #FFFFFF;
padding-top: 15px
}
.services_hdg_text {
font-size: 18px;
font-weight:bold;
color:#ffffff;
float:left;
width:1280px;
height:33px;
line-height: 33px;
background-color: #21610B;
}
.service_hdg {
float:left;
width:1280px;
height:33px;
border-width: 1px;
border-style: solid;
border-color: #FFFFFF;
}
.service_hdg_text {
font-size: 18px;
font-weight:bold;
color:#ffffff;
float:left;
width:1270px;
padding-left: 10px;
height:33px;
line-height: 33px;
background-color: #339933
}
.service_item {
float:left;
width:1265px;
border-width: 1px;
border-style: solid;
border-color: #FFFFFF;
padding-left: 15px;
background-color: #00FFBF;
}
.service_label {
width: 300px;
font-size: 12px;
font-weight:bold;
line-height: 33px;
height: 33px;
float:left;
}
.service_value {
font-size: 12px;
line-height: 33px;
height: 33px;
float:left;
}
.characteristics_section_hdg {
float:left;
width:1280px;
height:33px;
border-width: 1px;
border-style: solid;
border-color: #FFFFFF;
}
.characteristics_hdg_text {
font-size: 18px;
font-weight:bold;
color:#ffffff;
float:left;
height:33px;
line-height: 33px;
background-color: #FF6633;
width:1265px;
padding-left: 15px;
}
.characteristic_hdg {
float:left;
width:1280px;
height:33px;
border-width: 1px;
border-style: solid;
border-color: #FFFFFF;
}
.characteristic_hdg_text {
font-size: 18px;
font-weight:bold;
color:#ffffff;
float:left;
width:1250px;
padding-left: 30px;
height:33px;
line-height: 33px;
background-color: #FFCC33
}
.characteristic_item {
float:left;
width:1280px;
border-width: 1px;
border-style: solid;
border-color: #FFFFFF;
background-color: #F5F6CE
}
.characteristic_summary {
float:left;
width:1250px;
height:33px;
line-height: 33px;
padding-left: 30px;
border-width: 1px;
border-style: solid;
border-color: #FFFFFF;
background-color: #F5F6CE
}
.characteristic_label {
width: 300px;
font-size: 12px;
font-weight:bold;
line-height: 33px;
height: 33px;
float:left;
padding-left: 45px;
}
.char_text_block {
font-size: 14px;
float:left;
padding-top: 5px;
padding-bottom: 5px;
padding-left: 45px;
}
.characteristic_value {
width: 935px;
font-size: 12px;
line-height: 33px;
height: 33px;
float:left;
}
.characteristic_field {
float:left;
width:1280px;
border-width: 1px;
border-style: solid;
border-color: #FFFFFF;
background-color: #F5F6CE;
padding-top: 10px;
}
.characteristic_field_label {
width: 300px;
font-size: 12px;
font-weight:bold;
min-height: 33px;
float:left;
padding-left: 45px;
}
.characteristic_field_value {
width: 935px;
font-size: 12px;
float:left;
}
.descriptors_section_hdg {
float:left;
width:1280px;
height:33px;
border-width: 1px;
border-style: solid;
border-color: #FFFFFF;
}
.descriptors_hdg_text {
font-size: 18px;
font-weight:bold;
color:#ffffff;
float:left;
height:33px;
line-height: 33px;
background-color: #6600CC;
width:1235px;
padding-left: 45px;
<