Updated for ESP32-C3

stanleyhuangyc · Nov 2, 2021 · b694df6 · b694df6
1 parent 11cdc38
commit b694df6
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 27 deletions.
diff --git a/ESPRIT/gps_logger/config.xml b/ESPRIT/gps_logger/config.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <config>
-<target board="esp32 esp32_16m" monitor_baudrate="115200" compiler_opts="-DHAVE_CONFIG">
+<target board="esp32 esp32c3" monitor_baudrate="115200" compiler_opts="-DHAVE_CONFIG">
   <define name="Storage">
     <option name="None" const="STORAGE=STORAGE_NONE"/>
     <option name="Flash (SPIFFS)" const="STORAGE=STORAGE_SPIFFS" default="true"/>

diff --git a/ESPRIT/gps_logger/datalogger.h b/ESPRIT/gps_logger/datalogger.h
@@ -29,7 +29,7 @@ class NullLogger {
         write(buf, len);
         m_dataCount++;
     }
-    virtual void log(uint16_t pid, unsigned int value)
+    virtual void log(uint16_t pid, uint32_t value)
     {
         char buf[24];
         byte len = sprintf(buf, "%X,%u", pid, value);
@@ -133,8 +133,8 @@ class SDLogger : public NullLogger {
         SD.mkdir("/DATA");
         char path[24];
         sprintf(path, "/DATA/%u.CSV", m_id);
-        Serial.print("File: ");
-        Serial.println(path);
+        //Serial.print("File: ");
+        //Serial.println(path);
         m_file = SD.open(path, FILE_WRITE);
         if (!m_file) {
             Serial.println("File error");
@@ -184,8 +184,8 @@ class SPIFFSLogger : public NullLogger {
         m_id = getFileID(root);
         char path[24];
         sprintf(path, "/DATA/%u.CSV", m_id);
-        Serial.print("File: ");
-        Serial.println(path);
+        //Serial.print("File: ");
+        //Serial.println(path);
         m_file = SPIFFS.open(path, FILE_WRITE);
         if (!m_file) {
             Serial.println("File error");

diff --git a/ESPRIT/gps_logger/dataserver.cpp b/ESPRIT/gps_logger/dataserver.cpp
@@ -30,7 +30,6 @@
 #include <FreematicsPlus.h>
 #if defined(ESP32)
 #include <WiFi.h>
-#include <ESPmDNS.h>
 #include <SPIFFS.h>
 #include <apps/sntp/sntp.h>
 #include <esp_spi_flash.h>
@@ -44,12 +43,6 @@
 
 extern uint32_t fileid;
 
-extern "C"
-{
-uint8_t temprature_sens_read();
-uint32_t hall_sens_read();
-}
-
 #if ENABLE_HTTPD
 HttpParam httpParam;
 
@@ -76,10 +69,6 @@ int handlerInfo(UrlHandlerParam* param)
         timeinfo.tm_hour, timeinfo.tm_min, timeinfo.tm_sec);
     }
 
-    int deviceTemp = (int)temprature_sens_read() * 165 / 255 - 40;
-    bytes += snprintf(buf + bytes, bufsize - bytes, "\"cpu\":{\"temperature\":%d,\"magnetic\":%d},\n",
-        deviceTemp, hall_sens_read());
-
 #if STORAGE == STORAGE_SPIFFS
     bytes += snprintf(buf + bytes, bufsize - bytes, "\"spiffs\":{\"total\":%u,\"used\":%u}",
         SPIFFS.totalBytes(), SPIFFS.usedBytes());
@@ -335,9 +324,9 @@ bool serverCheckup(int wifiJoinPeriod)
             Serial.println(WiFi.localIP());
 
             // start mDNS responder
-            MDNS.begin("gpslogger");
-            MDNS.addService("http", "tcp", 80);
-            MDNS.addService("nmea", "tcp", NMEA_TCP_PORT);
+            //MDNS.begin("gpslogger");
+            //MDNS.addService("http", "tcp", 80);
+            //MDNS.addService("nmea", "tcp", NMEA_TCP_PORT);
 
             wifiStartTime = 0;
         }

diff --git a/ESPRIT/gps_logger/gps_logger.ino b/ESPRIT/gps_logger/gps_logger.ino
@@ -14,7 +14,7 @@
 * THE SOFTWARE.
 *************************************************************************/
 
-#include <SPI.h>
+#include <Wire.h>
 #include <FS.h>
 #include <SD.h>
 #include <SPIFFS.h>
@@ -282,9 +282,6 @@ public:
     }
     void logSensorData()
     {
-        int deviceTemp = (int)temprature_sens_read() * 165 / 255 - 40;
-        store.log(PID_DEVICE_TEMP, deviceTemp);
-        store.log(PID_DEVICE_HALL, hall_sens_read() / 100);
         store.log(PID_EXT_SENSOR1, analogRead(A0));
     }
     void waitGPS()
@@ -432,6 +429,12 @@ void setup()
     pinMode(PIN_LED, OUTPUT);
     pinMode(PIN_LED, HIGH);
 
+#ifdef ARDUINO_ESP32C3_DEV
+    Wire.begin(4, 5);
+#else
+    Wire.begin();
+#endif
+
 #if ENABLE_DISPLAY
     lcd.begin();
     initDisplay();
@@ -543,7 +546,7 @@ void setup()
     lcd.println(TRACCAR_HOST);
 #endif
 
-    Serial.print("File...");
+    Serial.print("File:");
     fileid = store.open();
     if (fileid) {
         Serial.println(fileid);
@@ -585,8 +588,9 @@ void loop()
     uint32_t ts = millis();
 
     store.setTimestamp(ts);
-    logger.logSensorData();
+    //logger.logSensorData();
     bool updated = logger.logGPSData();
+    Serial.println(gd->ts);
     if (gd && millis() - gd->ts > GPS_SIGNAL_TIMEOUT) {
 #ifdef ENABLE_WIFI_STATION
         WiFi.disconnect(false);
@@ -644,7 +648,7 @@ void loop()
 #if ENABLE_HTTPD
     serverProcess(ts < MIN_LOOP_TIME ? (MIN_LOOP_TIME - ts) : 0);
 #else
-    if (ts < MIN_LOOP_TIME) delay(MIN_LOOP_TIME - ts);
+    //if (ts < MIN_LOOP_TIME) delay(MIN_LOOP_TIME - ts);
 #endif
 #endif
 }