Skip to content

Commit

Permalink
Merge branch 'fix/fix_esp_cryptoauth_utility_requirements' into 'master'
Browse files Browse the repository at this point in the history
Fix: Revert to old package requirements for esp_cryptoauth_utility

See merge request espressif/esp-cryptoauthlib!32
  • Loading branch information
mahavirj committed May 31, 2024
2 parents 227e6f6 + 8dd11e9 commit f8b2910
Show file tree
Hide file tree
Showing 4 changed files with 11 additions and 7 deletions.
6 changes: 5 additions & 1 deletion cryptoauthlib/third_party/hal/esp32/hal_esp32_i2c.c
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,10 @@
#include <stdio.h>
#include <string.h>
#include <driver/i2c.h>
#include <soc/soc_caps.h>
#include "esp_err.h"
#include "esp_log.h"

#include "cryptoauthlib.h"

#define I2C_SDA_PIN CONFIG_ATCA_I2C_SDA_PIN
Expand All @@ -32,7 +34,7 @@
#define LOG_LOCAL_LEVEL ESP_LOG_INFO
#endif

#define MAX_I2C_BUSES 2 //ESP32 has 2 I2C bus
#define MAX_I2C_BUSES SOC_HP_I2C_NUM //ESP32 has 2 I2C bus

typedef struct atcaI2Cmaster
{
Expand Down Expand Up @@ -109,7 +111,9 @@ ATCA_STATUS hal_i2c_init(ATCAIface iface, ATCAIfaceCfg *cfg)
i2c_hal_data[bus].id = I2C_NUM_0;
break;
case 1:
#if SOC_HP_I2C_NUM >= 2
i2c_hal_data[bus].id = I2C_NUM_1;
#endif
break;
default:
break;
Expand Down
8 changes: 4 additions & 4 deletions esp_cryptoauth_utility/requirements.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
cryptography==41.0.4
pyasn1_modules==0.3.0
pyasn1==0.5.0
python-jose==3.3.0
cryptography==42.0.6
pyasn1_modules==0.1.5
pyasn1==0.3.7
python-jose==3.1.0
pyserial==3.5
2 changes: 1 addition & 1 deletion esp_cryptoauth_utility/setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ def get_install_requires():
)
exit(1)

VERSION = '0.11.1'
VERSION = '0.11.2'

long_description = """
======================
Expand Down
2 changes: 1 addition & 1 deletion idf_component.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
version: "3.5.1~3"
version: "3.5.1~4"
description: "esp-cryptoauthlib: The port of Microchip CryptoAuthentication Library for ESP-IDF"
url: https://github.com/espressif/esp-cryptoauthlib
dependencies:
Expand Down

0 comments on commit f8b2910

Please sign in to comment.