Browse Source

Minor correction.

software_develop
Maximilian Stiefel 7 years ago
parent
commit
ab0eca2fa2
  1. 19
      software/app/application.cpp
  2. 2
      software/app/dac101c085.cpp

19
software/app/application.cpp

@ -60,18 +60,35 @@ void adcCallback(cDoubleBuffer<ads::ads_sample_t> & buffer) {
adc.SetMux(static_cast<ads::eInputMux>(ads::eInputMux::AIN_0 + channel));
}
void ready()
{
debugf("READY!");
// If AP is enabled:
debugf("AP. ip: %s mac: %s", WifiAccessPoint.getIP().toString().c_str(), WifiAccessPoint.getMAC().c_str());
}
void init() {
spiffs_mount();
Serial.begin(460800);
system_update_cpu_freq(SYS_CPU_160MHZ);
wifi_set_sleep_type(NONE_SLEEP_T);
System.onReady(ready);
WifiAccessPoint.enable(true);
WifiAccessPoint.setIP(IPAddress(10, 0, 0, 1)); //TODO
WifiAccessPoint.config("UppSense Photometer", "Sexy", AUTH_WPA2_PSK, false, 3, 200);
//scl, sda
Wire.pins(4, 5);
Wire.begin();
//SET higher CPU freq & disable wifi sleep
//WDT.enable(false);
// Turn off LED for measurements
pinMode(LED_PIN, OUTPUT);
digitalWrite(LED_PIN, 1);
adc.SetMux(ads::eInputMux::AIN_0);
adc.SetSampleSpeed(ads::eSampleSpeed::SPS_3300);
adc.SetGain(ads::eGainAmplifier::FSR_4_096);
@ -85,8 +102,6 @@ void init() {
WifiEvents.onStationDisconnect(STADisconnect);
WifiEvents.onStationGotIP(STAGotIP);
/* WifiAccessPoint.setIP(IPAddress(10, 0, 0, 1)); //TODO
WifiAccessPoint.config("Sensus", "", AUTH_OPEN, false, 3);*/
cWebInterface::GetInstance()->Start();
procTimer.initializeMs(HUB_PERIOD, updateSensorHub).start();

2
software/app/dac101c085.cpp

@ -19,7 +19,7 @@ namespace dac {
//-------------------------------------Constructor----------------------------------------------------------------------------
cDAC101C085::cDAC101C085(uint8_t i_number, uint8_t i_address):
m_number(i_number), m_address(i_address)
m_dac_number(i_number), m_address(i_address)
{}
//-------------------------------------Destructor-----------------------------------------------------------------------------

Loading…
Cancel
Save