Diff: main.cpp

Revision:

3:b77b01171cc0

Parent:

2:c3cfaa7d5bb8

Child:

4:1edd956b015f

--- a/main.cpp	Thu Nov 19 17:27:32 2015 +0000
+++ b/main.cpp	Thu Nov 19 17:29:09 2015 +0000
@@ -6,6 +6,8 @@
 #include "alp_device.h"
 #include "alp_file.h"
 #include "alp_report.h"
+#include "DebouncedInterrupt.h"
+
 
 /*
 These data are user defined and will be used by the dash7board
@@ -15,17 +17,16 @@
 #define __MANUFACTURER_ID__         0x01234567 // Identify the manufacturer
 #define __DEVICE_ID__               0x89ABCDEF // Identify the device type
 
-#define __FW_ID__                   0x01 // Device type option
+#define __FW_ID__                   0x01 // Firmware ID
 
-// Software version
+// Firmware version
 #define __FW_MAJOR__                0x02
 #define __FW_MINOR__                0x03
-#define __FW_PATCH__                0x0005
+#define __FW_PATCH__                0x0045
 #define __FW_HASH__                 0x86605dba
 
 #define __HW_ID__                   0x01520C02 // Hardware ID
 
-
 revision_t revision = {
     // The two first bytes must be present in all reported files
     // They are parsed by the dash7board
@@ -43,6 +44,23 @@
     .fs_crc             = 0
 };
 
+// Alarm data structure
+TYPEDEF_STRUCT_PACKED
+{
+    uint8_t  nw_stat;
+    uint8_t  nw_seq;
+    uint8_t  status; // Alarm state true/false
+} alarm_data_t;
+
+#define ALARM_DATA_FILE_ID          (224)
+#define ALARM_DATA_FILE_SIZE        ((uint16_t) sizeof(alarm_data_t))
+
+alarm_data_t alarm_data = {
+    .nw_stat = 0,
+    .nw_seq = 255,
+    .status = 0
+};
+
 // Checks the status of the report send.
 void check_status( AlpReport* report, void* param )
 {
@@ -71,6 +89,58 @@
     }
 }
 
+
+// Semaphore for notifiying button presses
+Semaphore button_user(1);
+
+
+// Prints the alarm status.
+void print_alarm( AlpReport* report, void* param )
+{
+    alarm_data_t* alarm = (alarm_data_t*)report->get_content();
+    DPRINT("SENDING REPORT ALARM %d\r\n", alarm->status);
+}
+
+// Interrupt Service Routine on button press.
+// Inverts alarm status and releases button Semaphore.
+void button_push_isr( void )
+{
+    DPRINT("BUTTON PUSH\r\n");
+    // Retrieve file content
+    alarm_data_t* alarm = (alarm_data_t*)alp_file_get_content(ALARM_DATA_FILE_ID);
+    // Invert alarm status
+    alarm->status = !alarm->status;
+    // Release button Semaphore
+    button_user.release();
+}
+
+// This Thread monitors the user button
+// and reports the alarm status
+void alarm_thread( const void* args )
+{
+    // Get shield device
+    AlpDevice* shield = (AlpDevice*)args;
+    
+    // Create new report
+    AlpReport report_alarm(shield, ALARM_DATA_FILE_ID);
+    report_alarm.attach_before(print_alarm, NULL);
+    report_alarm.attach_after(check_status, (void*)"REPORT ALARM");
+    
+    // Enable interrupt on User button
+    //__enable_irq(); // Enable Interrupts
+    DebouncedInterrupt button(USER_BUTTON);
+    button.attach(&button_push_isr, IRQ_FALL, 200);
+
+    while(true)
+    {
+        // Wait for button press
+        button_user.wait();
+
+        // Notify alarm status
+        report_alarm.send();
+    }
+}
+
 int main()
 {
     // ----- Debug session over USB Serial ----- //
@@ -103,7 +173,8 @@
     // Wait for Shield to notify its files if there is any
     Thread::wait(1000);
     
-    // Add the Report file to the file system
+    // Add the files to the file system
+    alp_file_add(ALARM_DATA_FILE_ID,      ALARM_DATA_FILE_SIZE,      (uint8_t*)&alarm_data);
     alp_file_add(REVISION_DEVICE_FILE_ID, REVISION_DEVICE_FILE_SIZE, (uint8_t*)&revision);
     
     // Create the Revision report
@@ -116,6 +187,9 @@
     DPRINT("SENDING REPORT REVISION\r\n");
     report_revision.send();
     
+    // Init Thread
+    Thread t_alarm_thread(alarm_thread, &shield);
+    
     // Set main task to lowest priority
     osThreadSetPriority(osThreadGetId(), osPriorityIdle);
     while(true)