Clean up

Author: dkdps

BuzzerExample/CMakeLists.txt

@@ -7,7 +7,7 @@ set(CMAKE_CXX_STANDARD 17)
 
 # Initialise pico_sdk from installed location
 # (note this can come from environment, CMake cache etc)
-set(PICO_SDK_PATH "/mnt/c/Users/champ/Documents/Programming/pico-sdk")
+set(PICO_SDK_PATH "/home/coursework/comp2215/pico-sdk")
 
 # Pull in Raspberry Pi Pico SDK (must be before project)
 include(pico_sdk_import.cmake)

JukeBoxSD/CMakeLists.txt

@@ -7,7 +7,7 @@ set(CMAKE_CXX_STANDARD 17)
 
 # Initialise pico_sdk from installed location
 # (note this can come from environment, CMake cache etc)
-set(PICO_SDK_PATH "/mnt/c/Users/champ/Documents/Programming/pico-sdk")
+set(PICO_SDK_PATH "~/coursework/comp2215/pico-sdk")
 
 # Pull in Raspberry Pi Pico SDK (must be before project)
 include(pico_sdk_import.cmake)

JukeBoxSD/hw_config.c

@@ -42,6 +42,7 @@ void spi1_dma_isr();
 // selects.
 static spi_t spis[] = {  // One for each SPI.
     {
+        // Changed these values to work with the maker pi board.
         .hw_inst = spi1,  // SPI component
         .miso_gpio = 12, // GPIO number (not pin number)
         .mosi_gpio = 11,

JukeBoxSD/sample.h

@@ -7,7 +7,7 @@ set(CMAKE_CXX_STANDARD 17)
 
 # Initialise pico_sdk from installed location
 # (note this can come from environment, CMake cache etc)
-set(PICO_SDK_PATH "/mnt/c/Users/champ/Documents/Programming/pico-sdk")
+set(PICO_SDK_PATH "~/coursework/comp2215/pico-sdk")
 
 # Pull in Raspberry Pi Pico SDK (must be before project)
 include(pico_sdk_import.cmake)

pico-fractal/CMakeLists.txt

@@ -170,24 +170,8 @@ int main()
     sleep_ms(1000);                   // Give the Pico some time to think...
     ST7735_Init();                    // Initialise the screen
 
-      
-    // Fill with black
-    //ST7735_FillScreen(ST7735_BLACK);
     mandelbrot();
     //ship();
 
-    /*
-    for(int x = 0; x < 80; x++){ // x axis a is 0
-        ST7735_DrawPixel(80-x, 0, ST7735_WHITE);
-        sleep_ms(10);
-    } // y=0 is m, m-->A
-
-    for(int y = 0; y < 160; y++){ 
-        ST7735_DrawPixel(0, 160-y, ST7735_WHITE);
-        sleep_ms(10);
-    } // x=0 is m, m-->Z
-    */
-
-
     sleep_ms(20000); // Sleep for 20 seconds
 }

pico-fractal/pico-fractal.c

@@ -7,7 +7,7 @@ set(CMAKE_CXX_STANDARD 17)
 
 # Initialise pico_sdk from installed location
 # (note this can come from environment, CMake cache etc)
-set(PICO_SDK_PATH "/mnt/c/Users/champ/Documents/Programming/pico-sdk")
+set(PICO_SDK_PATH "~/coursework/comp2215/pico-sdk")
 
 # Pull in Raspberry Pi Pico SDK (must be before project)
 include(pico_sdk_import.cmake)

pico-tuner/CMakeLists.txt

@@ -7,7 +7,8 @@ set(CMAKE_CXX_STANDARD 17)
 
 # Initialise pico_sdk from installed location
 # (note this can come from environment, CMake cache etc)
-set(PICO_SDK_PATH "/mnt/c/Users/champ/Documents/Programming/pico-sdk")
+# Change this to where you store your pico sdk
+set(PICO_SDK_PATH "~/coursework/comp2215/pico-sdk")
 
 # Pull in Raspberry Pi Pico SDK (must be before project)
 include(pico_sdk_import.cmake)

picosd/CMakeLists.txt

@@ -3,13 +3,12 @@
 #include "ff.h"
 #include "f_util.h"
 #include "hw_config.h"
-#include "rtc.h"
 
+/**
+ * Based on https://github.com/carlk3/no-OS-FatFS-SD-SPI-RPi-Pico/blob/master/simple_example/simple_example.cpp
+ */
 int main() {
     stdio_init_all();
-    time_init();
-
-    puts("Hello, world!");
 
     // See FatFs - Generic FAT Filesystem Module, "Application Interface",
     // http://elm-chan.org/fsw/ff/00index_e.html
@@ -19,15 +18,15 @@ int main() {
     FRESULT fr = f_mount(&pSD->fatfs, pSD->pcName, 1);
     if (FR_OK != fr) panic("f_mount error: %s (%d)\n", FRESULT_str(fr), fr);
 
-    // Create a file.
+    // Open.
     FIL fil;
     const char* const filename = "filename.txt";
     fr = f_open(&fil, filename, FA_OPEN_APPEND | FA_WRITE);
     if (FR_OK != fr && FR_EXIST != fr)
         panic("f_open(%s) error: %s (%d)\n", filename, FRESULT_str(fr), fr);
 
     // Write to the file.
-    if (f_printf(&fil, "Hello, world!\n") < 0) {
+    if (f_printf(&fil, "Hello, pico!\n") < 0) {
         printf("f_printf failed\n");
     }
 
@@ -40,7 +39,6 @@ int main() {
     // Deregister the workspace.
     f_unmount(pSD->pcName);
 
-    puts("Goodbye, world!");
     for(;;);