add irkit_3model.3dm & irkit_3model.stl

firmware/.gitignore

@@ -1,3 +1,4 @@
 .build/
 src/irkit/build-uno/
+src/irkit/version.c
 TAGS

firmware/ble112/attributes.txt

@@ -2,8 +2,11 @@ c_device_name 3
 c_appearance 6
 c_manufacturer_name 10
 c_model_number 13
-c_ir_data 17
-c_ir_unread_status 20
-c_ir_control_point 24
-c_ir_carrier_frequency 27
-c_ir_auth_status 30
+c_hardware_revision 16
+c_firmware_revision 19
+c_software_revision 22
+c_ir_data 26
+c_ir_unread_status 29
+c_ir_control_point 33
+c_ir_carrier_frequency 36
+c_ir_auth_status 39

firmware/ble112/build.log

@@ -6,7 +6,7 @@ UART channel:1
  error%     :0.135417
  alternate f:1
 ports:60
-C:/DOCUME~1/mash/LOCALS~1/Temp/qt_temp.Uh1840
+C:/DOCUME~1/mash/LOCALS~1/Temp/qt_temp.Uh2720
 0
 0
 
@@ -25,9 +25,9 @@ Core flash reserved             @ 0x18000   98304
 Top of flash                    @ 0x1f800  129024
 Flash left for data             = 0x07800   30720
 Common configuration            - 0x00070     112
-16 bit UUIDs                    - 0x00016      22
+16 bit UUIDs                    - 0x0001c      28
 128 bit UUIDs                   - 0x00060      96
-Attribute database              - 0x000c0     192
-Constant attributes data        - 0x001d6     470
+Attribute database              - 0x000f6     246
+Constant attributes data        - 0x00208     520
 USB descriptor                  - 0x000c6     198
 Flash for PS Store           14 - 0x07000   28672

firmware/ble112/gatt.xml

@@ -44,15 +44,37 @@
             <value>A</value>
         </characteristic>
 
+        <!-- 2A27: org.bluetooth.characteristic.hardware_revision_string -->
+        <characteristic uuid="2A27" id="c_hardware_revision">
+            <description>Hardware Revision</description>
+            <properties read="true" const="true" />
+            <value>1.0</value>
+        </characteristic>
+
+        <!-- 2A26: org.bluetooth.characteristic.firmware_revision_string -->
+        <!-- BLE112 firmware version (BLE112 SDK version, gatt.xml version) -->
+        <characteristic uuid="2A26" id="c_firmware_revision">
+            <description>Firmware Revision</description>
+            <properties read="true" const="true" />
+            <value>1.0</value>
+        </characteristic>
+
+        <!-- 2A28: org.bluetooth.characteristic.software_revision_string -->
+        <!-- AVR software version -->
+        <characteristic uuid="2A28" id="c_software_revision">
+            <description>Software Revision</description>
+            <properties read="true" const="true" />
+            <value variable_length="true" type="user"></value>
+        </characteristic>
+
     </service>
 
-    <!-- custom service for data transmission test -->
     <service uuid="195AE58A-437A-489B-B0CD-B7C9C394BAE4" id="ir_remote_controller" advertise="true">
         <description>Infrared Remote Controller service</description>
 
         <characteristic uuid="5FC569A0-74A9-4FA4-B8B7-8354C86E45A4" id="c_ir_data">
             <description>IR Data.
-            Unsigned 16bit length, and unsigned 16bit signal data array
+            Unsigned 16bit signal data array
             </description>
             <!-- can't enable authenticated_read nor authenticated_write because we don't have any display nor keyboard -->
             <properties read="true"

firmware/ble112/out.hex

@@ -7989,76 +7989,76 @@
 :10f32000ffffffffffffffffffffffffffffffffed
 :10f33000ffffffffffffffffffffffffffffffffdd
 :10f34000ffffffffffffffffffffffffffffffffcd
-:10f35000ffffffffffffffffffffffffffffffffbd
-:10f36000ffffffffffffffffffffffffffffffffad
-:10f37000ffffffffffffffffffffffffffffffff9d
-:10f38000ffffffffffffffffffffffffffffffff8d
-:10f39000ffffffffffffffffffffffffffffffff7d
-:10f3a000ffffffffffffffffffffffffffffffff6d
-:10f3b000ffffffffffffffffffffffffffff120148
-:10f3c0000002020000205824010001000102030194
-:10f3d0000902430002010480250904000001020221
-:10f3e0000105052400100104240202052406000181
-:10f3f00005240103010705820340004009040100c0
-:10f40000020a000006070584024000010705040205
-:10f4100040000104030904120342006c00750065fa
-:10f4200000670069006700610024034c006f0077eb
-:10f4300000200045006e0065007200670079002022
-:10f440000044006f006e0067006c0065000403312b
-:10f4500000080343004400430018034300440043f2
-:10f4600000200063006f006e00740072006f006c7b
-:10f470000012034300440043002000640061007454
-:10f4800000610000020300002a49524b6974446580
-:10f4900076696365204e616d65020600012a018070
-:10f4a000417070656172616e6365020a00292a4bc2
-:10f4b0004159414320496e632e4d616e756661630b
-:10f4c0007475726572204e616d65020d00242a41cb
-:10f4d0004d6f64656c204e756d6265720a1100a4f3
-:10f4e000456ec85483b7b8a44fa974a069c55f0a14
-:10f4f00000ff1e00495220446174612e0a20202022
-:10f50000202020202020202020556e7369676e6502
-:10f5100064203136626974206c656e6774682c20d3
-:10f52000616e6420756e7369676e65642031366242
-:10f530006974207369676e616c2064617461206115
-:10f54000727261790a202020202020202020202093
-:10f550002010140007e0f75a87eb839c764962ccb1
-:10f5600010631b841001ff1e01495220556e726505
-:10f5700061642053746174757308180094aa43f889
-:10f58000bfc032a2fa40ed2f766374cf0802001f8d
-:10f5900000495220436f6e74726f6c20506f696e19
-:10f5a000742e0a20202020202020202020202030ff
-:10f5b0003a2053656e6420495220646174612e0aba
-:10f5c000202020202020202020202020312d3235f6
-:10f5d000353a20526573657276656420666f7220d5
-:10f5e000667574757265207573652e0a202020205b
-:10f5f00020202020202020200a1b00cd96161e62ed
-:10f60000b9dbb0884137c9b09a81210a03001f00d5
-:10f610004952204361727269657220467265717544
-:10f62000656e637920696e206b487a221e0013fc98
-:10f63000a5da146d1d8bc04b74e79563936a2204a1
-:10f64000001f00495220417574686f72697a6174b5
-:10f65000696f6e2053746174757300010480f70242
-:10f6600002010484f40504010489f4050901048eef
-:10f67000f40b02010499f4050501049ef40209014a
-:10f6800004a0f40a00010486f702020104aaf405aa
-:10f69000070104aff40a090104b9f411020104ca14
-:10f6a000f405080104cff401090104d0f40c0001b1
-:10f6b000041af710020104dcf41381030ceff405c3
-:10f6c000090104f4f45d02010451f513820006649b
-:10f6d000f50509010469f5100a83081001ff02010c
-:10f6e0000479f51383020c8cf50509010491f56783
-:10f6f000020104f8f51384030c0bf605090104104c
-:10f70000f61b0201042bf61385010c3ef6050901d8
-:10f710000443f6170a83082004ffe4ba94c3c9b768
-:10f72000cdb09b487a438ae55a19a4456ec85483e4
-:10f73000b7b8a44fa974a069c55f07e0f75a87eb73
-:10f74000839c764962cc10631b8494aa43f8bfc0a3
-:10f7500032a2fa40ed2f766374cfcd96161e62b9b1
-:10f76000dbb0884137c9b09a812113fca5da146d4a
-:10f770001d8bc04b74e79563936a0028012803280a
-:10f780000018002a012a0a18292a242a01290229f4
-:10f79000bef3bef3bef35af61af77af72004ff1e43
-:10f7a0001114181b1e0000000000000000000000e3
+:10f3500012010002020000205824010001000102f5
+:10f360000301090243000201048025090400000191
+:10f3700002020105052400100104240202052406ee
+:10f380000001052401030107058203400040090430
+:10f390000100020a0000060705840240000107057b
+:10f3a000040240000104030904120342006c0075ca
+:10f3b000006500670069006700610024034c006f6e
+:10f3c000007700200045006e00650072006700793c
+:10f3d00000200044006f006e0067006c00650004b0
+:10f3e0000331000803430044004300180343004472
+:10f3f000004300200063006f006e00740072006f15
+:10f40000006c0012034300440043002000640061cc
+:10f41000007400610000020300002a49524b697425
+:10f42000446576696365204e616d65020600012ab8
+:10f430000180417070656172616e6365020a002926
+:10f440002a4b4159414320496e632e4d616e7566ca
+:10f4500061637475726572204e616d65020d0024e2
+:10f460002a414d6f64656c204e756d6265720210a5
+:10f4700000272a312e30486172647761726520520c
+:10f4800065766973696f6e021300262a312e304645
+:10f4900069726d77617265205265766973696f6e06
+:10f4a000021600282a0200ff1e00536f667477615f
+:10f4b0007265205265766973696f6e0a1a00a445f9
+:10f4c0006ec85483b7b8a44fa974a069c55f0a0178
+:10f4d000ff1e00495220446174612e0a2020202022
+:10f4e0002020202020202020556e7369676e6564df
+:10f4f000203136626974207369676e616c206461c3
+:10f5000074612061727261790a20202020202020fd
+:10f510002020202020101d0007e0f75a87eb839c55
+:10f52000764962cc10631b841002ff1e01495220f1
+:10f53000556e72656164205374617475730821009f
+:10f5400094aa43f8bfc032a2fa40ed2f766374cf7d
+:10f550000803001f00495220436f6e74726f6c20c5
+:10f56000506f696e742e0a20202020202020202039
+:10f57000202020303a2053656e6420495220646177
+:10f5800074612e0a202020202020202020202020ee
+:10f59000312d3235353a20526573657276656420b7
+:10f5a000666f7220667574757265207573652e0ab4
+:10f5b0002020202020202020202020200a2400cdd0
+:10f5c00096161e62b9dbb0884137c9b09a81210a0c
+:10f5d00004001f004952204361727269657220461f
+:10f5e00072657175656e637920696e206b487a2249
+:10f5f000270013fca5da146d1d8bc04b74e79563cf
+:10f60000936a2205001f00495220417574686f7289
+:10f61000697a6174696f6e20537461747573000147
+:10f62000047af70202010416f4050401041bf40530
+:10f630000c010420f40b0201042bf4050501043035
+:10f64000f4020c010432f40a00010480f702020102
+:10f65000043cf40507010441f40a0c01044bf411c5
+:10f660000201045cf40508010461f4010c01046268
+:10f67000f40c0201046ef40509010473f4030c0197
+:10f680000476f41102010487f4050a01048cf403e2
+:10f690000c01048ff411020104a0f4050b010ca568
+:10f6a000f4050c0104aaf41100010414f71002017e
+:10f6b00004bbf41381030ccef4050c0104d3f44213
+:10f6c00002010415f51382000628f5050c01042d2e
+:10f6d000f5100d83081002ff0201043df5138302ab
+:10f6e0000c50f5050c010455f567020104bcf51337
+:10f6f00084030ccff5050c0104d4f51b020104efc3
+:10f70000f51385010c02f6050c010407f6170d83ad
+:10f71000082005ffe4ba94c3c9b7cdb09b487a432b
+:10f720008ae55a19a4456ec85483b7b8a44fa97482
+:10f73000a069c55f07e0f75a87eb839c764962cce6
+:10f7400010631b8494aa43f8bfc032a2fa40ed2f85
+:10f75000766374cfcd96161e62b9dbb0884137c987
+:10f76000b09a812113fca5da146d1d8bc04b74e790
+:10f770009563936a0028012803280018002a012aab
+:10f780000a18292a242a272a262a282a012902296e
+:10f7900050f350f350f31ef614f774f72904ff1ecc
+:10f7a000161a1d21242700000000000000000000a0
 :10f7b0000000000000000000000000000000000049
 :10f7c0000000000000000000000000000000000039
 :10f7d0000000000000000000000000000000000029

firmware/build.sh

@@ -0,0 +1,9 @@
+#!/bin/sh
+set -xe
+
+# remove Arduino IDE build files
+rm -rf src/irkit/build-uno/
+
+VERSION=`git describe --tags --exact-match || git rev-parse --short HEAD`
+sed -e "s/__VERSION__/$VERSION/" src/irkit/version.template > src/irkit/version.c
+~/src/ino/bin/ino build -m pro5v328