From f10d63c2fa1ab9d2b4c026a8105a46b930092053 Mon Sep 17 00:00:00 2001
From: Fisch <interfisch@gmx.net>
Date: Sun, 25 Mar 2018 21:20:39 +0200
Subject: [PATCH] add and implement spot and incident icons

---
 icon_incident.xcf | Bin 0 -> 2162 bytes
 icon_spot.xcf     | Bin 0 -> 1353 bytes
 lightmeter.ino    |  55 ++++++++++++++++++++++++++++++++++++++++++----
 3 files changed, 51 insertions(+), 4 deletions(-)
 create mode 100644 icon_incident.xcf
 create mode 100644 icon_spot.xcf

diff --git a/icon_incident.xcf b/icon_incident.xcf
new file mode 100644
index 0000000000000000000000000000000000000000..fe9a89aaa666c29511e9c13ba7a2e32fda3217d1
GIT binary patch
literal 2162
zcmeHI%We}f6!knZnY@%ffE5c@s8YHZ)bI&KsIWj{#hPT|nOaI_s+p;1S8NdMP*?C7
z>{<7x*kI0eZ0d+%0gDJBu5|3<`>>sRJvX^ro%72y<C$Cv2H7znz6*FBhJ7GDxn_(2
zxdVhi2e@ZA`Q3&8Ddtg*ZIiTItwhma&B(a-xDvBQEck2Lobl6V&tH&bN4v_^EEh>$
z$pz`)?XgMSTrCB!%cWc#^(R@Lmdmo@6FntWKA-X9hsRo4$kdpQ5IS!OwRZk%LZO%S
z`7D)1&ZqV)D6iU-MweU^vf;8w&qPh}WtP>V`Efyt{#muwY=%-EjCfxd3qB*;H;i>Z
zSS@B-E6Q%~$y^kIKX^oTp9V+-P@NPI8?K!V$HeYCyzlUV!-ozZIeZLG`&#LO(0L^8
z8(C|ZUmIdC4qyNMrq2IF>kj*-*pP;Rd1_#=kGao$z*7k@1|MVYYVN6?4Ty<!|G{05
z8k;+}=u^ts-%xB@d|W4dMVEru3&R%bW^k(u-;x7rHTpmNc@A##srziCI{_tjD=$JR
z^_32Tw0-`;+C*bi8ScD@=-s9+`bg^oHc-KD;9x5ehb%yg@s$TeXgM7Xyxz$69cn}Y
zEp!9&9ky;#A!)RCXyPNYUk`g9(oeU!AwGO6i$+v=bx|y6y_I^>K}Oo@Y5!W_5}z19
TduP--ez~cOGg`kvv$FUOtF@Vv

literal 0
HcmV?d00001

diff --git a/icon_spot.xcf b/icon_spot.xcf
new file mode 100644
index 0000000000000000000000000000000000000000..0dfac7a9f6ded30acb06828e7ea7708277e2ce22
GIT binary patch
literal 1353
zcmd^9OHRWu5Ve!^M^jP05)u-Y*px*OJpdaJDlCw=LYq3lqD@c|1YL0iI1AU~W8MTC
zQYd>QMtbq{n;DNYb`q=UwYUo-5vhq}u&x2|6@YU*)_~^GBVz>EI^Y2tz^368hdCc$
z?8I0$2-E3QCI#k<oU6x~92RmcZdGw92509N<mr~7YC4Q%5NB#k8lpMt<;83wMV?O7
zcyFl}#bG*0Gtn!DAd5#saj<_-+5*xyu05oV7NlCg_?=MdU4A_bRT7K7tp#zmNHkh-
zlc++dB)pV4<)=}U%i?o`l>JlsQ07yq561Wtx?LWQ5$qXJS6e3|nMkqQC!b>i>KN&K
zG|)7>3^p7C+ph4X3U61qU*Vk!Uk0ajtu;WX9+|xxv`J&ml_7THh;{DgHRplmb;fmr
zdHR`Y&9tjIbMzb29z8f_9pDw7CPm==eC@C{v>l)g{?q?`g|D?6s8#<r6@BLF7Hi;*
z9n)Q|J#@e^a4Vd&7EpHHMPpr7(=T)+&2LfFEU&V19hF+B=p&vk<J@n>KUGN~vpBm+
i%Fq2T+*bSLV5_w)+Az%CRu@|EAz7_<Nb`GqQx@-1O)B{S

literal 0
HcmV?d00001

diff --git a/lightmeter.ino b/lightmeter.ino
index 5d9c1c9..9399f82 100644
--- a/lightmeter.ino
+++ b/lightmeter.ino
@@ -130,6 +130,49 @@ char tempstring[16]; //for dtostrf  //dtostrf(modefactor,1,3,tempstring);
 #error("Height incorrect, please fix Adafruit_SSD1306.h!");
 #endif
 
+//Icon Spot
+#define ICON_METERINGMODE_HEIGHT 16 
+#define ICON_METERINGMODE_WIDTH  16 
+static const unsigned char PROGMEM icon_spot[] =
+{ B00000001, B10000000,
+  B00000001, B10000000,
+  B00000111, B11100000,
+  B00011101, B10111000,
+  B00010001, B10001000,
+  B00110001, B10001100,
+  B00100000, B00000100,
+  B11111100, B00111111,
+  B11111100, B00111111,
+  B00100000, B00000100,
+  B00110001, B10001100,
+  B00010001, B10001000,
+  B00011101, B10111000,
+  B00000111, B11100000,
+  B00000001, B10000000,
+  B00000001, B10000000
+};
+
+static const unsigned char PROGMEM icon_incident[] =
+{ B10000010, B00000000,
+  B10000100, B00011000,
+  B11100000, B01100000,
+  B10111001, B10000000,
+  B10001100, B00000110,
+  B10000100, B00111000,
+  B10000110, B11000000,
+  B10000010, B00000000,
+  B10000010, B00000000,
+  B10000110, B11000000,
+  B10000100, B00111000,
+  B10001100, B00000110,
+  B10111001, B10000000,
+  B11100000, B01100000,
+  B10000100, B00011000,
+  B10000010, B00000000
+};
+
+  
+
 void setup()   {                
   Serial.begin(9600);
   Serial.println("Started");
@@ -803,6 +846,8 @@ void updateDisplay_Lightmeter() //Lightmeter display
   #define ypos_aperature 29
   #define xpos_shutter 60
   #define ypos_shutter 29
+  #define xpos_icon 112 //128-16
+  #define ypos_icon 29
 
   #define xpos_debug 0
   #define ypos_debug 63-7
@@ -861,6 +906,12 @@ void updateDisplay_Lightmeter() //Lightmeter display
   if (setShutter>0){ //Shutter Priority Mode
     display.drawRect(xpos_shutter-2, ypos_shutter-2, 40, 18, WHITE);
   }
+
+  if (meteringmode == METERINGMODE_REFLECTIVE){
+    display.drawBitmap(xpos_icon, ypos_icon,  icon_spot, ICON_METERINGMODE_HEIGHT, ICON_METERINGMODE_WIDTH, 1);
+  }else if (meteringmode == METERINGMODE_INCIDENT) {
+    display.drawBitmap(xpos_icon, ypos_icon,  icon_incident, ICON_METERINGMODE_HEIGHT, ICON_METERINGMODE_WIDTH, 1);
+  }
   
   //ISO
   display.setCursor(xpos_iso,ypos_iso); display.setTextSize(1); display.print("ISO "); display.print(setISO);
@@ -874,10 +925,6 @@ void updateDisplay_Lightmeter() //Lightmeter display
   display.print(ev);
   display.print(" |");
   display.print(incident);
-
-  display.setTextSize(1);
-  display.setCursor(10,10);
-  display.print(meteringmode);
   
 }