Fixed uuid numbers for device information service characteristics;

Fixed issue with finding openssl package
clydebarrow · Apr 8, 2017 · 17e9ee1 · 17e9ee1
1 parent 209d58d
commit 17e9ee1
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 14 deletions.
diff --git a/app/gatt/gatt.xml b/app/gatt/gatt.xml
@@ -35,7 +35,7 @@
             <value>1</value>
         </characteristic>
         <!-- Serial number string -->
-        <characteristic uuid="2A23" id="serialnum">
+        <characteristic uuid="2A25" id="serialnum">
             <properties read="true"/>
             <value length="16" const="true" variable_length="true">sernum</value>
         </characteristic>
@@ -45,7 +45,7 @@
             <value>1</value>
         </characteristic>
         <!-- Firmware revision -->
-        <characteristic uuid="2A27" id="fwrev">
+        <characteristic uuid="2A26" id="fwrev">
             <properties read="true" const="true"/>
             <value>1.0</value>
         </characteristic>

diff --git a/bootload/gatt/gatt.xml b/bootload/gatt/gatt.xml
@@ -22,6 +22,7 @@
 
     </service>
 
+
     <!-- Device Information Service -->
     <service uuid="180A">
         <!-- Manufacturer name string -->
@@ -32,22 +33,22 @@
         <!-- Model number string -->
         <characteristic uuid="2A24">
             <properties read="true" const="true"/>
-            <value>1</value>
+            <value>model</value>
         </characteristic>
         <!-- Serial number string -->
-        <characteristic uuid="2A23" id="serialnum">
-            <properties read="true"/>
-            <value length="16" const="true" variable_length="true">sernum</value>
+        <characteristic uuid="2A25" id="serialnum">
+            <properties read="true" const="true"/>
+            <value>sernum</value>
         </characteristic>
         <!-- Hardware revision -->
         <characteristic uuid="2A27" id="hwrev">
             <properties read="true" const="true"/>
-            <value>1</value>
+            <value>3</value>
         </characteristic>
         <!-- Firmware revision -->
-        <characteristic uuid="2A27" id="fwrev">
+        <characteristic uuid="2A26" id="fwrev">
             <properties read="true" const="true"/>
-            <value>1.0</value>
+            <value>${PROJECT_VERSION}</value>
         </characteristic>
     </service>
 

diff --git a/bootload/run.jdebug b/bootload/run.jdebug
@@ -31,7 +31,6 @@ void OnProjectLoad (void) {
 *                                                                     
 **********************************************************************
 */                                                                    
-/*
 void TargetReset (void) {                                             
 
   unsigned int SP;                                                    
@@ -40,7 +39,7 @@ void TargetReset (void) {
 
   Exec.Reset();                                                       
 
-  VectorTableAddr = Elf.GetBaseAddr();                                
+  VectorTableAddr = 0;
 
   if (VectorTableAddr != 0xFFFFFFFF) {                                
 
@@ -53,7 +52,6 @@ void TargetReset (void) {
     Target.SetReg("PC", PC);                                        
   }                                                                   
 }                                                                     
-*/
 
 /*********************************************************************
 *                                                                     

diff --git a/utils/CMakeLists.txt b/utils/CMakeLists.txt
@@ -8,8 +8,7 @@ set(SOURCE_FILES
         vector.c
         vector.h)
 
-find_package(PkgConfig REQUIRED)
-pkg_search_module(OPENSSL REQUIRED openssl)
+find_package(OPENSSL REQUIRED openssl)
 
 if( OPENSSL_FOUND )
     include_directories(${OPENSSL_INCLUDE_DIRS})