Merge branch 'master' of ssh://git.gag.com/scm/git/fw/altos

[fw/altos] / src / telelco-v3.0 / ao_pins.h

diff --git a/src/telelco-v3.0/ao_pins.h b/src/telelco-v3.0/ao_pins.h
index 7a7ffae2acff8e78f565dc386dd15513133b7a0d..b1af364fca3b9ee219fc23110e38b9be007b7718 100644 (file)
--- a/src/telelco-v3.0/ao_pins.h
+++ b/src/telelco-v3.0/ao_pins.h
@@ -229,8 +229,8 @@
 #define AO_BUTTON_0            1
 
 #define AO_BUTTON_DRAG_SELECT  1
 #define AO_BUTTON_0            1
 
 #define AO_BUTTON_DRAG_SELECT  1

-#define AO_BUTTON_1_PORT       &stm_gpioc
-#define AO_BUTTON_1            0
+#define AO_BUTTON_1_PORT       &stm_gpiod
+#define AO_BUTTON_1            2

 
 #define AO_BUTTON_SPARE1               2
 #define AO_BUTTON_2_PORT       &stm_gpiob
 
 #define AO_BUTTON_SPARE1               2
 #define AO_BUTTON_2_PORT       &stm_gpiob


@@ -262,14 +262,9 @@
 
 /* ADC */
 
 
 /* ADC */
 

-struct ao_adc {
-       int16_t         v_batt;
-};
-
-#define AO_ADC_DUMP(p) \
-       printf("batt: %5d\n", (p)->v_batt)
+#define AO_DATA_RING           8

 
 

-#define HAS_ADC_SINGLE         1
+#define HAS_ADC                        1

 #define HAS_ADC_TEMP           0
 #define HAS_BATTERY_REPORT     1
 
 #define HAS_ADC_TEMP           0
 #define HAS_BATTERY_REPORT     1
 


@@ -277,12 +272,33 @@ struct ao_adc {
 #define AO_ADC_V_BATT_PORT     (&stm_gpioa)
 #define AO_ADC_V_BATT_PIN      2
 
 #define AO_ADC_V_BATT_PORT     (&stm_gpioa)
 #define AO_ADC_V_BATT_PIN      2
 

+#define AO_ADC_V_ALS           10
+#define AO_ADC_V_ALS_PORT      (&stm_gpioc)
+#define AO_ADC_V_ALS_PIN       0
+

 #define AO_ADC_PIN0_PORT       AO_ADC_V_BATT_PORT
 #define AO_ADC_PIN0_PIN                AO_ADC_V_BATT_PIN
 
 #define AO_ADC_PIN0_PORT       AO_ADC_V_BATT_PORT
 #define AO_ADC_PIN0_PIN                AO_ADC_V_BATT_PIN
 

+#define AO_ADC_PIN1_PORT       AO_ADC_V_ALS_PORT
+#define AO_ADC_PIN1_PIN                AO_ADC_V_ALS_PIN
+

 #define AO_ADC_SQ1             AO_ADC_V_BATT
 #define AO_ADC_SQ1             AO_ADC_V_BATT

+#define AO_ADC_SQ2             AO_ADC_V_ALS
+
+#define AO_NUM_ADC             2

 
 

-#define AO_NUM_ADC             1
+struct ao_adc {
+       union {
+               struct {
+                       int16_t         v_batt;
+                       int16_t         v_als;
+               };
+               int16_t v_vals[AO_NUM_ADC];
+       };
+};
+
+#define AO_ADC_DUMP(p) \
+       printf("batt: %5d als %5d\n", (p)->adc.v_batt, (p)->adc.v_als)

 
 /*
  * Voltage divider on ADC battery sampler
 
 /*
  * Voltage divider on ADC battery sampler


@@ -296,16 +312,23 @@ struct ao_adc {
 #define AO_ADC_REFERENCE_DV    33
 
 #define AO_LCO_SEARCH_API
 #define AO_ADC_REFERENCE_DV    33
 
 #define AO_LCO_SEARCH_API

-#define AO_LCO_HAS_CONTRAST    1
-#define AO_LCO_MIN_CONTRAST    0
-#define AO_LCO_MAX_CONTRAST    63
-#define AO_LCO_CONTRAST_STEP   1
+
+//#define AO_LCO_HAS_CONTRAST  1
+//#define AO_LCO_MIN_CONTRAST  0
+//#define AO_LCO_MAX_CONTRAST  63
+//#define AO_LCO_CONTRAST_STEP 1

 
 #define AO_LCO_HAS_BACKLIGHT   1
 #define AO_LCO_MIN_BACKLIGHT   0
 #define AO_LCO_MAX_BACKLIGHT   65535
 #define AO_LCO_BACKLIGHT_STEP  771
 
 
 #define AO_LCO_HAS_BACKLIGHT   1
 #define AO_LCO_MIN_BACKLIGHT   0
 #define AO_LCO_MAX_BACKLIGHT   65535
 #define AO_LCO_BACKLIGHT_STEP  771
 

+#define AO_LCO_HAS_LCO_INFO    1
+#define AO_LCO_MIN_INFO_PAGE   0
+#define AO_LCO_MAX_INFO_PAGE   0
+
+#define AO_LCO_HAS_PAD_INFO    1
+

 /*
  * LCD Backlight via PWM.
  *
 /*
  * LCD Backlight via PWM.
  *