<p>Harald Welte <strong>merged</strong> this change.</p><p><a href="https://gerrit.osmocom.org/9864">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Jenkins Builder: Verified
Harald Welte: Looks good to me, approved
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">LED: add short LED pulse blinking pattern<br><br>Change-Id: I0fdc2f902a3b92da6aa9b9c8500abae8a2f79447<br>---<br>M firmware/libboard/common/include/led.h<br>M firmware/libboard/common/source/led.c<br>2 files changed, 17 insertions(+), 9 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/firmware/libboard/common/include/led.h b/firmware/libboard/common/include/led.h</span><br><span>index d1db039..4e29c0e 100644</span><br><span>--- a/firmware/libboard/common/include/led.h</span><br><span>+++ b/firmware/libboard/common/include/led.h</span><br><span>@@ -13,9 +13,10 @@</span><br><span> BLINK_3O_30F = 3,</span><br><span> BLINK_3O_1F_3O_30F = 4,</span><br><span> BLINK_3O_1F_3O_1F_3O_30F= 5,</span><br><span style="color: hsl(0, 100%, 40%);">- BLINK_200O_F = 6,</span><br><span style="color: hsl(0, 100%, 40%);">- BLINK_600O_F = 7,</span><br><span style="color: hsl(0, 100%, 40%);">- BLINK_CUSTOM = 8,</span><br><span style="color: hsl(120, 100%, 40%);">+ BLINK_2O_F = 6,</span><br><span style="color: hsl(120, 100%, 40%);">+ BLINK_200O_F = 7,</span><br><span style="color: hsl(120, 100%, 40%);">+ BLINK_600O_F = 8,</span><br><span style="color: hsl(120, 100%, 40%);">+ BLINK_CUSTOM = 9,</span><br><span> _NUM_LED_BLINK</span><br><span> };</span><br><span> </span><br><span>diff --git a/firmware/libboard/common/source/led.c b/firmware/libboard/common/source/led.c</span><br><span>index e4d2d57..540f031 100644</span><br><span>--- a/firmware/libboard/common/source/led.c</span><br><span>+++ b/firmware/libboard/common/source/led.c</span><br><span>@@ -27,7 +27,7 @@</span><br><span> struct blink_state {</span><br><span> /* duration of the state in ms */</span><br><span> uint16_t duration;</span><br><span style="color: hsl(0, 100%, 40%);">- /* bringhtness of LED during the state */</span><br><span style="color: hsl(120, 100%, 40%);">+ /* brightness of LED during the state */</span><br><span> uint8_t on;</span><br><span> } __attribute__((packed));</span><br><span> </span><br><span>@@ -54,6 +54,9 @@</span><br><span> static const struct blink_state bs_3on_1off_3on_1off_3on_30off[] = {</span><br><span> { 300, 1 }, { 100, 0 }, { 300, 1 }, { 100, 0 }, { 300, 1 }, { 3000, 0 }</span><br><span> };</span><br><span style="color: hsl(120, 100%, 40%);">+static const struct blink_state bs_2on_off[] = {</span><br><span style="color: hsl(120, 100%, 40%);">+ { 200, 1 }, { 0, 0 },</span><br><span style="color: hsl(120, 100%, 40%);">+};</span><br><span> static const struct blink_state bs_200on_off[] = {</span><br><span> { 20000, 1 }, { 0, 0 },</span><br><span> };</span><br><span>@@ -94,6 +97,10 @@</span><br><span> .states = bs_3on_1off_3on_1off_3on_30off,</span><br><span> .size = ARRAY_SIZE(bs_3on_1off_3on_1off_3on_30off),</span><br><span> },</span><br><span style="color: hsl(120, 100%, 40%);">+ [BLINK_2O_F] = {</span><br><span style="color: hsl(120, 100%, 40%);">+ .states = bs_2on_off,</span><br><span style="color: hsl(120, 100%, 40%);">+ .size = ARRAY_SIZE(bs_2on_off),</span><br><span style="color: hsl(120, 100%, 40%);">+ },</span><br><span> [BLINK_200O_F] = {</span><br><span> .states = bs_200on_off,</span><br><span> .size = ARRAY_SIZE(bs_200on_off),</span><br><span>@@ -158,16 +165,16 @@</span><br><span> }</span><br><span> </span><br><span> static struct led_state led_state[] = {</span><br><span style="color: hsl(0, 100%, 40%);">- [LED_GREEN] = {</span><br><span style="color: hsl(0, 100%, 40%);">- .led = LED_GREEN,</span><br><span style="color: hsl(0, 100%, 40%);">- .timer.cb = blink_tmr_cb,</span><br><span style="color: hsl(0, 100%, 40%);">- .timer.data = &led_state[LED_GREEN],</span><br><span style="color: hsl(0, 100%, 40%);">- },</span><br><span> [LED_RED] = {</span><br><span> .led = LED_RED,</span><br><span> .timer.cb = blink_tmr_cb,</span><br><span> .timer.data = &led_state[LED_RED],</span><br><span> },</span><br><span style="color: hsl(120, 100%, 40%);">+ [LED_GREEN] = {</span><br><span style="color: hsl(120, 100%, 40%);">+ .led = LED_GREEN,</span><br><span style="color: hsl(120, 100%, 40%);">+ .timer.cb = blink_tmr_cb,</span><br><span style="color: hsl(120, 100%, 40%);">+ .timer.data = &led_state[LED_GREEN],</span><br><span style="color: hsl(120, 100%, 40%);">+ },</span><br><span> };</span><br><span> #endif /* PINS_LEDS */</span><br><span> </span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/9864">change 9864</a>. To unsubscribe, or for help writing mail filters, visit <a href="https://gerrit.osmocom.org/settings">settings</a>.</p><div itemscope itemtype="http://schema.org/EmailMessage"><div itemscope itemprop="action" itemtype="http://schema.org/ViewAction"><link itemprop="url" href="https://gerrit.osmocom.org/9864"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: simtrace2 </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-MessageType: merged </div>
<div style="display:none"> Gerrit-Change-Id: I0fdc2f902a3b92da6aa9b9c8500abae8a2f79447 </div>
<div style="display:none"> Gerrit-Change-Number: 9864 </div>
<div style="display:none"> Gerrit-PatchSet: 5 </div>
<div style="display:none"> Gerrit-Owner: Kévin Redon <kredon@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: Harald Welte <laforge@gnumonks.org> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder </div>
<div style="display:none"> Gerrit-Reviewer: Kévin Redon <kredon@sysmocom.de> </div>