From 4568dff5d6c149c89353cf1d3762603426c57135 Mon Sep 17 00:00:00 2001
From: Lim Chae Won <wonitch03@gmail.com>
Date: Sun, 18 Aug 2024 11:21:43 +0900
Subject: [PATCH] Accept Conflicts

---
 .vscode/arduino.json             | 12 ++-------
 code/SKIDASH_FND/SKIDASH_FND.ino | 46 ++++----------------------------
 2 files changed, 7 insertions(+), 51 deletions(-)

diff --git a/.vscode/arduino.json b/.vscode/arduino.json
index befb5ad..7b88a96 100644
--- a/.vscode/arduino.json
+++ b/.vscode/arduino.json
@@ -1,13 +1,5 @@
 {
-<<<<<<< HEAD
-    "sketch": "code\\SKIDAQ_Main\\SKIDAQ_Main.ino"
-=======
-    "sketch": "code\\Testing_Crate\\I2C_Scanner\\I2C_Scanner.ino",
+    "sketch": "code\\SKIDAQ_Main\\SKIDAQ_Main.ino",
     "board": "rp2040:rp2040:rpipico",
-    "port": "COM4",
-    "output": "../build",
-    "intelliSenseGen": "global",
-    "programmer": "esptool",
-    "configuration": "flash=2097152_0,freq=133,opt=Optimize,rtti=Disabled,stackprotect=Disabled,exceptions=Disabled,dbgport=Disabled,dbglvl=None,usbstack=picosdk,ipbtstack=ipv4only,uploadmethod=default"
->>>>>>> 1ece316d2c610311e825dece8bedf766fee009a8
+    "port": "COM4"
 }
\ No newline at end of file
diff --git a/code/SKIDASH_FND/SKIDASH_FND.ino b/code/SKIDASH_FND/SKIDASH_FND.ino
index ac7d702..2872e69 100644
--- a/code/SKIDASH_FND/SKIDASH_FND.ino
+++ b/code/SKIDASH_FND/SKIDASH_FND.ino
@@ -1,44 +1,8 @@
-/* SevSeg Counter Example
- 
- Copyright 2020 Dean Reading
- 
- This example demonstrates a very simple use of the SevSeg library with a 4
- digit display. It displays a counter that counts up, showing deci-seconds.
- */
-
-#include "SevSeg.h"
-SevSeg sevseg; //Instantiate a seven segment controller object
-
 void setup() {
-  byte numDigits = 4;
-  byte digitPins[] = {2, 3, 4, 5};
-  byte segmentPins[] = {6, 7, 8, 9, 10, 11, 12, 13};
-  bool resistorsOnSegments = false; // 'false' means resistors are on digit pins
-  byte hardwareConfig = COMMON_ANODE; // See README.md for options
-  bool updateWithDelays = false; // Default 'false' is Recommended
-  bool leadingZeros = false; // Use 'true' if you'd like to keep the leading zeros
-  bool disableDecPoint = false; // Use 'true' if your decimal point doesn't exist or isn't connected
-  
-  sevseg.begin(hardwareConfig, numDigits, digitPins, segmentPins, resistorsOnSegments,
-  updateWithDelays, leadingZeros, disableDecPoint);
-  sevseg.setBrightness(90);
+    pinMode(15, OUTPUT);
 }
-
 void loop() {
-  static unsigned long timer = millis();
-  static int deciSeconds = 0;
-  
-  if (millis() - timer >= 100) {9
-    timer += 100;
-    deciSeconds++; // 100 milliSeconds is equal to 1 deciSecond
-    
-    if (deciSeconds == 10000) { // Reset to 0 after counting for 1000 seconds.
-      deciSeconds=0;
-    }
-    sevseg.setNumber(deciSeconds, 1);
-  }
-
-  sevseg.refreshDisplay(); // Must run repeatedly
-}
-
-/// END ///
+    digitalWrite(15, HIGH);
+    delay(1000);
+    digitalWrite(15, LOW);
+}
\ No newline at end of file