<p>Kévin Redon has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/12789">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">change LED and switch to sysmoOCTSIM board<br><br>Change-Id: I481d96a284240310b634f6dc0806d4a1972cd3b9<br>---<br>M atmel_start_pins.h<br>M driver_init.c<br>M usb_dfu_main.c<br>M usb_start.c<br>4 files changed, 8 insertions(+), 10 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/osmo-asf4-dfu refs/changes/89/12789/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/atmel_start_pins.h b/atmel_start_pins.h</span><br><span>index 86e1dfb..7460529 100644</span><br><span>--- a/atmel_start_pins.h</span><br><span>+++ b/atmel_start_pins.h</span><br><span>@@ -27,11 +27,11 @@</span><br><span> #define GPIO_PIN_FUNCTION_M 12</span><br><span> #define GPIO_PIN_FUNCTION_N 13</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-/** LED pin to indicate system state (pull low to switch on) */</span><br><span style="color: hsl(0, 100%, 40%);">-#define LED_SYSTEM GPIO(GPIO_PORTC, 18)</span><br><span style="color: hsl(120, 100%, 40%);">+/** LED pin to indicate system state (pull high to switch on) */</span><br><span style="color: hsl(120, 100%, 40%);">+#define LED_SYSTEM GPIO(GPIO_PORTC, 26)</span><br><span> </span><br><span> /** User button to force DFu bootloader (connected to ground when pressed) */</span><br><span style="color: hsl(0, 100%, 40%);">-#define BUTTON_FORCE_DFU GPIO(GPIO_PORTB, 31)</span><br><span style="color: hsl(120, 100%, 40%);">+#define BUTTON_FORCE_DFU GPIO(GPIO_PORTC, 14)</span><br><span> </span><br><span> /** USB D+/D- pins */</span><br><span> #define PA24 GPIO(GPIO_PORTA, 24)</span><br><span>diff --git a/driver_init.c b/driver_init.c</span><br><span>index a91b0eb..d5a151f 100644</span><br><span>--- a/driver_init.c</span><br><span>+++ b/driver_init.c</span><br><span>@@ -144,13 +144,12 @@</span><br><span> init_mcu();</span><br><span> </span><br><span> // configure system LED</span><br><span style="color: hsl(0, 100%, 40%);">- gpio_set_pin_level(LED_SYSTEM, true); // switch off LED</span><br><span style="color: hsl(120, 100%, 40%);">+ gpio_set_pin_level(LED_SYSTEM, false); // switch off LED</span><br><span> gpio_set_pin_direction(LED_SYSTEM, GPIO_DIRECTION_OUT);</span><br><span> gpio_set_pin_function(LED_SYSTEM, GPIO_PIN_FUNCTION_OFF);</span><br><span> </span><br><span> // configure force DFU user button</span><br><span> gpio_set_pin_direction(BUTTON_FORCE_DFU, GPIO_DIRECTION_IN);</span><br><span style="color: hsl(0, 100%, 40%);">- gpio_set_pin_pull_mode(BUTTON_FORCE_DFU, GPIO_PULL_UP);</span><br><span> gpio_set_pin_function(BUTTON_FORCE_DFU, GPIO_PIN_FUNCTION_OFF);</span><br><span> </span><br><span> USB_DEVICE_INSTANCE_init();</span><br><span>diff --git a/usb_dfu_main.c b/usb_dfu_main.c</span><br><span>index 449b311..6a524e4 100644</span><br><span>--- a/usb_dfu_main.c</span><br><span>+++ b/usb_dfu_main.c</span><br><span>@@ -48,8 +48,7 @@</span><br><span> */</span><br><span> static bool check_force_dfu(void)</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">- gpio_set_pin_pull_mode(BUTTON_FORCE_DFU, GPIO_PULL_UP); // pull button high</span><br><span style="color: hsl(0, 100%, 40%);">- return (0 == gpio_get_pin_level(BUTTON_FORCE_DFU)); // signal is low when button is pressed</span><br><span style="color: hsl(120, 100%, 40%);">+ return (0 == gpio_get_pin_level(BUTTON_FORCE_DFU)); // signal is low when button is pressed (pulled high externally)</span><br><span> }</span><br><span> </span><br><span> /** Check if the application is valid</span><br><span>diff --git a/usb_start.c b/usb_start.c</span><br><span>index ad91840..ab0f332 100644</span><br><span>--- a/usb_start.c</span><br><span>+++ b/usb_start.c</span><br><span>@@ -80,7 +80,7 @@</span><br><span> void usb_dfu(void)</span><br><span> {</span><br><span> while (!dfudf_is_enabled()); // wait for DFU to be installed</span><br><span style="color: hsl(0, 100%, 40%);">- gpio_set_pin_level(LED_SYSTEM, false); // switch LED on to indicate USB DFU stack is ready</span><br><span style="color: hsl(120, 100%, 40%);">+ gpio_set_pin_level(LED_SYSTEM, true); // switch LED on to indicate USB DFU stack is ready</span><br><span> </span><br><span> ASSERT(hri_nvmctrl_read_STATUS_BOOTPROT_bf(FLASH_0.dev.hw) <= 15);</span><br><span> uint32_t application_start_address = (15 - hri_nvmctrl_read_STATUS_BOOTPROT_bf(FLASH_0.dev.hw)) * 8192; // calculate bootloader size to know where we should write the application firmware</span><br><span>@@ -89,7 +89,7 @@</span><br><span> while (true) { // main DFU infinite loop</span><br><span> // run the second part of the USB DFU state machine handling non-USB aspects</span><br><span> if (USB_DFU_STATE_DFU_DNLOAD_SYNC == dfu_state || USB_DFU_STATE_DFU_DNBUSY == dfu_state) { // there is some data to be flashed</span><br><span style="color: hsl(0, 100%, 40%);">- gpio_set_pin_level(LED_SYSTEM, true); // switch LED off to indicate we are flashing</span><br><span style="color: hsl(120, 100%, 40%);">+ gpio_set_pin_level(LED_SYSTEM, false); // switch LED off to indicate we are flashing</span><br><span> if (dfu_download_length > 0) { // there is some data to be flashed</span><br><span> int32_t rc = flash_write(&FLASH_0, application_start_address + dfu_download_offset, dfu_download_data, dfu_download_length); // write downloaded data chunk to flash</span><br><span> if (ERR_NONE == rc) {</span><br><span>@@ -108,7 +108,7 @@</span><br><span> // this case should not happen, but it's not a critical error</span><br><span> dfu_state = USB_DFU_STATE_DFU_DNLOAD_IDLE; // indicate flashing can continue</span><br><span> }</span><br><span style="color: hsl(0, 100%, 40%);">- gpio_set_pin_level(LED_SYSTEM, false); // switch LED on to indicate USB DFU can resume</span><br><span style="color: hsl(120, 100%, 40%);">+ gpio_set_pin_level(LED_SYSTEM, true); // switch LED on to indicate USB DFU can resume</span><br><span> }</span><br><span> if (USB_DFU_STATE_DFU_MANIFEST == dfu_state) { // we can start manifestation (finish flashing)</span><br><span> // in theory every DFU files should have a suffix to with a CRC to check the data</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/12789">change 12789</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/12789"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: osmo-asf4-dfu </div>
<div style="display:none"> Gerrit-Branch: sysmoOCTSIM </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>
<div style="display:none"> Gerrit-Change-Id: I481d96a284240310b634f6dc0806d4a1972cd3b9 </div>
<div style="display:none"> Gerrit-Change-Number: 12789 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Kévin Redon <kredon@sysmocom.de> </div>