Merge branch 'AdaCore:master' into topic/stm32_flash

Author: reznikmm

components/src/motion/lis3dsh/lis3dsh.adb

@@ -1,6 +1,6 @@
 ------------------------------------------------------------------------------
 --                                                                          --
---                 Copyright (C) 2015-2016, AdaCore                         --
+--                 Copyright (C) 2015-2026, AdaCore                         --
 --                                                                          --
 --  Redistribution and use in source and binary forms, with or without      --
 --  modification, are permitted provided that the following conditions are  --
@@ -41,7 +41,6 @@
 ------------------------------------------------------------------------------
 
 with Ada.Unchecked_Conversion;
-with System;
 with Interfaces; use Interfaces;
 
 package body LIS3DSH is
@@ -111,16 +110,12 @@ package body LIS3DSH is
       Axes : out Axes_Accelerations)
    is
 
-      Buffer : array (0 .. 5) of UInt8 with Alignment => 2, Size => 48;
-      Scaled : Float;
+      type Device_Data is array (0 .. 5) of UInt8 with Alignment => 2, Size => 48;
 
-      type Integer16_Pointer is access all Integer_16
-        with Storage_Size => 0;
+      Buffer : Device_Data;
 
-      function As_Pointer is new Ada.Unchecked_Conversion
-        (Source => System.Address, Target => Integer16_Pointer);
-      --  So that we can treat the address of a UInt8 as a pointer to a two-UInt8
-      --  sequence representing a signed Integer_16 quantity
+      function As_Axes_Accelerations is new Ada.Unchecked_Conversion
+        (Source => Device_Data, Target => Axes_Accelerations);
 
    begin
       This.Loc_IO_Read (Buffer (0), OUT_X_L);
@@ -130,26 +125,13 @@ package body LIS3DSH is
       This.Loc_IO_Read (Buffer (4), OUT_Z_L);
       This.Loc_IO_Read (Buffer (5), OUT_Z_H);
 
-      Get_X : declare
-         Raw : Integer_16 renames As_Pointer (Buffer (0)'Address).all;
+      Scale_Them : declare
+         Raw : Axes_Accelerations renames As_Axes_Accelerations (Buffer);
       begin
-         Scaled := Float (Raw) * This.Sensitivity;
-         Axes.X := Axis_Acceleration (Scaled);
-      end Get_X;
-
-      Get_Y : declare
-         Raw : Integer_16 renames As_Pointer (Buffer (2)'Address).all;
-      begin
-         Scaled := Float (Raw) * This.Sensitivity;
-         Axes.Y := Axis_Acceleration (Scaled);
-      end Get_Y;
-
-      Get_Z : declare
-         Raw : Integer_16 renames As_Pointer (Buffer (4)'Address).all;
-      begin
-         Scaled := Float (Raw) * This.Sensitivity;
-         Axes.Z := Axis_Acceleration (Scaled);
-      end Get_Z;
+         Axes.X := Axis_Acceleration (Float (Raw.X) * This.Sensitivity);
+         Axes.Y := Axis_Acceleration (Float (Raw.Y) * This.Sensitivity);
+         Axes.Z := Axis_Acceleration (Float (Raw.Z) * This.Sensitivity);
+      end Scale_Them;
    end Get_Accelerations;
 
    ---------------

components/src/radio/si4432/si4432.adb

@@ -570,24 +570,16 @@ package body Si4432 is
      (This  : Si4432_Driver;
       Value : UInt9)
    is
-      Data : constant Unsigned_16 := Unsigned_16 (Value);
+      Data : HAL.SPI.SPI_Data_8b (1 .. 2);
+      Reg  : Modulation_Mode_Control_2_Register with Import,
+        Address => Data (1)'Address;
+
    begin
-      Write_Register
-        (This,
-         Frequency_Deviation_Name,
-         Register (Data and 16#FF#));
-
-      if (Data and 2#1_0000_0000#) /= 0 then
-         declare
-            R    : Register := Read_Register
-              (This, Modulation_Mode_Control_2_Name);
-            Reg  : Modulation_Mode_Control_2_Register with Import,
-              Address => R'Address;
-         begin
-            Reg.fd := 1;
-            Write_Register (This, Modulation_Mode_Control_2_Name, R);
-         end;
-      end if;
+      Data (1) := UInt8 (Read_Register (This, Modulation_Mode_Control_2_Name));
+      Reg.fd   :=
+        (if (Unsigned_16 (Value) and 2#1_0000_0000#) > 0 then 1 else 0);
+      Data (2) := UInt8 (Unsigned_16 (Value) and 16#FF#);
+      Write_Register (This, Modulation_Mode_Control_2_Name, Data);
    end Set_Frequency_Deviation;
 
    -----------------------------
@@ -1435,7 +1427,8 @@ package body Si4432 is
 
    begin
       Data (1) := UInt8 (Read_Register (This, Header_Control_2_Name));
-      Reg.prealen := Bit (Unsigned_16 (Value) and 2#1_0000_0000#);
+      Reg.prealen :=
+        (if (Unsigned_16 (Value) and 2#1_0000_0000#) > 0 then 1 else 0);
       Data (2) := UInt8 (Local and 16#FF#);
 
       Write_Register (This, Header_Control_2_Name, Data);
@@ -2774,10 +2767,21 @@ package body Si4432 is
       Data : SPI_Data_8b) is
    begin
       Set_Packet_Length (This, Data'Length);
-      Write_Register (This, FIFO_Access_Name, Data);
+      Write_FIFO (This, Data);
       Set_State (This, TX);
    end Send;
 
+   ----------------
+   -- Write_FIFO --
+   ----------------
+
+   procedure Write_FIFO
+     (This : Si4432_Driver;
+      Data : SPI_Data_8b) is
+   begin
+      Write_Register (This, FIFO_Access_Name, Data);
+   end Write_FIFO;
+
    ------------------
    -- Get_Received --
    ------------------
@@ -2790,14 +2794,24 @@ package body Si4432 is
         (Get_Received_Packet_Length (This));
       Length   : constant Natural := Natural'Min (Received, Data'Length);
    begin
-      Read_Register
-        (This, FIFO_Access_Name, Data (Data'First .. Data'First + Length - 1));
+      Read_FIFO (This, Data (Data'First .. Data'First + Length - 1));
 
       if Received <= Data'Length then
          Clear_RX_FIFO (This);
       end if;
    end Get_Received;
 
+   ---------------
+   -- Read_FIFO --
+   ---------------
+
+   procedure Read_FIFO
+     (This : Si4432_Driver;
+      Data : out SPI_Data_8b) is
+   begin
+      Read_Register (This, FIFO_Access_Name, Data);
+   end Read_FIFO;
+
    -------------------
    -- Clear_RX_FIFO --
    -------------------

components/src/radio/si4432/si4432.ads

@@ -1921,6 +1921,16 @@ package Si4432 is
      (This : Si4432_Driver)
       return FIFO_Threshold;
 
+   procedure Write_FIFO
+     (This : Si4432_Driver;
+      Data : SPI_Data_8b);
+   --  Write data to the FIFO
+
+   procedure Read_FIFO
+     (This : Si4432_Driver;
+      Data : out SPI_Data_8b);
+   --  Read data from the FIFO
+
 private
 
    type Register_Address is range 16#00# .. 16#7F# with Size => UInt7'Size;

components/src/sensors/barometer/BMP280/README.md

@@ -0,0 +1,2 @@
+See components/src/sensors/combined/BMP280
+

components/src/sensors/combined/BMP280/README.md

@@ -0,0 +1,6 @@
+The BMP280 is an absolute barometric pressure sensor especially designed for mobile applications.
+
+Pressure resolution 0.16 Pa
+
+Temperature resolution 0.01°C
+