Index: sources/storage/StorageGlobals.cpp =================================================================== diff -u -ra64c31ec79b3af203691f70397cc31f5727f47f4 -r7077e38c74db9cccb5496ffefcf8936c0916de76 --- sources/storage/StorageGlobals.cpp (.../StorageGlobals.cpp) (revision a64c31ec79b3af203691f70397cc31f5727f47f4) +++ sources/storage/StorageGlobals.cpp (.../StorageGlobals.cpp) (revision 7077e38c74db9cccb5496ffefcf8936c0916de76) @@ -57,17 +57,52 @@ // Scripts #ifdef BUILD_FOR_TARGET - const char *Scripts_Path_Name = "/home/root/scripts/"; + const char *Scripts_Path_Name = "/home/root/scripts/"; #else // should be in the project application folder. [is tracking by git] - const char *Scripts_Path_Name = "/home/denali/Projects/application/scripts/"; + const char *Scripts_Path_Name = "/home/denali/Projects/application/scripts/"; #endif - // Date and Time - const char *Date_Time_Set_Sh = "date_time_set.sh"; - // Treatment // Please notice that is the folder not the path // and it needs to be concatenated after SDCard_Base_Path_Name for each build configuration - const char *Treatment_Log_Folder = "treatment/"; + const char *Treatment_Log_Folder = "treatment/"; + + + // FIXME : Not sure having global settings object is a good idea. +#ifdef BUILD_FOR_DESKTOP + QSettings WifiSettings("/home/denali/wifi.ini"); +#elif BUILD_FOR_TARGET + QSettings WifiSettings("/home/root/wifi.ini", QSettings::IniFormat); +#endif + + // TODO : These need to be removed from here because they are only used in their specific classes. + // Date and Time + const char *Date_Time_Set_Sh = "date_time_set.sh"; + + // WiFi Settings + const char *Wifi_Disconnect_Network = "wifi_disconnect_network.sh"; + const char *Wifi_Generate_WPA_Supplicant = "wifi_generate_wpa_supplicant.sh"; + const char *Wifi_Read_DNS = "wifi_read_dns.sh"; + const char *Wifi_Read_Gateway = "wifi_read_gateway.sh"; + const char *Wifi_Read_IP_Settings = "wifi_read_ip_settings.sh"; + const char *Wifi_Get_Auto_Assigned_IP = "wifi_request_auto_assigned_ip.sh"; + const char *Wifi_Reset_Adapter = "wifi_reset_adapter.sh"; + const char *Wifi_Reset_Interface = "wifi_reset_interface.sh"; + const char *Wifi_Scan_For_Networks = "wifi_scan_for_networks.sh"; + const char *Wifi_Set_Auto_Assigned_IP = "wifi_set_auto_assigned_ip.sh"; + const char *Wifi_Set_DNS = "wifi_set_dns.sh"; + const char *Wifi_Set_Static_IP = "wifi_set_static_ip.sh"; + const char *Wifi_Set_Gateway = "wifi_set_gateway.sh"; + const char *Wifi_Set_SubnetMask = "wifi_set_subnetmask.sh"; + const char *Wifi_Start_WPA_Supplicant = "wifi_start_wpa_supplicant.sh"; + const char *WifiSettings_SSID = "wifi/ssid"; + const char *WifiSettings_MacAddress = "wifi/macAddress"; + const char *WifiSettings_ConfPath = "wifi/confPath"; + const char *WifiSettings_Security_Types = "wifi/security"; + const char *WifiSettings_IPAddress = "wifi/ipAddress"; + const char *WifiSettings_Gateway = "wifi/gateway"; + const char *WifiSettings_SubnetMask = "wifi/subnetmask"; + const char *WifiSettings_DNS = "wifi/dns"; + const char *WifiSettings_UseDHCP = "wifi/useDHCP"; }