Index: sources/storage/StorageGlobals.cpp =================================================================== diff -u -rcb5477be624b09e13d5fc4498634ca621722fd0e -rbd560752aaa76183f168f0af6ad97b75b6b57c79 --- sources/storage/StorageGlobals.cpp (.../StorageGlobals.cpp) (revision cb5477be624b09e13d5fc4498634ca621722fd0e) +++ sources/storage/StorageGlobals.cpp (.../StorageGlobals.cpp) (revision bd560752aaa76183f168f0af6ad97b75b6b57c79) @@ -26,18 +26,84 @@ namespace Storage { // USB - const char *USB_Mount_Point = "/media/usb/"; - const char *USB_File_System = "vfat"; + const char *USB_Mount_Point = "/media/usb/"; + const char *USB_File_System = "vfat"; // Log - const char *Log_Base_Path_Name = "/media/sd-card/"; - const char *Log_Base_Path_Name_Location = "/media/sd-card/log/"; - const char *Log_File_Name = "denali.log"; + const char *Log_Base_Path_Name = "/media/sd-card/"; + const char *Log_Base_Path_Name_Location = "/media/sd-card/log/"; + const char *Log_File_Name = "denali.log"; // Treatment const char *Treatment_Base_Dir = "/media/sd-card/treatment/"; const char *Treatment_Profiles_Dir = "/media/sd-card/treatment/profiles/"; const char *Treatment_Parameter_Ranges_Path_JSON = "/media/sd-card/treatment/denali.conf"; - const char *SDCard_Base_Path_Name = "/media/sd-card/"; + // SDCard + const char *SDCard_Base_Path_Name = "/media/sd-card/"; + + // Bluetooth +#ifdef BUILD_FOR_DESKTOP + const char *Bluetooth_Saved_Devices_Path_JSON = "/home/denali/Projects/application/settings/bledevices.conf"; +#elif BUILD_FOR_TARGET + const char *Bluetooth_Saved_Devices_Path_JSON = "/home/root/settings/bledevices.conf"; +#endif + + // Wifi +#ifdef BUILD_FOR_DESKTOP + const char *Wifi_Scripts_Dir = "/home/denali/Projects/application/scripts/"; +#elif BUILD_FOR_TARGET + const char *Wifi_Scripts_Dir = "/home/root/"; +#endif + 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"; + + // Wifi - Settings +#ifdef BUILD_FOR_DESKTOP + QSettings WifiSettings("/home/denali/wifi.ini"); +#elif BUILD_FOR_TARGET + QSettings WifiSettings("/home/root/settings/wifi.ini", QSettings::IniFormat); +#endif + + 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"; + + // Date and Time +#ifdef BUILD_FOR_DESKTOP + const char *Date_Time_Set = "/home/denali/Projects/application/scripts/date_time_set.sh"; +#elif BUILD_FOR_TARGET + const char *Date_Time_Set = "/home/root/date_time_set.sh"; +#endif + + // Brightness +#ifdef BUILD_FOR_DESKTOP + QSettings BrightnessSettings("/home/denali/brightness.ini"); + const char *Brightness_Set = "/home/denali/Projects/application/scripts/brightness_set.sh"; +#elif BUILD_FOR_TARGET + QSettings BrightnessSettings("/home/root/settings/brightness.ini", QSettings::IniFormat); + const char *Brightness_Set = "/home/root/brightness_set.sh"; +#endif + + const char *Brightness_Level = "brightness/level"; + }