add control flags for clock mode

Author: teachop

module_seven_seg/src/seven_seg.h

@@ -6,6 +6,10 @@
 #ifndef __SEVEN_SEG_H__
 #define __SEVEN_SEG_H__
 
+// setClock flags
+#define SSEG_AM_PM 0x01 // enable 12 hour clock mode
+#define SSEG_COLON 0x02 // enable colon in clock display
+
 // driver interface
 interface seven_seg_if {
 
@@ -21,10 +25,11 @@ interface seven_seg_if {
     // show value with optional decimal places, optional leading zeros
     [[clears_notification]] void setValue(uint32_t value, uint8_t dplaces, uint8_t lead_0s);
 
-    // show clock display with optional am-pm format
-    [[clears_notification]] void setClock(uint8_t hours, uint8_t minutes, uint8_t am_pm);
+    // show clock display with optional format flags: bit0=am_pm, bit1=colon
+    [[clears_notification]] void setClock(uint8_t hours, uint8_t minutes, uint8_t flags);
 };
 
+[[combinable]]
 void seven_seg_task(port txd, interface seven_seg_if server dvr);
 
 

module_seven_seg/src/seven_seg.xc

@@ -11,6 +11,7 @@
 // ---------------------------------------------------------
 // seven_seg_task - Serial 7 segment display driver
 //
+[[combinable]]
 void seven_seg_task(port txd, interface seven_seg_if server display) {
     const uint32_t bit_rate = (100*1000*1000)/9600;
     uint8_t latest_ascii[4] = {0,0,0,0};
@@ -43,10 +44,11 @@ void seven_seg_task(port txd, interface seven_seg_if server display) {
             }
             display_updated = 1;
             break;
-        case display.setClock(uint8_t hours, uint8_t minutes, uint8_t am_pm):
+        case display.setClock(uint8_t hours, uint8_t minutes, uint8_t flags):
             hours = (23<hours)? 23 : hours;
             minutes = (59<minutes)? 59 : minutes;
-            latest_dp = 0x10;
+            latest_dp = (SSEG_COLON&flags)? 0x10 : 0;
+            uint8_t am_pm = SSEG_AM_PM & flags;
             if ( am_pm ) {
                 if ( 12 <= hours ) {
                     latest_dp |= 0x08;