Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

new CIDsToBeQueried and improved error handling #72

Merged
merged 1 commit into from
May 29, 2024
Merged

new CIDsToBeQueried and improved error handling #72

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion lib/default/rddl-sdk
Open in desktop
Submodule rddl-sdk updated 8 files
+1 −1 include/rddlSDKAPI.h
+1 −1 include/rddlSDKAbst.h
+4 −4 src/platform/linux/rddlSDKAbst.c
+4 −2 src/platform/tasmota/rddlSDKAbst.c
+16 −6 src/platform/tasmota/tasmotaUtils.cpp
+1 −1 src/platform/tasmota/tasmotaUtils.h
+2 −2 src/rddlSDKAPI.c
+2 −1 test/testRddlSDK.c
1 change: 1 addition & 0 deletions tasmota/include/i18n.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -279,6 +279,7 @@
#define D_CMND_NOTARIZATION_PERIODICITY "NotarizationPeriodicity"
#define D_CMND_NOTARIZE "Notarize"
#define D_CMND_REMOVE_FILES "RemoveFiles"
#define D_CMND_CIDSTOBEQUERIED "CIDsToBeQueried"
#define D_CMND_STATUS "Status"
#define D_STATUS1_PARAMETER "PRM"
#define D_STATUS2_FIRMWARE "FWR"
Expand Down
2 changes: 1 addition & 1 deletion tasmota/include/tasmota.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -484,7 +484,7 @@ enum SettingsTextIndex { SET_OTAURL,
SET_SHD_PARAM,
SET_RGX_SSID, SET_RGX_PASSWORD,
SET_INFLUXDB_HOST, SET_INFLUXDB_PORT, SET_INFLUXDB_ORG, SET_INFLUXDB_TOKEN, SET_INFLUXDB_BUCKET, SET_INFLUXDB_RP,
SET_PLANETMINT_API, SET_PLANETMINT_CHAINID, SET_PLANETMINT_DENOM, SET_NOTARIZTATION_PERIODICITY,
SET_PLANETMINT_API, SET_PLANETMINT_CHAINID, SET_PLANETMINT_DENOM, SET_NOTARIZTATION_PERIODICITY, fSET_CIDS_TO_BE_QUERIED,
SET_MAX };

enum SpiInterfaces { SPI_NONE, SPI_MOSI, SPI_MISO, SPI_MOSI_MISO };
Expand Down
2 changes: 1 addition & 1 deletion tasmota/tasmota_support/settings.ino
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1392,7 +1392,7 @@ void SettingsDefaultSet2(void) {
SettingsUpdateText( SET_PLANETMINT_CHAINID, "planetmint-testnet-1");
SettingsUpdateText( SET_PLANETMINT_DENOM, "plmnt");
SettingsUpdateText( SET_NOTARIZTATION_PERIODICITY, "3600");

SettingsUpdateText( SET_CIDS_TO_BE_QUERIED, "2");
}

void SettingsDefaultSet3(void) {
Expand Down
15 changes: 13 additions & 2 deletions tasmota/tasmota_support/support_command.ino
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ const char kTasmotaCommands[] PROGMEM = "|" // No prefix
D_CMND_BALANCE "|" D_CMND_RESOLVEID "|" D_CMND_PLANETMINTDENOM "|" D_CMND_GETACCOUNTID "|"
D_CMND_PLANETMINTCHAINID "|" D_CMND_MACHINEDATA "|" D_CMND_POPCHALLENGE "|" D_CMND_ATTESTMACHINE "|"
D_CMND_NOTARIZATION_PERIODICITY "|" D_CMND_NOTARIZE "|" D_CMND_REMOVE_FILES "|" D_CMND_POPINIT "|"
D_CMND_CHALLENGE "|" D_CMND_POPCHALLENGERESULT "|" D_CMND_REDEEMCLAIMS "|" D_CMND_CREATEACCOUNT "|"
D_CMND_CHALLENGE "|" D_CMND_POPCHALLENGERESULT "|" D_CMND_REDEEMCLAIMS "|" D_CMND_CREATEACCOUNT "|" D_CMND_CIDSTOBEQUERIED "|"
#ifdef USE_I2C
D_CMND_I2CSCAN "|" D_CMND_I2CDRIVER "|"
#endif
Expand Down Expand Up @@ -92,7 +92,7 @@ void (* const TasmotaCommand[])(void) PROGMEM = {
&CmndBalance, &CmdResolveCid, &CmndPlanetmintDenom, &CmndGetAccountID,
&CmndPlanetmintChainID, &CmndMachineData, &CmndPoPChallenge, &CmndAttestMachine,
&CmndNotarizationPeriodicity, &CmndNotarize, &CmndRemoveFiles, &CmndPoPInit,
&CmndChallenge, &CmndPoPChallengeResult, &CmndRedeemClaims, &CmndCreateAccount,
&CmndChallenge, &CmndPoPChallengeResult, &CmndRedeemClaims, &CmndCreateAccount, &CmndCIDsToBeQueried,
#ifdef USE_I2C
&CmndI2cScan, &CmndI2cDriver,
#endif
Expand Down Expand Up @@ -1157,7 +1157,18 @@ void CmndCreateAccount(void) {
ResponseClear();
}

void CmndCIDsToBeQueried(void) {
if( XdrvMailbox.data_len ) {
//verify convertibility
uint32_t value = (uint32_t)atoi(sdkGetSetting( SET_CIDS_TO_BE_QUERIED));
sdkSetSetting( SET_CIDS_TO_BE_QUERIED, XdrvMailbox.data);
}

Response_P( "{ \"%s\": \"%s\" }", D_CMND_CIDSTOBEQUERIED, sdkGetSetting( SET_CIDS_TO_BE_QUERIED) );

CmndStatusResponse(40);
ResponseClear();
}

void CmndStatus(void)
{
Expand Down
7 changes: 6 additions & 1 deletion tasmota/tasmota_xdrv_driver/xdrv_129_rddl_network.ino
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -226,7 +226,12 @@ void InitializePoPWorkflow(){
AddLog(2, "PoP: initialize PoP challenge");

// select CID
char* cid = getCIDofChallengee();
uint32_t cidsToBeQueried = (uint32_t)atoi(sdkGetSetting( SET_CIDS_TO_BE_QUERIED));
char* cid = getCIDofChallengee( cidsToBeQueried );
if( cid == NULL ){
AddLog(2, "{ \"PoP\": no cid retrieved }");
return;
}
AddLog(2, "PoP: CID to be challenged %s", cid );
bool result = ChallengeChallengee( cid, NULL);
if( result )
Expand Down