From 16d70c7028fb6201c82b05021042d89ea72199d4 Mon Sep 17 00:00:00 2001
From: Mateusz Lubecki <sp8ebc@interia.pl>
Date: Thu, 7 Jul 2022 13:47:57 +0200
Subject: [PATCH] virgin mobile apn config

---
 include/api/api_content.h | 8 +++++---
 include/main.h            | 4 ++--
 src/config_data_default.c | 3 ++-
 src/config_data_first.c   | 3 ++-
 src/config_data_second.c  | 3 ++-
 5 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/include/api/api_content.h b/include/api/api_content.h
index da8f6c9..6086a50 100644
--- a/include/api/api_content.h
+++ b/include/api/api_content.h
@@ -13,6 +13,7 @@
 #include "main.h"
 #include "rte_main.h"
 #include "rte_wx.h"
+#include "rte_rtu.h"
 #include "drivers/l4/pwm_input_stm32l4x.h"
 
 #define ENTRIES_STRING(ENTRY)			\
@@ -53,14 +54,15 @@
 	ENTRY(rte_wx_get_minimum_windspeed(), wind_minimal)					\
 	ENTRY(rte_wx_pm2_5, pm2_5)		\
 	ENTRY(rte_wx_pm10, pm10)	\
-	ENTRY(main_config_data_basic->ssid, ssid)	\
+	ENTRY(rte_main_average_battery_voltage, average_battery_voltage)		\
 
 #define ENTRIES_32INT_WEATHER(ENTRY)		\
 	ENTRY(master_time, master_time)						\
-
+	ENTRY((int32_t)rte_wx_current_dallas_qf, dallas_qf_curr)		\
+	ENTRY((int32_t)rte_wx_error_dallas_qf, dallas_qf_err)		\
+	ENTRY((int32_t)rte_rtu_number_of_serial_io_errors, rtu_io_errors)		\
 
 #define ENTRIES_STRING_WEATHER(ENTRY)			\
-	ENTRY(main_config_data_basic->callsign, callsign)	\
 	ENTRY(api_mac, api_mac)	\
 
 
diff --git a/include/main.h b/include/main.h
index 2fdbfb7..6d29810 100644
--- a/include/main.h
+++ b/include/main.h
@@ -7,8 +7,8 @@
 #include "drivers/serial.h"
 #include "config_data.h"
 
-#define SW_VER "EA09"
-#define SW_DATE "01072022"
+#define SW_VER "EA10"
+#define SW_DATE "08072022"
 
 #define SYSTICK_TICKS_PER_SECONDS 100
 #define SYSTICK_TICKS_PERIOD 10
diff --git a/src/config_data_default.c b/src/config_data_default.c
index 379d2ff..8aeb8aa 100644
--- a/src/config_data_default.c
+++ b/src/config_data_default.c
@@ -467,7 +467,8 @@ const config_data_rtu_t __attribute__((section(".config_section_default.rtu")))
 const config_data_gsm_t __attribute__((section(".config_section_default.gsm"))) config_data_gsm_default = {
 		.pin = "\0\0\0\0\0",
 
-		.apn = "internet\0",
+		//.apn = "internet\0",				// PlusGSM
+		.apn = "virgin-internet\0",			// Virgin Mobile
 
 		.username = "\0",
 
diff --git a/src/config_data_first.c b/src/config_data_first.c
index bf71ada..dfd540a 100644
--- a/src/config_data_first.c
+++ b/src/config_data_first.c
@@ -471,7 +471,8 @@ const config_data_rtu_t __attribute__((section(".config_section_first.rtu"))) co
 const config_data_gsm_t __attribute__((section(".config_section_first.gsm"))) config_data_gsm_first = {
 		.pin = "\0\0\0\0\0",
 
-		.apn = "internet\0",
+		//.apn = "internet\0",
+		.apn = "virgin-internet\0",
 
 		.username = "\0",
 
diff --git a/src/config_data_second.c b/src/config_data_second.c
index 5b3b763..38f6863 100644
--- a/src/config_data_second.c
+++ b/src/config_data_second.c
@@ -465,7 +465,8 @@ const config_data_rtu_t __attribute__((section(".config_section_second.rtu"))) c
 const config_data_gsm_t __attribute__((section(".config_section_second.gsm"))) config_data_gsm_second = {
 		.pin = "\0\0\0\0\0",
 
-		.apn = "internet\0",
+		//.apn = "internet\0",
+		.apn = "virgin-internet\0",
 
 		.username = "\0",