pappersverk · axelson · Oct 10, 2021 · Oct 27, 2021 · Oct 27, 2021 · Nov 8, 2021
diff --git a/README.md b/README.md
@@ -5,8 +5,7 @@
 
 This is a port of Pimoroni's [python Inky
 library](https://github.com/pimoroni/inky) written in Elixir. This library is
-intended to support both Inky pHAT and wHAT, but since we only have pHATs, the
-wHAT support may not be fully functional.
+intended to support the Inky pHAT and Inky Impression. Eventually it will support the Inky wHAT as well but it is not currently supported.
 
 See the [API reference](https://hexdocs.pm/inky/api-reference.html) for details
 on how to use the functionality provided.
@@ -19,15 +18,15 @@ can not see results without using a physical device.
 
 ### Scenic Driver
 
-A [basic driver](https://github.com/pappersverk/scenic_driver_inky) for scenic
-is in the works, check it out, to follow how it is progressing.
+There is [basic driver](https://github.com/pappersverk/scenic_driver_inky) for use with
+[scenic](https://github.com/ScenicFramework/scenic).
 
 ## Getting started
 
 Inky is available on Hex. Add inky to your mix.exs deps:
 
 ```elixir
-{:inky, "~> 1.0.1"},
+{:inky, "~> 1.0.2"},
 ```
 
 Run `mix deps.get` to get the new dep.
@@ -46,7 +45,8 @@ config in init, adjust accordingly):
 
 ```elixir
 # Start your Inky process ...
-{:ok, pid} = Inky.start_link(:phat, :red, %{name: InkySample})
+type = :phat_il91874
+{:ok, pid} = Inky.start_link(type, accent: :red, name: InkySample)
 
 painter = fn x, y, w, h, _pixels_so_far ->
   wh = w / 2
@@ -65,3 +65,12 @@ Inky.set_pixels(InkySample, painter, border: :white)
 # Flip a few pixels
 Inky.set_pixels(pid, %{{0,0}: :black, {3,49}: :red, {23, 4}: white})
 ```
+
+## Figuring out the value to pass for `type`
+
+- Inky pHAT ordered roughly before 2019 -> `:phat_il91874`
+- Inky pHAT ordered roughly after 2019 -> `:phat_ssd1608`
+- Inky Impression 4" -> `:impression_4`
+- Inky Impression 5.7" -> `:impression_5_7`
+- Inky Impression 7.3" -> `:impression_7_3`
+- Inky wHAT: **Not currently supported**
diff --git a/config/config.exs b/config/config.exs
@@ -3,4 +3,4 @@
 #
 # This configuration file is loaded before any dependency and
 # is restricted to this project.
-use Mix.Config
+import Config
diff --git a/lib/display/display.ex b/lib/display/display.ex
@@ -12,13 +12,68 @@ defmodule Inky.Display do
             width: 0,
             height: 0,
             packed_dimensions: %{},
+            packed_resolution: nil,
             rotation: 0,
             accent: :black,
             luts: <<>>
 
-  @spec spec_for(:phat_ssd1608 | :phat | :what, :black | :red | :yellow) :: Inky.Display.t()
-  def spec_for(type, accent \\ :black)
+  @spec spec_for(:impression_7_3, :none) :: Inky.Display.t()
+  def spec_for(type = :impression_7_3, :none) do
+    width = 800
+    height = 480
 
+    %__MODULE__{
+      type: type,
+      width: width,
+      height: height,
+      packed_dimensions: %{},
+      packed_resolution:
+        <<width::unsigned-big-integer-size(16)>> <> <<height::unsigned-big-integer-size(16)>>,
+      rotation: 0,
+      accent: nil,
+      luts: <<>>
+    }
+  end
+
+  @spec spec_for(:impression_5_7, :none) :: Inky.Display.t()
+  def spec_for(type = :impression_5_7, :none) do
+    width = 600
+    height = 448
+
+    %__MODULE__{
+      type: type,
+      width: width,
+      height: height,
+      packed_dimensions: %{},
+      packed_resolution:
+        <<width::unsigned-big-integer-size(16)>> <> <<height::unsigned-big-integer-size(16)>>,
+      rotation: 0,
+      accent: nil,
+      luts: <<>>
+    }
+  end
+
+  # WARNING: This is untested on actual hardware
+  @spec spec_for(:impression_4, :none) :: Inky.Display.t()
+  def spec_for(type = :impression_4, :none) do
+    width = 640
+    height = 400
+
+    %__MODULE__{
+      type: type,
+      width: width,
+      height: height,
+      packed_dimensions: %{},
+      packed_resolution:
+        <<width::unsigned-big-integer-size(16)>> <> <<height::unsigned-big-integer-size(16)>>,
+      rotation: 0,
+      accent: nil,
+      luts: <<>>
+    }
+  end
+
+  @spec spec_for(:phat_il91874 | :phat_ssd1608 | :what, :black | :red | :yellow) ::
+          Inky.Display.t()
   def spec_for(type = :phat_ssd1608, accent) do
     # Keep it minimal. Details are specified in `Inky.HAL.PhatSSD1608`.
     %__MODULE__{
@@ -32,7 +87,7 @@ defmodule Inky.Display do
     }
   end
 
-  def spec_for(type = :phat, accent) do
+  def spec_for(type = :phat_il91874, accent) do
     %__MODULE__{
       type: type,
       width: 212,
@@ -78,7 +133,7 @@ defmodule Inky.Display do
     columns =
       case type do
         :what -> width
-        :phat -> height
+        :phat_il91874 -> height
         :test_small -> height
       end
 
@@ -89,7 +144,7 @@ defmodule Inky.Display do
     rows =
       case type do
         :what -> height
-        :phat -> width
+        :phat_il91874 -> width
         :test_small -> width
       end
 

diff --git a/lib/display/pixelutil.ex b/lib/display/pixelutil.ex
@@ -3,7 +3,7 @@ defmodule Inky.PixelUtil do
   PixelUtil maps pixels to bitstrings to be sent to an Inky screen
   """
 
-  def pixels_to_bits(pixels, width, height, rotation_degrees, color_map) do
+  def pixels_to_bits(pixels, width, height, rotation_degrees, color_map, bit_count \\ 1) do
     {outer_axis, dimension_vectors} =
       rotation_degrees
       |> normalised_rotation()
@@ -13,7 +13,8 @@ defmodule Inky.PixelUtil do
     |> rotated_ranges(width, height)
     |> do_pixels_to_bits(
       &pixels[pixel_key(outer_axis, &1, &2)],
-      &(color_map[&1] || color_map.miss)
+      &(color_map[&1] || color_map.miss),
+      bit_count
     )
   end
 
@@ -61,10 +62,10 @@ defmodule Inky.PixelUtil do
   defp rotated_dimension(_width, height, {:y, 1}), do: 0..(height - 1)
   defp rotated_dimension(_width, height, {:y, -1}), do: (height - 1)..0
 
-  defp do_pixels_to_bits({i_range, j_range}, pixel_picker, cmap) do
+  defp do_pixels_to_bits({i_range, j_range}, pixel_picker, cmap, bit_count) do
     for i <- i_range,
         j <- j_range,
-        do: <<cmap.(pixel_picker.(i, j))::size(1)>>,
+        do: <<cmap.(pixel_picker.(i, j))::size(bit_count)>>,
         into: <<>>
   end