From 5eb58c9643e37b69fa49b29c6a4bdefc199e8965 Mon Sep 17 00:00:00 2001
From: Mikah Chapman <mikah.chapman@gmail.com>
Date: Tue, 28 Jun 2022 19:04:26 -0600
Subject: [PATCH] Fix linux build, tweaks to make CMakeLists properly portable

---
 .gitignore            |  5 ++++-
 CMakeLists.txt        | 23 +++++------------------
 traegerController.cpp |  2 +-
 3 files changed, 10 insertions(+), 20 deletions(-)

diff --git a/.gitignore b/.gitignore
index e93529e..c6751c6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -52,7 +52,8 @@ _deps
 .LSOverride
 
 # Icon must end with two \r
-Icon

+Icon
+
 
 # Thumbnails
 ._*
@@ -89,3 +90,5 @@ Temporary Items
 
 # Build directory
 build*/
+/cmake-build-debug-pico/
+/cmake-build-release-pico/
diff --git a/CMakeLists.txt b/CMakeLists.txt
index f884574..3fe2462 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -8,29 +8,16 @@ set(CMAKE_CXX_STANDARD 17)
 # Enforce board type
 set(PICO_BOARD "adafruit_feather_rp2040")
 
-# Determine current platform
-if (APPLE)
-	set(HomeLocation "/Users")
-elseif (UNIX AND NOT APPLE)
-	set(HomeLocation "/home")
-endif()
-message(HomeLocation="${HomeLocation}")
-
 # Initialise pico_sdk from installed location
 # (note this can come from environment, CMake cache etc)
-set(PICO_SDK_PATH "${HomeLocation}/mchapman/source/pico/pico-sdk")
-
-# Initialize adafruit arduino library locations
-set(GfxLibLocation "${HomeLocation}/mchapman/source/pico-arduino-compat/libs/adafruit-gfx-library")
-set(Sh110xLibLocation "${HomeLocation}/mchapman/source/pico-arduino-compat/libs/adafruit-sh110x")
+# set(PICO_SDK_PATH "${HOME}/source/pico/pico-sdk")
 
 # Pull in Raspberry Pi Pico SDK (must be before project)
 include(pico_sdk_import.cmake)
 
 project(traegerController C CXX ASM)
 
-add_subdirectory(${GfxLibLocation} pac-adafruit-gfx-library)
-add_subdirectory(${Sh110xLibLocation} pac-adafruit-sh110x)
+add_subdirectory("$ENV{HOME}/source/pico-arduino-compat/libs/adafruit-sh110x" build_adafruit-sh110x)
 
 # Initialise the Raspberry Pi Pico SDK
 pico_sdk_init()
@@ -42,8 +29,8 @@ add_executable(traegerController traegerController.cpp traegerLogo.h)
 pico_set_program_name(traegerController "traegerController")
 pico_set_program_version(traegerController "0.1")
 
-pico_enable_stdio_uart(traegerController 0)
-pico_enable_stdio_usb(traegerController 1)
+pico_enable_stdio_uart(traegerController 1)
+pico_enable_stdio_usb(traegerController 0)
 
 # Add the standard library to the build
 target_link_libraries(traegerController pico_stdlib)
@@ -53,8 +40,8 @@ target_link_libraries(traegerController
         hardware_spi
         hardware_i2c
         hardware_timer
-        pac-adafruit-sh110x
         pac-adafruit-gfx-library
+		pac-adafruit-sh110x
 )
 
 pico_add_extra_outputs(traegerController)
diff --git a/traegerController.cpp b/traegerController.cpp
index d602b1a..dcc7a44 100644
--- a/traegerController.cpp
+++ b/traegerController.cpp
@@ -1,6 +1,6 @@
 #include <stdio.h>
 #include "Adafruit_GFX.h"
-#include "Adafruit_SH110x.h"
+#include "Adafruit_SH110X.h":
 #include "pico/stdlib.h"
 #include "pico/multicore.h"
 #include "hardware/spi.h"