3pp-mirror/ahoy
1
0
Fork 0
mirror of https://github.com/lumapu/ahoy.git synced 2025-06-04 03:31:42 +02:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'development03' of https://github.com/grindylow/ahoy into development03

Browse source
This commit is contained in:
Sandner, Denny 2022-09-05 19:28:46 +02:00
commit 4ac9a6bd9f
3 changed files with 16 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

19
tools/esp8266/config.h
View file

@ -6,21 +6,30 @@
#ifndef __CONFIG_H__ #ifndef __CONFIG_H__
#define __CONFIG_H__ #define __CONFIG_H__
// fallback WiFi info
//-------------------------------------
// WIFI CONFIGURATION
//-------------------------------------
// Fallback WiFi Info
#define FB_WIFI_SSID "YOUR_WIFI_SSID" #define FB_WIFI_SSID "YOUR_WIFI_SSID"
#define FB_WIFI_PWD "YOUR_WIFI_PWD" #define FB_WIFI_PWD "YOUR_WIFI_PWD"
// access point info // Access Point Info
// In case there is no WiFi Network or Ahoy can not connect to it, it will act as an Access Point
#define WIFI_AP_SSID "AHOY-DTU" #define WIFI_AP_SSID "AHOY-DTU"
#define WIFI_AP_PWD "esp_8266" #define WIFI_AP_PWD "esp_8266"
// stay in access point mode all the time
// If the next line is uncommented, Ahoy will stay in access point mode all the time
//#define AP_ONLY //#define AP_ONLY
//------------------------------------- //-------------------------------------
// CONFIGURATION - COMPILE TIME // CONFIGURATION - COMPILE TIME
//------------------------------------- //-------------------------------------
// time in seconds how long the station info (ssid + pwd) will be tried // time in seconds how long the station info (ssid + pwd) will be tried
#define WIFI_TRY_CONNECT_TIME 30 #define WIFI_TRY_CONNECT_TIME 30
@ -31,7 +40,7 @@
// default device name // default device name
#define DEF_DEVICE_NAME "AHOY-DTU" #define DEF_DEVICE_NAME "AHOY-DTU"
// default pinout // default pinout (GPIO Number)
#define DEF_RF24_CS_PIN 15 #define DEF_RF24_CS_PIN 15
#define DEF_RF24_CE_PIN 2 #define DEF_RF24_CE_PIN 2
#define DEF_RF24_IRQ_PIN 0 #define DEF_RF24_IRQ_PIN 0
@ -76,7 +85,7 @@
#define DEF_NTP_SERVER_NAME "pool.ntp.org" #define DEF_NTP_SERVER_NAME "pool.ntp.org"
// default NTP server port // default NTP server port
#define DEF_NTP_PORT 8888 #define DEF_NTP_PORT 123
// NTP refresh interval in ms (default 12h) // NTP refresh interval in ms (default 12h)
#define NTP_REFRESH_INTERVAL 12 * 3600 * 1000 #define NTP_REFRESH_INTERVAL 12 * 3600 * 1000

2
tools/esp8266/defines.h
View file

@ -13,7 +13,7 @@
//------------------------------------- //-------------------------------------
#define VERSION_MAJOR 0 #define VERSION_MAJOR 0
#define VERSION_MINOR 5 #define VERSION_MINOR 5
#define VERSION_PATCH 16 #define VERSION_PATCH 17
//------------------------------------- //-------------------------------------

2
tools/esp8266/hmDefines.h
View file

@ -125,7 +125,7 @@ const byteAssign_t hm1chAssignment[] = {
{ FLD_PRA, UNIT_VA, CH0, 20, 2, 10 }, { FLD_PRA, UNIT_VA, CH0, 20, 2, 10 },
{ FLD_F, UNIT_HZ, CH0, 16, 2, 100 }, { FLD_F, UNIT_HZ, CH0, 16, 2, 100 },
{ FLD_T, UNIT_C, CH0, 26, 2, 10 }, { FLD_T, UNIT_C, CH0, 26, 2, 10 },
{ FLD_ALARM_MES_ID, UNIT_NONE, CH0, 28, 2, 1 }, { FLD_ALARM_MES_ID, UNIT_NONE, CH0, 24, 2, 1 },
{ FLD_YD, UNIT_WH, CH0, CALC_YD_CH0, 0, CMD_CALC }, { FLD_YD, UNIT_WH, CH0, CALC_YD_CH0, 0, CMD_CALC },
{ FLD_YT, UNIT_KWH, CH0, CALC_YT_CH0, 0, CMD_CALC }, { FLD_YT, UNIT_KWH, CH0, CALC_YT_CH0, 0, CMD_CALC },
{ FLD_PDC, UNIT_W, CH0, CALC_PDC_CH0, 0, CMD_CALC }, { FLD_PDC, UNIT_W, CH0, CALC_PDC_CH0, 0, CMD_CALC },