Merge branch 'main' of https://github.com/SKID-CWNU/SKIDAQ

SKID-CWNU · Apr 12, 2024 · 4206f48 · 4206f48
2 parents 2933dcc + 3ec6b40
commit 4206f48
Show file tree

Hide file tree

Showing 4 changed files with 54 additions and 28 deletions.
diff --git a/.vscode/arduino.json b/.vscode/arduino.json
@@ -1,5 +1,9 @@
 {
-    "board": "arduino:avr:uno",
-    "port": "COM18",
-    "sketch": "code\\Testing_Crate\\GPSTest\\GPSTest.ino"
+    "sketch": "code\\SKIDAQ_Main\\SKIDAQ_Main.ino",
+    "board": "rp2040:rp2040:rpipico",
+    "port": "COM7",
+    "output": "../build",
+    "intelliSenseGen": "global",
+    "programmer": "esptool",
+    "configuration": "flash=2097152_0,freq=133,opt=Optimize,rtti=Disabled,stackprotect=Enabled,exceptions=Disabled,dbgport=Disabled,dbglvl=None,usbstack=picosdk,ipbtstack=ipv4only,uploadmethod=default"
 }
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -11,9 +11,6 @@
         "string_view": "cpp",
         "initializer_list": "cpp"
     },
-    "C_Cpp.codeAnalysis.clangTidy.checks.disabled": [
-        "clang-diagnostic-error"
-    ],
     "github.codespaces.defaultExtensions": [
 
         "GitHub.codespaces",
@@ -31,8 +28,14 @@
     "diffEditor.experimental.showMoves": true,
     "cmake.configureOnOpen": false,
     "arduino.additionalUrls": [
-        "https://github.com/earlephilhower/arduino-pico/releases/download/global/package_rp2040_index.json"
+        "https://github.com/earlephilhower/arduino-pico/releases/download/global/package_rp2040_index.json",
+        "https://files.seeedstudio.com/arduino/package_seeeduino_boards_index.json",
+        "https://github.com/espressif/arduino-esp32",
+        "http://arduino.esp8266.com/stable/package_esp8266com_index.json"
     ],
     "arduino.enableUSBDetection": false,
-    "arduino.useArduinoCli": true
+    "arduino.useArduinoCli": true,
+    "arduino.analyzeOnSettingChange": false,
+    "arduino.skipHeaderProvider": true,
+    "arduino.analyzeOnOpen": false
 }
diff --git a/code/SKIDAQ_Main/SKIDAQ_Main.ino b/code/SKIDAQ_Main/SKIDAQ_Main.ino
@@ -45,6 +45,7 @@
 #include <SoftwareSerial.h>
 #include "DFRobot_MCP2515.h"
 #include <SPI.h>
+#include <TM1637.h>
 #include <Wire.h>
 
 // ——————————————————————————————————————————————————————————————————————————————
@@ -94,6 +95,16 @@ int fuel_Type = 4;
 // ——————————————————————————————————————————————————————————————————————————————
 Adafruit_ADXL345_Unified accel = Adafruit_ADXL345_Unified(12345);
 Adafruit_ADS1115 ads; /* ADS1115 - 16-bit version */
+// ——————————————————————————————————————————————————————————————————————————————
+//    Other Comp. Initalization
+// ——————————————————————————————————————————————————————————————————————————————
+char picoTemp = analogReadTemp(); // Pi Pico On-Board Temp Sensor
+int obled = LED_BUILTIN;          // On-Board LED for Basic Error Indication
+// Instantiation and pins configurations
+// Pin 7 - > DIO
+// Pin 6 - > CLK
+TM1637 tm(6, 7);
+
 // ——————————————————————————————————————————————————————————————————————————————
 //    Functions Initalization
 // ——————————————————————————————————————————————————————————————————————————————
@@ -106,12 +117,8 @@ void ADXL345_displaySensorDetails(void);
 void ADXL345_displayDataRate(void);
 void ADXL345_displayRange(void);
 void MCP2515_Init(void);
+void TM1637_Init(void);
 void blink(int deltime);
-// ——————————————————————————————————————————————————————————————————————————————
-//    Other Comp. Initalization
-// ——————————————————————————————————————————————————————————————————————————————
-char picoTemp = analogReadTemp(); // Pi Pico On-Board Temp Sensor
-int obled = LED_BUILTIN;          // On-Board LED for Basic Error Indication
 
 // ——————————————————————————————————————————————————————————————————————————————
 //    Switch Module Configuration
@@ -120,7 +127,6 @@ int obled = LED_BUILTIN;          // On-Board LED for Basic Error Indication
 #define MOSUP_PIN 12
 #define MOSDOWN_PIN 13
 #define DRS_PIN 14
-#define DiagEN 7 // Toggle Switch for OBD2 Simulation
 int DIAGENB = 0; //
 
 // ——————————————————————————————————————————————————————————————————————————————
@@ -134,25 +140,25 @@ void setup()
     pinMode(MOSDOWN_PIN, OUTPUT);
     pinMode(DRS_PIN, OUTPUT);
     pinMode(DynoInt, OUTPUT);
-    pinMode(DiagEN, INPUT);
     Serial.begin(115200);
     while (!Serial)
     {
         ;
     }
-
     delay(100);
+    TM1637_Init();
     DHT_TaskInit();
     ADS1115_Init();
     ADXL345_Init();
     MCP2515_Init();
+    blink(1000);
     Serial.println("——————————————————————————————————————————————————————————————————————————————");
     Serial.println("*                    SKIDAQ           " + String(FW_Version) + "                          *");
     Serial.println("*                By ChaeWon Lim https://github.com/WonITKorea               *");
     Serial.println("*                       Based on Open-Ecu-Sim-OBD2-FW                        *");
     Serial.println("*                By Rick Spooner https://github.com/spoonieau                *");
     Serial.println("——————————————————————————————————————————————————————————————————————————————");
-    blink(1000);
+    tm.display("OKAY");
     delay(3000);
 }
 
@@ -327,7 +333,7 @@ void loop()
                 delay(100);
             }
             //=================================================================
-            // Return CAN-BUS Messages - SUPPORTED PID's
+            // Return CAN-BUS Messages - SUPPORTED PIDs
             //=================================================================
 
             if (canMessageRead == "2,1,0,")
@@ -511,7 +517,7 @@ void loop()
 }
 
 // ——————————————————————————————————————————————————————————————————————————————
-//   Functions Configuration
+// Extra Functions Configuration
 // ——————————————————————————————————————————————————————————————————————————————
 void DHT_TaskInit(void)
 {
@@ -735,6 +741,12 @@ void MCP2515_Init(void)
     Serial.println("CAN Status: OK");
 }
 
+void TM1637_Init(void)
+{
+    tm.begin();
+    tm.setBrightnessPercent(90);
+}
+
 void blink(int deltime)
 {
     digitalWrite(LED_BUILTIN, HIGH);
@@ -743,7 +755,6 @@ void blink(int deltime)
     delay(deltime);
 }
 
-// Extra Configurations
 #ifndef ARDUINO_ARCH_RP2040
 #error "Select a Raspberry Pi Pico board"
 #endif
diff --git a/code/Testing_Crate/STIMU/STIMU.ino b/code/Testing_Crate/STIMU/STIMU.ino
@@ -44,16 +44,19 @@
 
 #define DEV_I2C Wire
 #define SerialPort Serial
-#define INT_1 22
+#define INT_1 6
+float CAL = 0;
+char Acc2of = 0;
 
 // Components
 ASM330LHHSensor AccGyr(&DEV_I2C, ASM330LHH_I2C_ADD_L);
 
-void setup() {
+void setup()
+{
   // Led.
   pinMode(LED_BUILTIN, OUTPUT);
 
-  // Force INT1 of ASM330LHH low in order to enable I2C
+  // Force INT1 of ASM330LHFH low in order to enable I2C
   pinMode(INT_1, OUTPUT);
 
   digitalWrite(INT_1, LOW);
@@ -62,17 +65,18 @@ void setup() {
 
   // Initialize serial for output.
   SerialPort.begin(115200);
-  
+
   // Initialize I2C bus.
   DEV_I2C.begin();
 
   AccGyr.begin();
-  AccGyr.Set_X_FS(2);
+  AccGyr.Set_X_FS(4);
   AccGyr.Enable_X();
   AccGyr.Enable_G();
 }
 
-void loop() {
+void loop()
+{
   // Led blinking.
   digitalWrite(LED_BUILTIN, HIGH);
   delay(250);
@@ -84,14 +88,18 @@ void loop() {
   int32_t gyroscope[3] = {};
   AccGyr.Get_X_Axes(accelerometer);
   AccGyr.Get_G_Axes(gyroscope);
-
+  if (SerialPort.readString() == "l")
+  {
+    delay(3000);
+    Acc2of = - accelerometer[2];
+  }
   // Output data.
   SerialPort.print("ASM330LHH: | Acc[mg]: ");
   SerialPort.print(accelerometer[0]);
   SerialPort.print(" ");
   SerialPort.print(accelerometer[1]);
   SerialPort.print(" ");
-  SerialPort.print(accelerometer[2]);
+  SerialPort.print(accelerometer[2] - Acc2of);
   SerialPort.print(" | Gyr[mdps]: ");
   SerialPort.print(gyroscope[0]);
   SerialPort.print(" ");