Raspberry PI 4 support, detection and specific tunning.

Blackvoxel · Aug 5, 2021 · daf0eed · daf0eed
1 parent a5b6db9
commit daf0eed
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 8 deletions.
diff --git a/src/ACompileSettings.h b/src/ACompileSettings.h
@@ -53,7 +53,7 @@
  # define COMPILEOPTION_SPECIAL 0
 #endif
 
-#define COMPILEOPTION_VERSIONNUM 242
+#define COMPILEOPTION_VERSIONNUM 250
 
 // Options du jeu
 
@@ -66,13 +66,13 @@
  #define COMPILEOPTION_ALLOWSAVE 1
  #define COMPILEOPTION_ALLOWSAVEPLAYERSTATE 1
  #define COMPILEOPTION_ALLOWVEHICLE 1
- #define COMPILEOPTION_VERSIONSTRING "VERSION 2.41 (c) 2017 LAURENT THIEBAUT & OLIVIA MERLE"
+ #define COMPILEOPTION_VERSIONSTRING "VERSION 2.50 (c) 2021 LAURENT THIEBAUT & OLIVIA MERLE"
 #else
  #define COMPILEOPTION_INVENTORY_DEMOCONTENT 0
  #define COMPILEOPTION_ALLOWSAVE 1
  #define COMPILEOPTION_ALLOWSAVEPLAYERSTATE 1
  #define COMPILEOPTION_ALLOWVEHICLE 1
- #define COMPILEOPTION_VERSIONSTRING "VERSION 2.41 : CONFIDENTIAL TESTING (c) LAURENT THIEBAUT & OLIVIA MERLE"
+ #define COMPILEOPTION_VERSIONSTRING "VERSION 2.50 : CONFIDENTIAL TESTING (c) LAURENT THIEBAUT & OLIVIA MERLE"
 #endif
 
 // Options de debogage
@@ -84,7 +84,7 @@
 # define COMPILEOPTION_FALLAREFATALS 0
 # define COMPILEOPTION_FINETIMINGTRACKING 0
 # define COMPILEOPTION_DEBUGFACILITY 1
-# define COMPILEOPTION_NOMOUSECAPTURE 0
+# define COMPILEOPTION_NOMOUSECAPTURE 1
 # define COMPILEOPTION_VOXELPROCESSOR 1
 # define COMPILEOPTION_DONTEMPTYINVENTORYONDEATH 1
 # define COMPILEOPTION_ALPHA_SOUNDS_1 1
@@ -173,7 +173,7 @@
 
 #endif
 
-// *************** RASPBERRY PI 2/3 SPECIAL SUPPORT *************************
+// *************** RASPBERRY PI 2/3/4 SPECIAL SUPPORT *************************
 
 // At this time, Raspberry PI setting will be enforced automatically for any ARM CPU device.
 // This is a shortcut, but at this time, most of these platforms have very limited horsepower and

diff --git a/src/ZOs_Specific_HardwareDependent.cpp b/src/ZOs_Specific_HardwareDependent.cpp
@@ -24,7 +24,8 @@ char const * ZHardwareInfo::String_Profile[] =
  "ARM_GENERAL_PROFILE",
  "ARM_RASPBERRY_PI_1",
  "ARM_RASPBERRY_PI_2",
- "ARM_RASPBERRY_PI_3"
+ "ARM_RASPBERRY_PI_3",
+ "ARM_RASPBERRY_PI_4"
 };
 
 
@@ -81,6 +82,7 @@ void ZHardwareInfo::Detect_CPU_Linux()
  if (Value == "0xb76") HardwareProfile = ARM_RASPBERRY_PI_1;
  if (Value == "0xc07") HardwareProfile = ARM_RASPBERRY_PI_2;
  if (Value == "0xd03") HardwareProfile = ARM_RASPBERRY_PI_3;
+ if (Value == "0xd08") HardwareProfile = ARM_RASPBERRY_PI_4;
  }
  }
 

diff --git a/src/ZOs_Specific_HardwareDependent.h b/src/ZOs_Specific_HardwareDependent.h
@@ -31,7 +31,7 @@ class ZHardwareInfo
 
  public:
  enum {CPUTYPE_X86, CPUTYPE_ARM} CpuType;
- enum {X86_GENERAL_PROFILE, X86_NETBOOK_PROFILE, ARM_GENERAL_PROFILE, ARM_RASPBERRY_PI_1, ARM_RASPBERRY_PI_2, ARM_RASPBERRY_PI_3} HardwareProfile;
+ enum {X86_GENERAL_PROFILE, X86_NETBOOK_PROFILE, ARM_GENERAL_PROFILE, ARM_RASPBERRY_PI_1, ARM_RASPBERRY_PI_2, ARM_RASPBERRY_PI_3, ARM_RASPBERRY_PI_4} HardwareProfile;
 
  char * GetProfileText() { return ((char *)String_Profile[HardwareProfile]);}
 

diff --git a/src/ZSettings_Hardware.cpp b/src/ZSettings_Hardware.cpp
@@ -263,7 +263,7 @@ void ZSettings_Hardware:: AdjustForRealHardware(ZHardwareInfo * HardwareInfo)
  case ZHardwareInfo::ARM_GENERAL_PROFILE: RenderingDistance_Horizontal = 3;
  RenderingDistance_Vertical = 1;
  break;
- case ZHardwareInfo::ARM_RASPBERRY_PI_1: RenderingDistance_Horizontal = 1;
+ case ZHardwareInfo::ARM_RASPBERRY_PI_1: RenderingDistance_Horizontal = 1; // Not supposed to work on PI 1
  RenderingDistance_Vertical = 1;
  break;
  case ZHardwareInfo::ARM_RASPBERRY_PI_2: RenderingDistance_Horizontal = 1;
@@ -272,6 +272,9 @@ void ZSettings_Hardware:: AdjustForRealHardware(ZHardwareInfo * HardwareInfo)
  case ZHardwareInfo::ARM_RASPBERRY_PI_3: RenderingDistance_Horizontal = 2;
  RenderingDistance_Vertical = 1;
  break;
+ case ZHardwareInfo::ARM_RASPBERRY_PI_4: RenderingDistance_Horizontal = 5;
+ RenderingDistance_Vertical = 3;
+ break;
  }
 
  // If settings are manually fixed, use these settings instead.