wip

Author: NickeZ

external/CMakeLists.txt

@@ -154,7 +154,7 @@ if(CMAKE_CROSSCOMPILING)
 set_property(TARGET asf4-drivers PROPERTY INTERFACE_LINK_LIBRARIES "")
 
   find_library(QTOUCHLIB_A qtm_acq_samd51_0x000f PATHS asf4-drivers/qtouch/lib/gcc NO_CMAKE_FIND_ROOT_PATH)
-  find_library(QTOUCHLIB_B qtm_binding_layer_cm4_0x0005 PATHS asf4-drivers/qtouch/lib/gcc NO_CMAKE_FIND_ROOT_PATH)
+  find_library(QTOUCHLIB_B qtm_scroller_cm4_0x000b PATHS asf4-drivers/qtouch/lib/gcc NO_CMAKE_FIND_ROOT_PATH)
   find_library(QTOUCHLIB_T qtm_touch_key_cm4_0x0002 PATHS asf4-drivers/qtouch/lib/gcc NO_CMAKE_FIND_ROOT_PATH)
 
   add_library(cryptoauthlib

external/asf4-drivers/Config/hpl_gclk_config.h

@@ -387,7 +387,7 @@
 // <i> Indicates whether generic clock 5 configuration is enabled or not
 // <id> enable_gclk_gen_5
 #ifndef CONF_GCLK_GENERATOR_5_CONFIG
-#define CONF_GCLK_GENERATOR_5_CONFIG 0
+#define CONF_GCLK_GENERATOR_5_CONFIG 1
 #endif
 
 // <h> Generic Clock Generator Control
@@ -404,7 +404,7 @@
 // <i> This defines the clock source for generic clock generator 5
 // <id> gclk_gen_5_oscillator
 #ifndef CONF_GCLK_GEN_5_SOURCE
-#define CONF_GCLK_GEN_5_SOURCE GCLK_GENCTRL_SRC_GCLKGEN1
+#define CONF_GCLK_GEN_5_SOURCE GCLK_GENCTRL_SRC_DFLL
 #endif
 
 // <q> Run in Standby
@@ -446,15 +446,15 @@
 // <i> Indicates whether Generic Clock Generator Enable is enabled or not
 // <id> gclk_arch_gen_5_enable
 #ifndef CONF_GCLK_GEN_5_GENEN
-#define CONF_GCLK_GEN_5_GENEN 0
+#define CONF_GCLK_GEN_5_GENEN 1
 #endif
 // </h>
 
 //<h> Generic Clock Generator Division
 //<o> Generic clock generator 5 division <0x0000-0xFFFF>
 // <id> gclk_gen_5_div
 #ifndef CONF_GCLK_GEN_5_DIV
-#define CONF_GCLK_GEN_5_DIV 62
+#define CONF_GCLK_GEN_5_DIV 6
 #endif
 // </h>
 // </e>

external/asf4-drivers/Config/peripheral_clk_config.h

@@ -33,15 +33,15 @@
 
 // <i> Select the clock source for ADC.
 #ifndef CONF_GCLK_ADC0_SRC
-#define CONF_GCLK_ADC0_SRC GCLK_PCHCTRL_GEN_GCLK2_Val
+#define CONF_GCLK_ADC0_SRC GCLK_PCHCTRL_GEN_GCLK5_Val
 #endif
 
 /**
  * \def CONF_GCLK_ADC0_FREQUENCY
  * \brief ADC0's Clock frequency
  */
 #ifndef CONF_GCLK_ADC0_FREQUENCY
-#define CONF_GCLK_ADC0_FREQUENCY 12000000
+#define CONF_GCLK_ADC0_FREQUENCY 8000000
 #endif
 
 /**

external/asf4-drivers/qtouch/include/qtm_acq_samd51_0x000f_api.h

@@ -3,7 +3,7 @@ Filename : qtm_acq_samd51_0x000f_api.h
 Project : QTouch Modular Library
 Purpose : API for Acquisition module - SAMD51/PTC
 ------------------------------------------------------------------------------
-Copyright (c) 2017 Microchip Inc. All rights reserved.
+Copyright (c) 2019 Microchip Inc. All rights reserved.
 ------------------------------------------------------------------------------
 ============================================================================*/
 

external/asf4-drivers/qtouch/include/qtm_acq_same54_0x000f_api.h

@@ -3,7 +3,7 @@ Filename : qtm_acq_same54_0x000f_api.h
 Project : QTouch Modular Library
 Purpose : API for Acquisition module - SAME54/PTC
 ------------------------------------------------------------------------------
-Copyright (c) 2017 Microchip Inc. All rights reserved.
+Copyright (c) 2019 Microchip Inc. All rights reserved.
 ------------------------------------------------------------------------------
 ============================================================================*/
 
@@ -30,16 +30,16 @@ Copyright (c) 2017 Microchip Inc. All rights reserved.
 #define CAL_CHRG_5TAU 3u
 
 #define RSEL_MAX_OPTION RSEL_VAL_200
-#define PRSC_MAX_OPTION PRSC_DIV_SEL_128
+#define PRSC_MAX_OPTION PRSC_DIV_SEL_256
 
 #define NUM_PTC_XY_LINES 32u
 
 /* X line bit position */
 #define X_NONE 0u
-#define X_LINE(n) ((uint32_t)(1u << (n)))
+#define X(n) ((uint32_t)(1u << (n)))
 
 /* Y line bit position */
-#define Y_LINE(n) ((uint32_t)(1u << (n)))
+#define Y(n) ((uint32_t)(1u << (n)))
 
 /* Extract Analog / Digital Gain */
 #define NODE_GAIN_ANA(m) (uint8_t)(((m)&0xF0u) >> 4u)
@@ -72,22 +72,20 @@ typedef enum tag_filter_level_t {
 /* Touch library GAIN setting */
 typedef enum tag_gain_t { GAIN_1, GAIN_2, GAIN_4, GAIN_8, GAIN_16 } gain_t;
 /* PTC clock prescale setting.
- * Example: if Generic clock input to PTC = 4MHz, then:
- * PRSC_DIV_SEL_1 sets PTC Clock to 4MHz
+ * For Example: if Generic clock input to PTC = 4MHz, then:
  * PRSC_DIV_SEL_2 sets PTC Clock to 2MHz
  * PRSC_DIV_SEL_4 sets PTC Clock to 1MHz
- * PRSC_DIV_SEL_8 sets PTC Clock to 500KHz
  *
  */
 typedef enum tag_prsc_div_sel_t {
-	PRSC_DIV_SEL_1,
 	PRSC_DIV_SEL_2,
 	PRSC_DIV_SEL_4,
 	PRSC_DIV_SEL_8,
 	PRSC_DIV_SEL_16,
 	PRSC_DIV_SEL_32,
 	PRSC_DIV_SEL_64,
-	PRSC_DIV_SEL_128
+	PRSC_DIV_SEL_128,
+	PRSC_DIV_SEL_256
 } prsc_div_sel_t;
 
 /**
@@ -192,6 +190,52 @@ typedef struct {
 	uint8_t                    auto_scan_trigger;
 } qtm_auto_scan_config_t;
 
+#define DRIVEN_SHIELD_DUMMY_ACQ 3u
+
+typedef void (*qtm_drivenshield_callback_t)(uint8_t csd, uint8_t sds, uint8_t prescaler, uint8_t volatile *ptr,
+                                            uint8_t value);
+
+/* Drivenshield status flag */
+typedef struct qtm_drivenshield_config_tag {
+	uint8_t flags;
+} qtm_drivenshield_config_t;
+
+/*============================================================================
+touch_ret_t qtm_drivenshield_setup(qtm_drivenshield_config_t* config);
+------------------------------------------------------------------------------
+Purpose: Setup the drivenshield with settings from the user
+Input  : drivenshield_config_t  setup in touch.c and touch.h
+Output : touch_ret_t
+Notes  : Called by application to load the drivenshield operating parameters
+
+============================================================================*/
+touch_ret_t qtm_drivenshield_setup(qtm_drivenshield_config_t *config);
+
+/*============================================================================
+void qtm_drivenshield_register_start_callback(qtm_drivenshield_callback_t callback);
+------------------------------------------------------------------------------
+Purpose: Register the drivenshield Start callback with the touch library
+Input  : Pointer to the application function to start the event system
+Output : touch_ret_t
+Notes  : The library initialises this with a null, if this remains the
+         library will function as normal, if this is not null then the
+         application will start the event system and call this callback before
+         start of touch measurement
+
+============================================================================*/
+touch_ret_t qtm_drivenshield_register_start_callback(qtm_drivenshield_callback_t callback);
+
+/*============================================================================
+touch_ret_t qtm_drivenshield_deregister_start_callback(void);
+------------------------------------------------------------------------------
+Purpose: De-register the drivenshield Start callback with the touch library
+Input  : None
+Output : touch_ret_t
+Notes  : When this function is called driven shield functionality will stop
+
+============================================================================*/
+touch_ret_t qtm_drivenshield_deregister_start_callback(void);
+
 /*----------------------------------------------------------------------------
  * prototypes
  *----------------------------------------------------------------------------*/