From 8f57cfaaf494662664552d7c84c10440fa2acfe4 Mon Sep 17 00:00:00 2001
From: Ben Meadors <benmmeadors@gmail.com>
Date: Thu, 7 Dec 2023 17:12:51 -0600
Subject: [PATCH] Makersense rp2040 variant fixes (#2997)

* WIP

* Do the right things

* Add to build matrix

* Yaml lint has annoyed me for the final time

* Fixes to variant
---
 variants/senselora_rp2040/pins_arduino.h | 50 ++++++++++++++++++++++++
 variants/senselora_rp2040/platformio.ini |  3 +-
 variants/senselora_rp2040/variant.h      | 28 ++++---------
 3 files changed, 59 insertions(+), 22 deletions(-)
 create mode 100644 variants/senselora_rp2040/pins_arduino.h

diff --git a/variants/senselora_rp2040/pins_arduino.h b/variants/senselora_rp2040/pins_arduino.h
new file mode 100644
index 000000000..bb0ee637e
--- /dev/null
+++ b/variants/senselora_rp2040/pins_arduino.h
@@ -0,0 +1,50 @@
+#pragma once
+
+#define PIN_A0 (26u)
+#define PIN_A1 (27u)
+#define PIN_A2 (28u)
+#define PIN_A3 (29u)
+
+static const uint8_t A0 = PIN_A0;
+static const uint8_t A1 = PIN_A1;
+static const uint8_t A2 = PIN_A2;
+static const uint8_t A3 = PIN_A3;
+
+// LEDs
+#define PIN_LED (23u)
+#define PIN_LED1 PIN_LED
+#define LED_BUILTIN PIN_LED
+
+#define ADC_RESOLUTION 12
+
+// Serial
+#define PIN_SERIAL1_TX (0ul)
+#define PIN_SERIAL1_RX (1ul)
+
+#define PIN_SERIAL2_TX (4ul)
+#define PIN_SERIAL2_RX (5ul)
+
+// SPI
+#define PIN_SPI0_MISO (16u)
+#define PIN_SPI0_MOSI (19u)
+#define PIN_SPI0_SCK (18u)
+#define PIN_SPI0_SS (17u)
+
+// Wire
+#define PIN_WIRE0_SDA (6u)
+#define PIN_WIRE0_SCL (7u)
+
+#define PIN_WIRE1_SDA (-1)
+#define PIN_WIRE1_SCL (-1)
+
+#define SERIAL_HOWMANY (3u)
+#define SPI_HOWMANY (2u)
+#define WIRE_HOWMANY (1u)
+
+static const uint8_t SS = PIN_SPI0_SS;
+static const uint8_t MOSI = PIN_SPI0_MOSI;
+static const uint8_t MISO = PIN_SPI0_MISO;
+static const uint8_t SCK = PIN_SPI0_SCK;
+
+static const uint8_t SDA = PIN_WIRE0_SDA;
+static const uint8_t SCL = PIN_WIRE0_SCL;
\ No newline at end of file
diff --git a/variants/senselora_rp2040/platformio.ini b/variants/senselora_rp2040/platformio.ini
index abf28559e..3b3253ee8 100644
--- a/variants/senselora_rp2040/platformio.ini
+++ b/variants/senselora_rp2040/platformio.ini
@@ -6,9 +6,8 @@ upload_protocol = picotool
 # add our variants files to the include and src paths
 build_flags = ${rp2040_base.build_flags} 
   -DSENSELORA_RP2040
-  -Ivariants/rpipico
+  -Ivariants/senselora_rp2040
   -DDEBUG_RP2040_PORT=Serial
-  -DHW_SPI1_DEVICE
   -L "${platformio.libdeps_dir}/${this.__env__}/BSEC2 Software Library/src/cortex-m0plus"
 lib_deps =
   ${rp2040_base.lib_deps}
\ No newline at end of file
diff --git a/variants/senselora_rp2040/variant.h b/variants/senselora_rp2040/variant.h
index 78f3e8f14..9eda65521 100644
--- a/variants/senselora_rp2040/variant.h
+++ b/variants/senselora_rp2040/variant.h
@@ -1,20 +1,9 @@
-// #define RADIOLIB_CUSTOM_ARDUINO 1
-// #define RADIOLIB_TONE_UNSUPPORTED 1
-// #define RADIOLIB_SOFTWARE_SERIAL_UNSUPPORTED 1
-
 #define ARDUINO_ARCH_AVR
 
-#define USE_SSD1306 1
+#define USE_SSD1306
 
 #define BUTTON_PIN 2
-
-#define I2C_SDA1 6
-#define I2C_SCL1 7
-
-#define PIN_SPI_MISO (16u)
-#define PIN_SPI_MOSI (19u)
-#define PIN_SPI_SCK (18u)
-#define PIN_SPI_SS (17u)
+#define BUTTON_NEED_PULLUP
 
 #define LED_PIN PIN_LED
 
@@ -26,13 +15,12 @@
 #undef LORA_CS
 
 #define USE_RF95
-#define LORA_SCK PIN_SPI_SCK
-#define LORA_MISO PIN_SPI_MISO
-#define LORA_MOSI PIN_SPI_MOSI
-#define LORA_CS PIN_SPI_SS
+#define LORA_SCK PIN_SPI0_SCK
+#define LORA_MISO PIN_SPI0_MISO
+#define LORA_MOSI PIN_SPI0_MOSI
+#define LORA_CS PIN_SPI0_SS
 
 #define LORA_DIO0 21
 #define LORA_DIO1 22
-#define LORA_DIO2 23
-#define LORA_DIO5 24
-#define LORA_RST 20
+#define LORA_DIO2 RADIOLIB_NC
+#define LORA_RESET 20
\ No newline at end of file