Merge pull request #5 from AlexLanzano/pic32cz-flash

Pic32cz flash

Author: AlexLanzano

.github/workflows/ci.yml

@@ -35,3 +35,7 @@ jobs:
       - name: Build PIC32CZ example
         working-directory: examples/pic32cz
         run: make
+
+      - name: Build PIC32CZ hardware tests
+        working-directory: tests/pic32cz
+        run: make

examples/pic32cz/Makefile

@@ -15,6 +15,7 @@ SOURCE += $(wildcard $(WHAL_DIR)/src/*/clock.c)
 SOURCE += $(wildcard $(WHAL_DIR)/src/*/uart.c)
 SOURCE += $(wildcard $(WHAL_DIR)/src/*/timer.c)
 SOURCE += $(wildcard $(WHAL_DIR)/src/*/supply.c)
+SOURCE += $(wildcard $(WHAL_DIR)/src/*/flash.c)
 SOURCE += $(wildcard $(WHAL_DIR)/src/*/pic32cz_*.c)
 SOURCE += $(wildcard $(WHAL_DIR)/src/*/systick.c)
 

examples/pic32cz/ivt.c

@@ -54,6 +54,9 @@ void Reset_Handler(void)
     uint32_t* src = &_sidata;
     uint32_t* dst = &_sdata;
 
+    __asm__("ldr r0, =_estack\n\t"
+            "mov sp, r0");
+
     while (dst < &_edata) {
         *dst++ = *src++;
     }

examples/pic32cz/main.c

@@ -37,6 +37,8 @@ void main(void)
 {
     whal_Error err;
     uint8_t data[] = "Hello world!\r\n";
+    uint8_t test[] = "test1\r\n";
+    uint8_t tmp[sizeof(test)] = {0};
 
     err = whal_Clock_Init(&g_whalClock);
     if (err) {
@@ -58,6 +60,34 @@ void main(void)
         goto loop;
     }
 
+    err = whal_Flash_Init(&g_whalFlash);
+    if (err) {
+        goto loop;
+    }
+
+    err = whal_Flash_Erase(&g_whalFlash, 0x0C000000, 0x1000);
+    if (err) {
+        goto loop;
+    }
+
+    do {
+        err = whal_Flash_Write(&g_whalFlash, 0x0C000000, test, sizeof(test));
+    } while (err == WHAL_ENOTREADY);
+
+    if (err) {
+        goto loop;
+    }
+
+    err = whal_Flash_Read(&g_whalFlash, 0x0C000000, tmp, sizeof(tmp));
+    if (err) {
+        goto loop;
+    }
+
+    err = whal_Uart_Send(&g_whalUart, tmp, sizeof(tmp));
+    if (err) {
+        goto loop;
+    }
+
     err = whal_Timer_Init(&g_whalTimer);
     if (err) {
         goto loop;

examples/pic32cz/pic32cz_curiosity_ultra.c

@@ -96,3 +96,7 @@ whal_Timer g_whalTimer = {
         .tickInt = WHAL_SYSTICK_TICKINT_ENABLED,
     },
 };
+
+whal_Flash g_whalFlash = {
+    WHAL_PIC32CZ_FLASH_DEVICE,
+};

examples/pic32cz/pic32cz_curiosity_ultra.h

@@ -9,5 +9,6 @@ extern whal_Clock g_whalClock;
 extern whal_Gpio g_whalGpio;
 extern whal_Timer g_whalTimer;
 extern whal_Uart g_whalUart;
+extern whal_Flash g_whalFlash;
 
 #endif /* WHAL_PIC32CZ_CURIOSITY_ULTRA */

src/clock/pic32cz_clock.c

@@ -269,7 +269,7 @@ whal_Error whal_Pic32czClock_GetRate(whal_Clock *clkDev, size_t *rateOut)
     return WHAL_SUCCESS;
 }
 
-whal_ClockDriver whal_Pic32czClockPll_Driver = {
+const whal_ClockDriver whal_Pic32czClockPll_Driver = {
     .Init = whal_Pic32czClockPll_Init,
     .Deinit = whal_Pic32czClockPll_Deinit,
     .Enable = whal_Pic32czClock_Enable,