lora-aprs/LoRa_APRS_iGate
1
0
Fork 0
mirror of https://github.com/lora-aprs/LoRa_APRS_iGate.git synced 2025-12-06 07:42:00 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into lora-aprs-lib_version_prep

Browse source
This commit is contained in:
Peter Buchegger 2020-11-01 01:01:37 +01:00
parent 38e77ec272 9aaae606ad
commit aa55634189
5 changed files with 15 additions and 53 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/LoRa_APRS_iGate.cpp
View file

@ -10,7 +10,6 @@
#include "LoRa_APRS.h" #include "LoRa_APRS.h"
#include "pins.h" #include "pins.h"
#include "settings.h"
#include "display.h" #include "display.h"
#include "configuration.h" #include "configuration.h"
@ -60,7 +59,6 @@ void setup()
} else { } else {
Serial.println("LoRa-APRS / Init / AXP192 Begin FAIL"); Serial.println("LoRa-APRS / Init / AXP192 Begin FAIL");
} }
Wire.begin(SDA, SCL);
powerManagement.activateLoRa(); powerManagement.activateLoRa();
powerManagement.activateOLED(); powerManagement.activateOLED();
powerManagement.deactivateGPS(); powerManagement.deactivateGPS();

1
src/configuration.cpp
View file

@ -1,7 +1,6 @@
#include "SPIFFS.h" #include "SPIFFS.h"
#include "configuration.h" #include "configuration.h"
#include "settings.h"
ConfigurationManagement::ConfigurationManagement(String FilePath) ConfigurationManagement::ConfigurationManagement(String FilePath)

14
src/power_management.cpp
View file

@ -7,14 +7,14 @@ PowerManagement::PowerManagement()
} }
// cppcheck-suppress unusedFunction // cppcheck-suppress unusedFunction
bool PowerManagement::begin(TwoWire port) bool PowerManagement::begin(TwoWire & port)
{ {
bool result = axp.begin(port, AXP192_SLAVE_ADDRESS); bool result = axp.begin(port, AXP192_SLAVE_ADDRESS);
if(!result) if(!result)
{ {
axp.setDCDC1Voltage(3300); axp.setDCDC1Voltage(3300);
} }
return result; return result;
} }
// cppcheck-suppress unusedFunction // cppcheck-suppress unusedFunction

16
src/power_management.h
View file

@ -8,19 +8,19 @@ class PowerManagement
{ {
public: public:
PowerManagement(); PowerManagement();
bool begin(TwoWire port); bool begin(TwoWire & port);
void activateLoRa(); void activateLoRa();
void deactivateLoRa(); void deactivateLoRa();
void activateGPS(); void activateGPS();
void deactivateGPS(); void deactivateGPS();
void activateOLED(); void activateOLED();
void decativateOLED(); void decativateOLED();
private: private:
AXP20X_Class axp; AXP20X_Class axp;
}; };
#endif #endif

35
src/settings.h
View file

@ -1,35 +0,0 @@
#ifndef SETTINGS_H_
#define SETTINGS_H_
///////////////////////////////////////////////////
/////// DON'T CHANGE THIS FILE ANYMORE! ///////
///////////////////////////////////////////////////
/////// Use the json file in the folder ///////
/////// 'data' to configure your iGate ///////
/////// and upload it via 'Upload File ///////
/////// System image'! These settings ///////
/////// will be removed soon! ///////
///////////////////////////////////////////////////
#define WIFI_NAME ""
#define WIFI_KEY ""
#define USER "NOCALL-10"
#define PASS ""
#define SERVER "austria.aprs2.net"
//#define SERVER "euro.aprs2.net"
#define PORT 14580
#define BEACON_TIMEOUT (15)
#define BEACON_LAT_POS "4819.82N"
#define BEACON_LONG_POS "01418.68E"
#define BEACON_MESSAGE "LoRa IGATE (RX only), Info: github.com/peterus/LoRa_APRS_iGate"
//#define SEND_MESSAGES_FROM_IS_TO_LORA
#endif