summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Makefile4
-rw-r--r--fiken_status_panel.ino1
-rw-r--r--fiken_status_panel.xml4
-rw-r--r--services.h36
4 files changed, 20 insertions, 25 deletions
diff --git a/Makefile b/Makefile
index 03e0b0f..d52f7b7 100644
--- a/Makefile
+++ b/Makefile
@@ -8,7 +8,3 @@ ARDUINO_LIBS = BLE SPI
ARDMK_DIR ?= /usr/share/arduino
include $(ARDMK_DIR)/Arduino.mk
-
-#/usr/share/arduino/hardware/tools/avr/bin/avr-g++ -x c++ -include Arduino.h -MMD -c -mmcu=atmega32u4 -DF_CPU=16000000L -DARDUINO=105 -D__PROG_TYPES_COMPAT__ -I. -I/usr/share/arduino/hardware/arduino/cores/arduino -I/usr/share/arduino/hardware/arduino/variants/leonardo -I/usr/share/arduino/libraries/SPI -I/home/trygvis/sketchbook/libraries/BLE -Wall -ffunction-sections -fdata-sections -Os -DUSB_VID=0x2341 -DUSB_PID=0x8036 -fno-exceptions bitraf_door.ino -o build-leonardo/bitraf_door.o
-
-#/home/trygvis/opt/arduino-1.0.5/hardware/tools/avr/bin/avr-g++ -c -g -Os -Wall -fno-exceptions -ffunction-sections -fdata-sections -mmcu=atmega32u4 -DF_CPU=8000000L -MMD -DUSB_VID=0x03EB -DUSB_PID=0x2404 -DARDUINO=105 -I/home/trygvis/opt/arduino-1.0.5/hardware/arduino/cores/arduino -I/home/trygvis/sketchbook/hardware/blend/variants/BlendMicro-8MHz -I/home/trygvis/opt/arduino-1.0.5/libraries/SPI -I/home/trygvis/sketchbook/libraries/BLE /tmp/build8653612679895592527.tmp/bitraf_door.cpp -o /tmp/build8653612679895592527.tmp/bitraf_door.cpp.o
diff --git a/fiken_status_panel.ino b/fiken_status_panel.ino
index 6283201..04b36f0 100644
--- a/fiken_status_panel.ino
+++ b/fiken_status_panel.ino
@@ -309,7 +309,6 @@ static uint8_t value = 0;
void loop() {
static unsigned long last = 0, now;
- //Process any ACI commands or events
aci_loop();
if (Serial.available()) {
diff --git a/fiken_status_panel.xml b/fiken_status_panel.xml
index d86c69f..0506a5a 100644
--- a/fiken_status_panel.xml
+++ b/fiken_status_panel.xml
@@ -52,8 +52,8 @@
</Characteristic>
</Service>
<Gapsettings>
- <Name>Fiken Display</Name>
- <DeviceNameWriteLength>13</DeviceNameWriteLength>
+ <Name>Door</Name>
+ <DeviceNameWriteLength>10</DeviceNameWriteLength>
<LocalPipeOnDeviceName>true</LocalPipeOnDeviceName>
<DeviceNameShortLength>0</DeviceNameShortLength>
<Apperance>0000</Apperance>
diff --git a/services.h b/services.h
index fad505a..6aff7af 100644
--- a/services.h
+++ b/services.h
@@ -11,11 +11,11 @@
#define SETUP_ID 1
#define SETUP_FORMAT 3 /** nRF8001 D */
-#define ACI_DYNAMIC_DATA_SIZE 133
+#define ACI_DYNAMIC_DATA_SIZE 130
/* Service: Gap - Characteristic: Device name - Pipe: SET */
#define PIPE_GAP_DEVICE_NAME_SET 1
-#define PIPE_GAP_DEVICE_NAME_SET_MAX_SIZE 13
+#define PIPE_GAP_DEVICE_NAME_SET_MAX_SIZE 10
/* Service: Fiken Status Panel - Characteristic: Gauge - Pipe: RX_ACK */
#define PIPE_FIKEN_STATUS_PANEL_GAUGE_RX_ACK 2
@@ -77,49 +77,49 @@
{0x00,\
{\
0x1f,0x06,0x20,0x00,0x04,0x04,0x02,0x02,0x00,0x01,0x28,0x00,0x01,0x00,0x18,0x04,0x04,0x05,0x05,0x00,\
- 0x02,0x28,0x03,0x01,0x0e,0x03,0x00,0x00,0x2a,0x04,0x14,0x0d,\
+ 0x02,0x28,0x03,0x01,0x0e,0x03,0x00,0x00,0x2a,0x04,0x14,0x0a,\
},\
},\
{0x00,\
{\
- 0x1f,0x06,0x20,0x1c,0x0d,0x00,0x03,0x2a,0x00,0x01,0x46,0x69,0x6b,0x65,0x6e,0x20,0x44,0x69,0x73,0x70,\
- 0x6c,0x61,0x79,0x04,0x04,0x05,0x05,0x00,0x04,0x28,0x03,0x01,\
+ 0x1f,0x06,0x20,0x1c,0x04,0x00,0x03,0x2a,0x00,0x01,0x44,0x6f,0x6f,0x72,0x69,0x63,0x73,0x65,0x6d,0x69,\
+ 0x04,0x04,0x05,0x05,0x00,0x04,0x28,0x03,0x01,0x02,0x05,0x00,\
},\
},\
{0x00,\
{\
- 0x1f,0x06,0x20,0x38,0x02,0x05,0x00,0x01,0x2a,0x06,0x04,0x03,0x02,0x00,0x05,0x2a,0x01,0x01,0x00,0x00,\
- 0x04,0x04,0x05,0x05,0x00,0x06,0x28,0x03,0x01,0x02,0x07,0x00,\
+ 0x1f,0x06,0x20,0x38,0x01,0x2a,0x06,0x04,0x03,0x02,0x00,0x05,0x2a,0x01,0x01,0x00,0x00,0x04,0x04,0x05,\
+ 0x05,0x00,0x06,0x28,0x03,0x01,0x02,0x07,0x00,0x04,0x2a,0x06,\
},\
},\
{0x00,\
{\
- 0x1f,0x06,0x20,0x54,0x04,0x2a,0x06,0x04,0x09,0x08,0x00,0x07,0x2a,0x04,0x01,0xff,0xff,0xff,0xff,0x00,\
- 0x00,0xff,0xff,0x04,0x04,0x02,0x02,0x00,0x08,0x28,0x00,0x01,\
+ 0x1f,0x06,0x20,0x54,0x04,0x09,0x08,0x00,0x07,0x2a,0x04,0x01,0xff,0xff,0xff,0xff,0x00,0x00,0xff,0xff,\
+ 0x04,0x04,0x02,0x02,0x00,0x08,0x28,0x00,0x01,0x01,0x18,0x04,\
},\
},\
{0x00,\
{\
- 0x1f,0x06,0x20,0x70,0x01,0x18,0x04,0x04,0x10,0x10,0x00,0x09,0x28,0x00,0x01,0x3f,0xd8,0x1f,0x4a,0x8e,\
- 0xbc,0xd3,0x70,0xc5,0x59,0x5d,0x03,0x01,0x00,0xd0,0x32,0x04,\
+ 0x1f,0x06,0x20,0x70,0x04,0x10,0x10,0x00,0x09,0x28,0x00,0x01,0x3f,0xd8,0x1f,0x4a,0x8e,0xbc,0xd3,0x70,\
+ 0xc5,0x59,0x5d,0x03,0x01,0x00,0xd0,0x32,0x04,0x04,0x13,0x13,\
},\
},\
{0x00,\
{\
- 0x1f,0x06,0x20,0x8c,0x04,0x13,0x13,0x00,0x0a,0x28,0x03,0x01,0x0e,0x0b,0x00,0x3f,0xd8,0x1f,0x4a,0x8e,\
- 0xbc,0xd3,0x70,0xc5,0x59,0x5d,0x03,0x02,0x00,0xd0,0x32,0x46,\
+ 0x1f,0x06,0x20,0x8c,0x00,0x0a,0x28,0x03,0x01,0x0e,0x0b,0x00,0x3f,0xd8,0x1f,0x4a,0x8e,0xbc,0xd3,0x70,\
+ 0xc5,0x59,0x5d,0x03,0x02,0x00,0xd0,0x32,0x46,0x14,0x03,0x02,\
},\
},\
{0x00,\
{\
- 0x1f,0x06,0x20,0xa8,0x14,0x03,0x02,0x00,0x0b,0x00,0x02,0x02,0x12,0x34,0x04,0x04,0x13,0x13,0x00,0x0c,\
- 0x28,0x03,0x01,0x0a,0x0d,0x00,0x3f,0xd8,0x1f,0x4a,0x8e,0xbc,\
+ 0x1f,0x06,0x20,0xa8,0x00,0x0b,0x00,0x02,0x02,0x12,0x34,0x04,0x04,0x13,0x13,0x00,0x0c,0x28,0x03,0x01,\
+ 0x0a,0x0d,0x00,0x3f,0xd8,0x1f,0x4a,0x8e,0xbc,0xd3,0x70,0xc5,\
},\
},\
{0x00,\
{\
- 0x1a,0x06,0x20,0xc4,0xd3,0x70,0xc5,0x59,0x5d,0x03,0x03,0x00,0xd0,0x32,0x46,0x14,0x04,0x03,0x00,0x0d,\
- 0x00,0x03,0x02,0x00,0x00,0x00,0x00,\
+ 0x17,0x06,0x20,0xc4,0x59,0x5d,0x03,0x03,0x00,0xd0,0x32,0x46,0x14,0x04,0x03,0x00,0x0d,0x00,0x03,0x02,\
+ 0x00,0x00,0x00,0x00,\
},\
},\
{0x00,\
@@ -145,7 +145,7 @@
},\
{0x00,\
{\
- 0x06,0x06,0xf0,0x00,0x03,0xf7,0x6c,\
+ 0x06,0x06,0xf0,0x00,0x03,0x34,0xaa,\
},\
},\
}