DigitalInfinity/ESP32-PaxCounter
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #713 from cyberman54/development

Browse Source 
bugfix i2c gps broken (issue #712)
This commit is contained in:
Verkehrsrot 2021-01-07 22:08:30 +01:00 committed by GitHub
commit 2834626f3f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/gpsread.cpp
View File

@ -30,34 +30,27 @@ static uint16_t nmea_txDelay_ms = 0;
// initialize and configure GPS // initialize and configure GPS
int gps_init(void) { int gps_init(void) {
int ret = 1;
if (!gps_config()) { if (!gps_config()) {
ESP_LOGE(TAG, "GPS chip initializiation error"); ESP_LOGE(TAG, "GPS chip initializiation error");
return 0; return 0;
} }
#ifdef GPS_SERIAL #ifdef GPS_SERIAL
ESP_LOGI(TAG, "Opening serial GPS");
GPS_Serial.begin(GPS_SERIAL); GPS_Serial.begin(GPS_SERIAL);
ESP_LOGI(TAG, "Using serial GPS");
#elif defined GPS_I2C #elif defined GPS_I2C
ESP_LOGI(TAG, "Opening I2C GPS");
Wire.begin(GPS_I2C, 400000); // I2C connect to GPS device with 400 KHz Wire.begin(GPS_I2C, 400000); // I2C connect to GPS device with 400 KHz
Wire.beginTransmission(GPS_ADDR); Wire.beginTransmission(GPS_ADDR);
Wire.write(0x00); // dummy write Wire.write(0x00); // dummy write
ret = Wire.endTransmission(); // check if chip is seen on i2c bus if (Wire.endTransmission()) {
ESP_LOGE(TAG, "Quectel L76 GPS chip not found");
if (ret) { return 0;
ESP_LOGE(TAG, } else
"Quectel L76 GPS chip not found on i2c bus, bus error %d. "
"Stopping GPS-Task.",
ret);
ret = 0;
} else {
ESP_LOGI(TAG, "Quectel L76 GPS chip found"); ESP_LOGI(TAG, "Quectel L76 GPS chip found");
}
#endif #endif
return ret; return 1;
} // gps_init() } // gps_init()
// detect gps chipset type and configure it with device specific settings // detect gps chipset type and configure it with device specific settings