diff --git a/src/cmnds/cmd_channels.c b/src/cmnds/cmd_channels.c index f930e4429..2b28d26c8 100644 --- a/src/cmnds/cmd_channels.c +++ b/src/cmnds/cmd_channels.c @@ -17,10 +17,10 @@ static int CMD_SetChannel(const void *context, const char *cmd, const char *args ADDLOG_INFO(LOG_FEATURE_CMD, "CMD_SetChannel: command requires 2 arguments"); return 1; } - + ch = Tokenizer_GetArgInteger(0); val = Tokenizer_GetArgInteger(1); - + CHANNEL_Set(ch,val, false); return 1; @@ -37,7 +37,7 @@ static int CMD_AddChannel(const void *context, const char *cmd, const char *args ADDLOG_INFO(LOG_FEATURE_CMD, "CMD_AddChannel: command requires 2 arguments (next 2, min and max, are optionsl)"); return 1; } - + ch = Tokenizer_GetArgInteger(0); val = Tokenizer_GetArgInteger(1); if(Tokenizer_GetArgsCount() == 4) { @@ -50,7 +50,7 @@ static int CMD_AddChannel(const void *context, const char *cmd, const char *args } else { CHANNEL_Add(ch,val); } - + return 1; } @@ -66,11 +66,11 @@ static int CMD_ClampChannel(const void *context, const char *cmd, const char *ar ADDLOG_INFO(LOG_FEATURE_CMD, "CMD_ClampChannel: command requires 3 arguments"); return 1; } - + ch = Tokenizer_GetArgInteger(0); min = Tokenizer_GetArgInteger(1); max = Tokenizer_GetArgInteger(2); - + CHANNEL_AddClamped(ch,0, min, max); return 1; @@ -89,10 +89,10 @@ static int CMD_SetPinRole(const void *context, const char *cmd, const char *args ADDLOG_INFO(LOG_FEATURE_CMD, "CMD_SetPinRole: command requires 2 arguments"); return 1; } - + pin = Tokenizer_GetArgInteger(0); role = Tokenizer_GetArg(1); - + roleIndex = PIN_ParsePinRoleName(role); if(roleIndex == IOR_Total_Options) { ADDLOG_INFO(LOG_FEATURE_CMD, "CMD_SetPinRole: This role is not known"); @@ -114,10 +114,10 @@ static int CMD_SetPinChannel(const void *context, const char *cmd, const char *a ADDLOG_INFO(LOG_FEATURE_CMD, "CMD_SetPinChannel: command requires 2 arguments"); return 1; } - + pin = Tokenizer_GetArgInteger(0); ch = Tokenizer_GetArgInteger(1); - + PIN_SetPinChannelForPinIndex(pin,ch); return 1; diff --git a/src/cmnds/cmd_eventHandlers.c b/src/cmnds/cmd_eventHandlers.c index f8a579d5c..5b31afc77 100644 --- a/src/cmnds/cmd_eventHandlers.c +++ b/src/cmnds/cmd_eventHandlers.c @@ -8,7 +8,7 @@ // addEventHandler OnClick 5 setChannel 4 1 // This will set event handler for event name "OnClick" for pin number 5, and the executed event command will be "setChannel 4 1" -// addEventHandler OnHold 5 addChannel 4 10 +// addEventHandler OnHold 5 addChannel 4 10 // As above, but it will require a button hold and it will add value 10 to channel 4 (it will add a value to PWM, PWM channels are <0,100> range) // @@ -35,18 +35,18 @@ setPinChannel 11 0 setPinRole 26 PWM setPinChannel 26 1 addEventHandler OnClick 10 setChannel 1 100 -addEventHandler OnHold 10 addChannel 1 10 +addEventHandler OnHold 10 addChannel 1 10 addEventHandler OnClick 11 setChannel 1 0 -addEventHandler OnHold 11 addChannel 1 -10 +addEventHandler OnHold 11 addChannel 1 -10 // -// On change listeners +// On change listeners // Full example of on change listeners: // addChangeHandler Channel0 < 50 echo value is low // addChangeHandler Current > 100 setChannel 0 0 // addChangeHandler Power > 40 setChannel 1 0 // -// +// // LCD demo: // backlog startDriver I2C; addI2CDevice_LCD_PCF8574 I2C1 0x23 0 0 0 // addChangeHandler Channel1 != 0 backlog lcd_clearAndGoto I2C1 0x23 1 1; lcd_print I2C1 0x23 Enabled @@ -179,7 +179,7 @@ void EventHandlers_ProcessVariableChange_Integer(byte eventCode, int oldValue, i struct eventHandler_s *ev; ev = g_eventHandlers; - + while(ev) { if(eventCode==ev->eventCode) { if(EVENT_EvaluateChangeCondition(ev->eventType, ev->requiredArgument, oldValue, newValue)) { @@ -206,7 +206,7 @@ void EventHandlers_FireEvent(byte eventCode, int argument) { struct eventHandler_s *ev; ev = g_eventHandlers; - + while(ev) { if(eventCode==ev->eventCode) { if(argument == ev->requiredArgument) { @@ -216,7 +216,7 @@ void EventHandlers_FireEvent(byte eventCode, int argument) { } ev = ev->next; } - + } static int CMD_AddEventHandler(const void *context, const char *cmd, const char *args, int cmdFlags){ @@ -234,17 +234,17 @@ static int CMD_AddEventHandler(const void *context, const char *cmd, const char ADDLOG_INFO(LOG_FEATURE_EVENT, "CMD_AddEventHandler: command requires 3 arguments"); return 1; } - + eventName = Tokenizer_GetArg(0); reqArg = Tokenizer_GetArgInteger(1); cmdToCall = Tokenizer_GetArgFrom(2); - + eventCode = EVENT_ParseEventName(eventName); if(eventCode == CMD_EVENT_NONE) { ADDLOG_INFO(LOG_FEATURE_EVENT, "CMD_AddEventHandler: %s is not a valid event",eventName); return 1; } - + ADDLOG_INFO(LOG_FEATURE_EVENT, "CMD_AddEventHandler: added %s with cmd %s",eventName,cmdToCall); EventHandlers_AddEventHandler_Integer(eventCode,EVENT_DEFAULT,reqArg,cmdToCall); @@ -268,7 +268,7 @@ static int CMD_AddChangeHandler(const void *context, const char *cmd, const char ADDLOG_INFO(LOG_FEATURE_EVENT, "CMD_AddChangeHandler: command requires 4 arguments"); return 1; } - + eventName = Tokenizer_GetArg(0); relation = Tokenizer_GetArg(1); reqArg = Tokenizer_GetArgInteger(2); @@ -285,8 +285,8 @@ static int CMD_AddChangeHandler(const void *context, const char *cmd, const char ADDLOG_INFO(LOG_FEATURE_EVENT, "CMD_AddChangeHandler: %s is not a valid event",eventName); return 1; } - - + + ADDLOG_INFO(LOG_FEATURE_EVENT, "CMD_AddChangeHandler: added %s with cmd %s",eventName,cmdToCall); EventHandlers_AddEventHandler_Integer(eventCode,relationCode,reqArg,cmdToCall); @@ -299,9 +299,9 @@ static int CMD_ListEvents(const void *context, const char *cmd, const char *args ev = g_eventHandlers; c = 0; - + while(ev) { - + ADDLOG_INFO(LOG_FEATURE_EVENT, "Event %i has code %i and command %s",c,ev->eventCode,ev->command); ev = ev->next; c++; @@ -314,7 +314,7 @@ void EventHandlers_Init() { CMD_RegisterCommand("AddEventHandler", "", CMD_AddEventHandler, "qqqqq0", NULL); CMD_RegisterCommand("AddChangeHandler", "", CMD_AddChangeHandler, "qqqqq0", NULL); CMD_RegisterCommand("listEvents", "", CMD_ListEvents, "qqqqq0", NULL); - + } diff --git a/src/cmnds/cmd_main.c b/src/cmnds/cmd_main.c index 7f5b204e4..4b077668a 100644 --- a/src/cmnds/cmd_main.c +++ b/src/cmnds/cmd_main.c @@ -38,7 +38,7 @@ static int CMD_Restart(const void *context, const char *cmd, const char *args, i } else { delaySeconds = atoi(args); } - + ADDLOG_INFO(LOG_FEATURE_CMD, "CMD_Restart: will reboot in %i",delaySeconds); RESET_ScheduleModuleReset(delaySeconds); @@ -62,7 +62,7 @@ void CMD_ListAllCommands(void *userData, void (*callback)(command_t *cmd, void * newCmd = newCmd->next; } } - + } void CMD_RegisterCommand(const char *name, const char *args, commandHandler_t handler, const char *userDesc, void *context) { int hash; @@ -134,7 +134,7 @@ int CMD_ExecuteCommandArgs(const char *cmd, const char *args, int cmdFlags) { // not found, so... char nonums[32]; // get the complete string up to numbers. - //len = + //len = get_cmd(cmd, nonums, 32, 1); newCmd = CMD_Find(nonums); if (!newCmd) { diff --git a/src/cmnds/cmd_newLEDDriver.c b/src/cmnds/cmd_newLEDDriver.c index f8b65fc6a..31b73b519 100644 --- a/src/cmnds/cmd_newLEDDriver.c +++ b/src/cmnds/cmd_newLEDDriver.c @@ -32,7 +32,7 @@ // NOTE: there are 2 customization commands // They are not storing the config in flash, if you use them, // please put them in autoexec.bat from LittleFS. -// Command 1: led_brightnessMult [floatVal] +// Command 1: led_brightnessMult [floatVal] // It sets the multipler for the dimming // Command 2: g_cfg_colorScaleToChannel [floatVal] // It sets the multipler for converting 0-255 range RGB to 0-100 channel value @@ -40,7 +40,7 @@ int parsePowerArgument(const char *s); // In general, LED can be in two modes: -// - Temperature (Cool and Warm LEDs are on) +// - Temperature (Cool and Warm LEDs are on) // - RGB (R G B LEDs are on) // This is just like in Tuya. // The third mode, "All", was added by me for testing. @@ -81,7 +81,7 @@ void apply_smart_light() { for(i = 0; i < 5; i++) { float raw, final; - + raw = baseColors[i]; if(g_lightEnableAll) { @@ -97,7 +97,7 @@ void apply_smart_light() { final = 0; } } else if(g_lightMode == Light_RGB) { - // skip channels 3, 4 + // skip channels 3, 4 if(i >= 3) { final = 0; @@ -125,8 +125,8 @@ static int temperature(const void *context, const char *cmd, const char *args, i tmp = atoi(args); g_lightMode = Light_Temperature; -// the slider control in the UI emits values -//in the range from 154-500 (defined +// the slider control in the UI emits values +//in the range from 154-500 (defined //in homeassistant/util/color.py as HASS_COLOR_MIN and HASS_COLOR_MAX). f = (tmp - 154); diff --git a/src/cmnds/cmd_public.h b/src/cmnds/cmd_public.h index 52d78f052..c7855564d 100644 --- a/src/cmnds/cmd_public.h +++ b/src/cmnds/cmd_public.h @@ -37,7 +37,7 @@ enum EventCode { // must be lower than 256 - CMD_EVENT_MAX_TYPES + CMD_EVENT_MAX_TYPES }; // cmd_tokenizer.c diff --git a/src/cmnds/cmd_tasmota.c b/src/cmnds/cmd_tasmota.c index 15b9e954b..40c64253d 100644 --- a/src/cmnds/cmd_tasmota.c +++ b/src/cmnds/cmd_tasmota.c @@ -30,9 +30,9 @@ static int power(const void *context, const char *cmd, const char *args, int cmd channel = atoi(cmd+5); } #if 0 - // it seems that my Home Assistant expects RGB etc light bulbs to be turned off entirely + // it seems that my Home Assistant expects RGB etc light bulbs to be turned off entirely // with this commands with no arguments, so... no arguments = set all channels? - else + else { CHANNEL_SetAll(iVal, false); return 1; @@ -223,4 +223,4 @@ int taslike_commands_init(){ CMD_RegisterCommand("backlog", "", cmnd_backlog, "run a sequence of ; separated commands", NULL); CMD_RegisterCommand("exec", "", cmnd_lfsexec, "exec - run autoexec.bat or other file from LFS if present", NULL); return 0; -} \ No newline at end of file +} diff --git a/src/cmnds/cmd_test.c b/src/cmnds/cmd_test.c index 340e1d719..eaf541073 100644 --- a/src/cmnds/cmd_test.c +++ b/src/cmnds/cmd_test.c @@ -48,9 +48,9 @@ static int addcmd(const void * context, const char *cmd, const char *args, int c os_free(names[index]); } cmds[index] = os_malloc(strlen(args)+1); - + strcpy(cmds[index], args); - //len = + //len = get_cmd(args, cmd, 32, 1); names[index] = os_malloc(strlen(cmd)+1); strcpy(names[index], cmd); diff --git a/src/driver/drv_bl0937.c b/src/driver/drv_bl0937.c index c2f6b5fac..e060b8536 100644 --- a/src/driver/drv_bl0937.c +++ b/src/driver/drv_bl0937.c @@ -21,8 +21,8 @@ int GPIO_NRG_SEL = 24; // pwm4 -int GPIO_HLW_CF = 7; -int GPIO_NRG_CF1 = 8; +int GPIO_HLW_CF = 7; +int GPIO_NRG_CF1 = 8; bool g_sel = true; uint32_t res_v = 0; @@ -118,12 +118,12 @@ int BL0937_CurrentSet(const void *context, const char *cmd, const char *args, in return 0; } void BL0937_Init() { - + HAL_PIN_Setup_Output(GPIO_NRG_SEL); HAL_PIN_SetOutputValue(GPIO_NRG_SEL, g_sel); HAL_PIN_Setup_Input_Pullup(GPIO_NRG_CF1); - + gpio_int_enable(GPIO_NRG_CF1,IRQ_TRIGGER_FALLING_EDGE,HlwCf1Interrupt); HAL_PIN_Setup_Input_Pullup(GPIO_HLW_CF); diff --git a/src/driver/drv_bl0942.c b/src/driver/drv_bl0942.c index e9f52e74d..d25f4ff58 100644 --- a/src/driver/drv_bl0942.c +++ b/src/driver/drv_bl0942.c @@ -85,12 +85,12 @@ int BL0942_TryToGetNextBL0942Packet() { return 1; } //startDriver BL0942 - raw_unscaled_current = (UART_GetNextByte(3) << 16) | (UART_GetNextByte(2) << 8) | UART_GetNextByte(1); - raw_unscaled_voltage = (UART_GetNextByte(6) << 16) | (UART_GetNextByte(5) << 8) | UART_GetNextByte(4); - raw_unscaled_power = (UART_GetNextByte(12) << 24) | (UART_GetNextByte(11) << 16) | (UART_GetNextByte(10) << 8); + raw_unscaled_current = (UART_GetNextByte(3) << 16) | (UART_GetNextByte(2) << 8) | UART_GetNextByte(1); + raw_unscaled_voltage = (UART_GetNextByte(6) << 16) | (UART_GetNextByte(5) << 8) | UART_GetNextByte(4); + raw_unscaled_power = (UART_GetNextByte(12) << 24) | (UART_GetNextByte(11) << 16) | (UART_GetNextByte(10) << 8); raw_unscaled_power = (raw_unscaled_power >> 8); - raw_unscaled_freq = (UART_GetNextByte(17) << 8) | UART_GetNextByte(16); + raw_unscaled_freq = (UART_GetNextByte(17) << 8) | UART_GetNextByte(16); // those are not values like 230V, but unscaled //addLogAdv(LOG_INFO, LOG_FEATURE_BL0942,"Unscaled current %d, voltage %d, power %d, freq %d\n", raw_unscaled_current, raw_unscaled_voltage,raw_unscaled_power,raw_unscaled_freq); @@ -116,7 +116,7 @@ int BL0942_TryToGetNextBL0942Packet() { #endif UART_ConsumeBytes(BL0942_PACKET_LEN); - + return BL0942_PACKET_LEN; } diff --git a/src/driver/drv_bl_shared.c b/src/driver/drv_bl_shared.c index 2ecb39d85..a93990081 100644 --- a/src/driver/drv_bl_shared.c +++ b/src/driver/drv_bl_shared.c @@ -20,9 +20,9 @@ enum { OBK_NUM_MEASUREMENTS, }; -// Current values +// Current values float lastReadings[OBK_NUM_MEASUREMENTS]; -// +// // Variables below are for optimization // We can't send a full MQTT update every second. // It's too much for Beken, and it's too much for LWIP 2 MQTT library, @@ -35,13 +35,13 @@ float lastSentValues[OBK_NUM_MEASUREMENTS]; // how much update frames has passed without sending MQTT update of read values? int noChangeFrames[OBK_NUM_MEASUREMENTS]; // how much of value have to change in order to be send over MQTT again? -int changeSendThresholds[OBK_NUM_MEASUREMENTS] = { +int changeSendThresholds[OBK_NUM_MEASUREMENTS] = { 0.25f, // voltage - OBK_VOLTAGE 0.002f, // current - OBK_CURRENT 0.25f, // power - OBK_POWER }; // how are they called in MQTT -const char *mqttNames[OBK_NUM_MEASUREMENTS] = { +const char *mqttNames[OBK_NUM_MEASUREMENTS] = { "voltage", "current", "power" diff --git a/src/driver/drv_main.c b/src/driver/drv_main.c index e137e866f..54084ce26 100644 --- a/src/driver/drv_main.c +++ b/src/driver/drv_main.c @@ -22,13 +22,13 @@ typedef struct driver_s { // startDriver BL0937 static driver_t g_drivers[] = { - { "TuyaMCU", TuyaMCU_Init, TuyaMCU_RunFrame, NULL, false }, - { "NTP", NTP_Init, NTP_OnEverySecond, NULL, false }, - { "I2C", DRV_I2C_Init, DRV_I2C_EverySecond, NULL, false }, - { "BL0942", BL0942_Init, BL0942_RunFrame, BL0942_AppendInformationToHTTPIndexPage, false }, - { "BL0937", BL0937_Init, BL0937_RunFrame, NULL, false }, + { "TuyaMCU", TuyaMCU_Init, TuyaMCU_RunFrame, NULL, false }, + { "NTP", NTP_Init, NTP_OnEverySecond, NULL, false }, + { "I2C", DRV_I2C_Init, DRV_I2C_EverySecond, NULL, false }, + { "BL0942", BL0942_Init, BL0942_RunFrame, BL0942_AppendInformationToHTTPIndexPage, false }, + { "BL0937", BL0937_Init, BL0937_RunFrame, NULL, false }, #if PLATFORM_BEKEN - { "DGR", DRV_DGR_Init, DRV_DGR_RunFrame, NULL, false }, + { "DGR", DRV_DGR_Init, DRV_DGR_RunFrame, NULL, false }, #endif }; static int g_numDrivers = sizeof(g_drivers)/sizeof(g_drivers[0]); @@ -55,7 +55,7 @@ int DRV_Start(const void *context, const char *cmd, const char *args, int cmdFla for(i = 0; i < g_numDrivers; i++) { if(!stricmp(g_drivers[i].name,name)) { - if(g_drivers[i].bLoaded){ + if(g_drivers[i].bLoaded){ addLogAdv(LOG_INFO, LOG_FEATURE_NTP,"Drv %s is already loaded.\n",name); return 1; @@ -89,14 +89,14 @@ void DRV_AppendInformationToHTTPIndexPage(http_request_t *request) { int c_active = 0; for(i = 0; i < g_numDrivers; i++) { - if(g_drivers[i].bLoaded){ + if(g_drivers[i].bLoaded){ c_active++; if(g_drivers[i].appendInformationToHTTPIndexPage) { g_drivers[i].appendInformationToHTTPIndexPage(request); } } } - + hprintf128(request,"
%i drivers active, total %i
",c_active,g_numDrivers); } diff --git a/src/driver/drv_ntp.c b/src/driver/drv_ntp.c index fd3f94676..f8ce961ca 100644 --- a/src/driver/drv_ntp.c +++ b/src/driver/drv_ntp.c @@ -1,5 +1,5 @@ // NTP client -// Based on my previous work here: +// Based on my previous work here: // https://www.elektroda.pl/rtvforum/topic3712112.html #include "../new_common.h" @@ -74,7 +74,7 @@ void NTP_Init() { unsigned int NTP_GetCurrentTime() { return g_time; -} +} void NTP_Shutdown() { @@ -166,7 +166,7 @@ void NTP_CheckForReceive() { #else recv_len = recv(g_ntp_socket, ptr, i, 0); #endif - + if(recv_len < 0){ addLogAdv(LOG_INFO, LOG_FEATURE_NTP,"NTP_CheckForReceive: Error while receiving server's msg\n"); return; diff --git a/src/driver/drv_tasmotaDeviceGroups.c b/src/driver/drv_tasmotaDeviceGroups.c index bd72ab91d..9df9bb662 100644 --- a/src/driver/drv_tasmotaDeviceGroups.c +++ b/src/driver/drv_tasmotaDeviceGroups.c @@ -10,7 +10,7 @@ #include "lwip/ip_addr.h" #include "lwip/inet.h" -const char* group = "239.255.250.250"; +const char* group = "239.255.250.250"; int port = 4447; // //int DRV_DGR_CreateSocket_Send() { @@ -52,11 +52,11 @@ void DRV_DGR_CreateSocket_Receive() { return ; } - if(broadcast) + if(broadcast) { iResult = setsockopt(g_dgr_socket, SOL_SOCKET, SO_BROADCAST, (char *)&flag, sizeof(flag)); - if (iResult != 0) + if (iResult != 0) { addLogAdv(LOG_INFO, LOG_FEATURE_DGR,"failed to do setsockopt SO_BROADCAST\n"); return ; @@ -93,7 +93,7 @@ void DRV_DGR_CreateSocket_Receive() { // return 1; //} - if(broadcast) + if(broadcast) { } @@ -121,7 +121,7 @@ void DRV_DGR_CreateSocket_Receive() { } void DRV_DGR_RunFrame() { struct sockaddr_in addr; - + if(g_dgr_socket==0) { addLogAdv(LOG_INFO, LOG_FEATURE_DGR,"no sock\n"); return ; @@ -165,12 +165,12 @@ void DRV_DGR_RunFrame() { // OSStatus err = kNoErr; // // -// err = rtos_create_thread( &g_dgr_thread, BEKEN_APPLICATION_PRIORITY, -// "DGR_server", +// err = rtos_create_thread( &g_dgr_thread, BEKEN_APPLICATION_PRIORITY, +// "DGR_server", // (beken_thread_function_t)DRV_DGR_Thread, // 0x100, // (beken_thread_arg_t)0 ); -// +// //} void DRV_DGR_Init() @@ -179,7 +179,7 @@ void DRV_DGR_Init() DRV_DGR_StartThread(); #else DRV_DGR_CreateSocket_Receive(); - + lwip_fcntl(g_dgr_socket, F_SETFL,O_NONBLOCK); #endif } diff --git a/src/driver/drv_tuyaMCU.c b/src/driver/drv_tuyaMCU.c index 471270345..b0780634d 100644 --- a/src/driver/drv_tuyaMCU.c +++ b/src/driver/drv_tuyaMCU.c @@ -190,7 +190,7 @@ int UART_TryToGetNextTuyaPacket(byte *out, int maxSize) { byte a, b, version, command, lena, lenb; char printfSkipDebug[256]; char buffer2[8]; - + printfSkipDebug[0] = 0; cs = UART_GetDataSize(); @@ -435,7 +435,7 @@ int TuyaMCU_Send_Hex(const void *context, const char *cmd, const char *args, int while(*args) { byte b; b = hexbyte(args); - + UART_SendByte(b); args += 2; @@ -449,7 +449,7 @@ int TuyaMCU_LinkTuyaMCUOutputToChannel(const void *context, const char *cmd, con int dpType; int channelID; - // linkTuyaMCUOutputToChannel dpId varType channelID + // linkTuyaMCUOutputToChannel dpId varType channelID Tokenizer_TokenizeString(args); if(Tokenizer_GetArgsCount() < 3) { @@ -698,7 +698,7 @@ void TuyaMCU_ParseStateMessage(const byte *data, int len) { int dataType; ofs = 0; - + while(ofs + 4 < len) { sectorLen = data[ofs + 2] << 8 | data[ofs + 3]; fnId = data[ofs]; @@ -713,7 +713,7 @@ void TuyaMCU_ParseStateMessage(const byte *data, int len) { // apply to channels TuyaMCU_ApplyMapping(fnId,iVal); } - if(sectorLen == 4) { + if(sectorLen == 4) { int iVal = data[ofs + 4] << 24 | data[ofs + 5] << 16 | data[ofs + 6] << 8 | data[ofs + 7]; addLogAdv(LOG_INFO, LOG_FEATURE_TUYAMCU,"TuyaMCU_ParseStateMessage: raw data 4 int: %i\n",iVal); // apply to channels @@ -848,7 +848,7 @@ void TuyaMCU_Init() // https://github.com/esphome/feature-requests/issues/497 /// 55AA 00 08 000C 00 02 02 02 02 02 02 01 01 0001 01 23 /// head vr id size FL YY MM DD HH MM SS ID TP SIZE VL CK -/// 55AA 00 08 000C 00 01 01 01 01 01 01 03 04 0001 02 23 +/// 55AA 00 08 000C 00 01 01 01 01 01 01 03 04 0001 02 23 // TP = 0x01 bool 1 Value range: 0x00/0x01. // TP = 0x04 enum 1 Enumeration type, ranging from 0 to 255. diff --git a/src/driver/drv_uart.c b/src/driver/drv_uart.c index 13aa05f17..0b501f7b0 100644 --- a/src/driver/drv_uart.c +++ b/src/driver/drv_uart.c @@ -39,7 +39,7 @@ int UART_GetDataSize() }else { remain_buf_size = g_recvBufIn + g_recvBufSize - g_recvBufOut; } - + return remain_buf_size; } byte UART_GetNextByte(int index) { @@ -56,7 +56,7 @@ void UART_ConsumeBytes(int idx) { } void UART_AppendByteToCircularBuffer(int rc) { - if(UART_GetDataSize() < (g_recvBufSize-1)) + if(UART_GetDataSize() < (g_recvBufSize-1)) { g_recvBuf[g_recvBufIn++] = rc; if(g_recvBufIn >= g_recvBufSize){ @@ -68,7 +68,7 @@ void UART_AppendByteToCircularBuffer(int rc) { void test_ty_read_uart_data_to_buffer(int port, void* param) { int rc = 0; - + while((rc = uart_read_byte(port)) != -1) { UART_AppendByteToCircularBuffer(rc); diff --git a/src/hal/bk7231/hal_flashConfig_bk7231.c b/src/hal/bk7231/hal_flashConfig_bk7231.c index 575828357..bc0decac7 100644 --- a/src/hal/bk7231/hal_flashConfig_bk7231.c +++ b/src/hal/bk7231/hal_flashConfig_bk7231.c @@ -63,7 +63,7 @@ int bekken_hal_flash_read(const unsigned int addr, void *dst, const unsigned int flash_handle = ddev_open(FLASH_DEV_NAME, &status, 0); ddev_read(flash_handle, dst, size, addr); ddev_close(flash_handle); - + hal_flash_unlock(); return 0; @@ -87,7 +87,7 @@ int HAL_Configuration_SaveConfigMemory(void *src, int dataLen){ if (dataLen > flashlen){ ADDLOG_ERROR(LOG_FEATURE_CFG, "HAL_Configuration_SaveConfigMemory - table too big - can't save"); - if (taken == pdTRUE) + if (taken == pdTRUE) xSemaphoreGive( config_mutex ); return 0; } @@ -102,7 +102,7 @@ int HAL_Configuration_SaveConfigMemory(void *src, int dataLen){ if (taken == pdTRUE) xSemaphoreGive( config_mutex ); - + ADDLOG_DEBUG(LOG_FEATURE_CFG, "HAL_Configuration_SaveConfigMemory: saved %d bytes to %d", dataLen, flashaddr); return dataLen; } diff --git a/src/hal/bk7231/hal_flashVars_bk7231.c b/src/hal/bk7231/hal_flashVars_bk7231.c index 255812985..71c2b9d13 100644 --- a/src/hal/bk7231/hal_flashVars_bk7231.c +++ b/src/hal/bk7231/hal_flashVars_bk7231.c @@ -4,9 +4,9 @@ Design: variables to be small - we want as many writes between erases as possible. sector will be all FF (erased), and data added into it. - reading consists of searching the first non FF byte from the end, then + reading consists of searching the first non FF byte from the end, then reading the preceding bytes as the variables. - last byte of data is len (!== 0xFF!) + last byte of data is len (!== 0xFF!) */ @@ -47,13 +47,13 @@ int flash_vars_read(FLASH_VARS_STRUCTURE *data); //#define TEST_MODE //#define debug_delay(x) rtos_delay_milliseconds(x) -#define debug_delay(x) +#define debug_delay(x) #define FLASH_VARS_MAGIC 0xfefefefe // NOTE: Changed below according to partitions in SDK!!!! static unsigned int flash_vars_start = 0x1e3000; //0x1e1000 + 0x1000 + 0x1000; // after netconfig and mystery SSID -static unsigned int flash_vars_len = 0x2000; // two blocks in BK7231 -static unsigned int flash_vars_sector_len = 0x1000; // erase size in BK7231 +static unsigned int flash_vars_len = 0x2000; // two blocks in BK7231 +static unsigned int flash_vars_sector_len = 0x1000; // erase size in BK7231 FLASH_VARS_STRUCTURE flash_vars; int flash_vars_offset = 0; // offset to first FF in our area @@ -110,8 +110,8 @@ int flash_vars_init(){ // there is an EXTRA sctor used for some form of wifi? // on T variety, this is 0x1e3000 flash_vars_start = pt->partition_start_addr + pt->partition_length + 0x1000; - flash_vars_len = 0x2000; // two blocks in BK7231 - flash_vars_sector_len = 0x1000; // erase size in BK7231 + flash_vars_len = 0x2000; // two blocks in BK7231 + flash_vars_sector_len = 0x1000; // erase size in BK7231 #endif //ADDLOG_DEBUG(LOG_FEATURE_CFG, "got part info"); debug_delay(200); @@ -137,7 +137,7 @@ static int flash_vars_valid(){ //uint32_t i; //uint32_t param; UINT32 status; -#ifndef TEST_MODE +#ifndef TEST_MODE DD_HANDLE flash_hdl; #endif uint32_t start_addr; @@ -146,7 +146,7 @@ static int flash_vars_valid(){ //ADDLOG_DEBUG(LOG_FEATURE_CFG, "flash_vars_valid()"); debug_delay(200); -#ifndef TEST_MODE +#ifndef TEST_MODE flash_hdl = ddev_open(FLASH_DEV_NAME, &status, 0); ASSERT(DD_HANDLE_UNVALID != flash_hdl); bk_flash_enable_security(FLASH_PROTECT_NONE); @@ -156,7 +156,7 @@ static int flash_vars_valid(){ //ADDLOG_DEBUG(LOG_FEATURE_CFG, "flash_vars_valid() flash open"); debug_delay(200); -#ifdef TEST_MODE +#ifdef TEST_MODE os_memcpy(&tmp, &test_flash_area[start_addr - flash_vars_start], sizeof(tmp)); #else GLOBAL_INT_DISABLE(); @@ -187,7 +187,7 @@ static int flash_vars_write_magic(){ //uint32_t i; //uint32_t param; UINT32 status; -#ifndef TEST_MODE +#ifndef TEST_MODE DD_HANDLE flash_hdl; #endif uint32_t start_addr; @@ -208,7 +208,7 @@ static int flash_vars_write_magic(){ debug_delay(200); return -1; } -#ifdef TEST_MODE +#ifdef TEST_MODE os_memcpy(&test_flash_area[start_addr - flash_vars_start], &tmp, sizeof(tmp)); #else bk_flash_enable_security(FLASH_PROTECT_NONE); @@ -248,7 +248,7 @@ int flash_vars_read(FLASH_VARS_STRUCTURE *data){ //uint32_t i; //uint32_t param; UINT32 status; -#ifndef TEST_MODE +#ifndef TEST_MODE DD_HANDLE flash_hdl; #endif uint32_t start_addr; @@ -269,7 +269,7 @@ int flash_vars_read(FLASH_VARS_STRUCTURE *data){ } debug_delay(200); -#ifndef TEST_MODE +#ifndef TEST_MODE flash_hdl = ddev_open(FLASH_DEV_NAME, &status, 0); ASSERT(DD_HANDLE_UNVALID != flash_hdl); bk_flash_enable_security(FLASH_PROTECT_NONE); @@ -278,7 +278,7 @@ int flash_vars_read(FLASH_VARS_STRUCTURE *data){ do { start_addr -= sizeof(tmp); -#ifdef TEST_MODE +#ifdef TEST_MODE os_memcpy(&tmp, &test_flash_area[start_addr - flash_vars_start], sizeof(tmp)); #else GLOBAL_INT_DISABLE(); @@ -300,7 +300,7 @@ int flash_vars_read(FLASH_VARS_STRUCTURE *data){ os_memset(data, 0, sizeof(*data)); // set the len to the latest revision's len data->len = sizeof(*data); -#ifndef TEST_MODE +#ifndef TEST_MODE ddev_close(flash_hdl); bk_flash_enable_security(FLASH_PROTECT_ALL); #endif @@ -319,7 +319,7 @@ int flash_vars_read(FLASH_VARS_STRUCTURE *data){ if (len > sizeof(*data)){ ADDLOG_ERROR(LOG_FEATURE_CFG, "len (%d) in flash_var greater than current structure len (%d)", len, sizeof(*data)); -#ifndef TEST_MODE +#ifndef TEST_MODE ddev_close(flash_hdl); bk_flash_enable_security(FLASH_PROTECT_ALL); #endif @@ -330,7 +330,7 @@ int flash_vars_read(FLASH_VARS_STRUCTURE *data){ // clear result. os_memset(data, 0, sizeof(*data)); // read the DATA portion into the structure -#ifdef TEST_MODE +#ifdef TEST_MODE os_memcpy(data, &test_flash_area[start_addr - flash_vars_start], len-1); #else GLOBAL_INT_DISABLE(); @@ -376,8 +376,8 @@ int flash_vars_write(){ flash_vars_offset += data->len; alignOffset(&flash_vars_offset); - ADDLOG_DEBUG(LOG_FEATURE_CFG, "new offset %d, boot_count %d, success count %d", - flash_vars_offset, + ADDLOG_DEBUG(LOG_FEATURE_CFG, "new offset %d, boot_count %d, success count %d", + flash_vars_offset, data->boot_count, data->boot_success_count ); @@ -394,14 +394,14 @@ int _flash_vars_write(void *data, unsigned int off_set, unsigned int size){ //uint32_t i; //uint32_t param; UINT32 status; -#ifndef TEST_MODE +#ifndef TEST_MODE DD_HANDLE flash_hdl; #endif uint32_t start_addr; GLOBAL_INT_DECLARATION(); //ADDLOG_DEBUG(LOG_FEATURE_CFG, "_flash vars write offset %d, size %d", off_set, size); -#ifndef TEST_MODE +#ifndef TEST_MODE flash_hdl = ddev_open(FLASH_DEV_NAME, &status, 0); ASSERT(DD_HANDLE_UNVALID != flash_hdl); bk_flash_enable_security(FLASH_PROTECT_NONE); @@ -421,7 +421,7 @@ int _flash_vars_write(void *data, unsigned int off_set, unsigned int size){ return -1; } -#ifdef TEST_MODE +#ifdef TEST_MODE os_memcpy(&test_flash_area[start_addr - flash_vars_start], data, size); #else GLOBAL_INT_DISABLE(); @@ -443,14 +443,14 @@ int flash_vars_erase(unsigned int off_set, unsigned int size){ uint32_t i; uint32_t param; UINT32 status; -#ifndef TEST_MODE +#ifndef TEST_MODE DD_HANDLE flash_hdl; #endif uint32_t start_sector, end_sector; GLOBAL_INT_DECLARATION(); ADDLOG_DEBUG(LOG_FEATURE_CFG, "flash vars erase at offset %d len %d", off_set, size); -#ifndef TEST_MODE +#ifndef TEST_MODE flash_hdl = ddev_open(FLASH_DEV_NAME, &status, 0); ASSERT(DD_HANDLE_UNVALID != flash_hdl); bk_flash_enable_security(FLASH_PROTECT_NONE); @@ -463,7 +463,7 @@ int flash_vars_erase(unsigned int off_set, unsigned int size){ param = flash_vars_start + (i << 12); if (param < flash_vars_start){ ADDLOG_ERROR(LOG_FEATURE_CFG, "flash vars erase invalid addr 0x%X < 0x%X", param, flash_vars_start); -#ifndef TEST_MODE +#ifndef TEST_MODE ddev_close(flash_hdl); bk_flash_enable_security(FLASH_PROTECT_ALL); #endif @@ -471,14 +471,14 @@ int flash_vars_erase(unsigned int off_set, unsigned int size){ } if (param + flash_vars_sector_len > flash_vars_start + flash_vars_len){ ADDLOG_ERROR(LOG_FEATURE_CFG, "flash vars erase invalid addr 0x%X+0x%X > 0x%X", param, flash_vars_sector_len, flash_vars_start + flash_vars_len); -#ifndef TEST_MODE +#ifndef TEST_MODE ddev_close(flash_hdl); bk_flash_enable_security(FLASH_PROTECT_ALL); #endif return -1; } ADDLOG_DEBUG(LOG_FEATURE_CFG, "flash vars erase block at addr 0x%X", param); -#ifdef TEST_MODE +#ifdef TEST_MODE os_memset(&test_flash_area[param - flash_vars_start], 0xff, 0x1000); #else GLOBAL_INT_DISABLE(); @@ -486,7 +486,7 @@ int flash_vars_erase(unsigned int off_set, unsigned int size){ GLOBAL_INT_RESTORE(); #endif } -#ifndef TEST_MODE +#ifndef TEST_MODE ddev_close(flash_hdl); bk_flash_enable_security(FLASH_PROTECT_ALL); #endif @@ -511,9 +511,9 @@ void HAL_FlashVars_IncreaseBootCount(){ flash_vars_write(); flash_vars_read(&data); - ADDLOG_DEBUG(LOG_FEATURE_CFG, "re-read - offset %d, boot count %d, boot success %d, bootfailures %d", - flash_vars_offset, - data.boot_count, + ADDLOG_DEBUG(LOG_FEATURE_CFG, "re-read - offset %d, boot count %d, boot success %d, bootfailures %d", + flash_vars_offset, + data.boot_count, data.boot_success_count, data.boot_count - data.boot_success_count ); #endif @@ -530,9 +530,9 @@ void HAL_FlashVars_SaveBootComplete(){ flash_vars_write(); flash_vars_read(&data); - ADDLOG_DEBUG(LOG_FEATURE_CFG, "re-read - offset %d, boot count %d, boot success %d, bootfailures %d", - flash_vars_offset, - data.boot_count, + ADDLOG_DEBUG(LOG_FEATURE_CFG, "re-read - offset %d, boot count %d, boot success %d, bootfailures %d", + flash_vars_offset, + data.boot_count, data.boot_success_count, data.boot_count - data.boot_success_count ); #endif @@ -552,4 +552,4 @@ int HAL_FlashVars_GetBootCount(){ } -#endif +#endif diff --git a/src/hal/bk7231/hal_wifi_bk7231.c b/src/hal/bk7231/hal_wifi_bk7231.c index 5f40500c4..275947c47 100644 --- a/src/hal/bk7231/hal_wifi_bk7231.c +++ b/src/hal/bk7231/hal_wifi_bk7231.c @@ -30,7 +30,7 @@ const char *HAL_GetMyIPString(){ } else { bk_wlan_get_ip_status(&ipStatus, STATION); } - + strcpy(g_IP, ipStatus.ip); return g_IP; } @@ -69,10 +69,10 @@ void HAL_PrintNetworkInfo(){ os_memset(&ipStatus, 0x0, sizeof(IPStatusTypedef)); bk_wlan_get_ip_status(&ipStatus, STATION); - + char *fmt = "dhcp=%d ip=%s gate=%s mask=%s mac=" MACSTR "\r\n"; addLogAdv(LOG_INFO, LOG_FEATURE_GENERAL, fmt , - ipStatus.dhcp, ipStatus.ip, ipStatus.gate, + ipStatus.dhcp, ipStatus.ip, ipStatus.gate, ipStatus.mask, MAC2STR((unsigned char*)ipStatus.mac)); // print wifi state @@ -84,7 +84,7 @@ void HAL_PrintNetworkInfo(){ #else bk_printf("sta: %d, softap: %d, b/g\r\n",sta_ip_is_start(),uap_ip_is_start()); #endif - + if( sta_ip_is_start() ) { os_memset(&linkStatus, 0x0, sizeof(LinkStatusTypeDef)); @@ -119,7 +119,7 @@ void HAL_PrintNetworkInfo(){ break; } } - + if( uap_ip_is_start() ) { os_memset(&ap_info, 0x0, sizeof(network_InitTypeDef_ap_st)); @@ -152,9 +152,9 @@ void HAL_PrintNetworkInfo(){ break; } addLogAdv(LOG_INFO, LOG_FEATURE_GENERAL,"ip=%s,gate=%s,mask=%s,dns=%s\r\n", - ap_info.local_ip_addr, - ap_info.gateway_ip_addr, - ap_info.net_mask, + ap_info.local_ip_addr, + ap_info.gateway_ip_addr, + ap_info.net_mask, ap_info.dns_server_ip_addr); } @@ -190,13 +190,13 @@ void wl_status( void *ctxt ){ g_wifiStatusCallback(WIFI_STA_AUTH_FAILED); } break; - case RW_EVT_STA_CONNECTED: /* authentication success */ - case RW_EVT_STA_GOT_IP: + case RW_EVT_STA_CONNECTED: /* authentication success */ + case RW_EVT_STA_GOT_IP: if(g_wifiStatusCallback!=0) { g_wifiStatusCallback(WIFI_STA_CONNECTED); } break; - + /* for softap mode */ case RW_EVT_AP_CONNECTED: /* a client association success */ if(g_wifiStatusCallback!=0) { @@ -233,12 +233,12 @@ void HAL_ConnectToWiFi(const char *oob_ssid,const char *connect_key) network_InitTypeDef_adv_st wNetConfigAdv; os_memset( &wNetConfigAdv, 0x0, sizeof(network_InitTypeDef_adv_st) ); - + os_strcpy((char*)wNetConfigAdv.ap_info.ssid, oob_ssid); hwaddr_aton("48:ee:0c:48:93:12", (unsigned char *)wNetConfigAdv.ap_info.bssid); wNetConfigAdv.ap_info.security = SECURITY_TYPE_WPA2_MIXED; wNetConfigAdv.ap_info.channel = 5; - + os_strcpy((char*)wNetConfigAdv.key, connect_key); wNetConfigAdv.key_len = os_strlen(connect_key); wNetConfigAdv.dhcp_mode = DHCP_CLIENT; @@ -247,7 +247,7 @@ void HAL_ConnectToWiFi(const char *oob_ssid,const char *connect_key) bk_wlan_start_sta_adv(&wNetConfigAdv); #else network_InitTypeDef_st network_cfg; - + os_memset(&network_cfg, 0x0, sizeof(network_InitTypeDef_st)); os_strcpy((char *)network_cfg.wifi_ssid, oob_ssid); @@ -258,7 +258,7 @@ void HAL_ConnectToWiFi(const char *oob_ssid,const char *connect_key) network_cfg.wifi_retry_interval = 100; ADDLOGF_INFO("ssid:%s key:%s\r\n", network_cfg.wifi_ssid, network_cfg.wifi_key); - + bk_wlan_start(&network_cfg); #endif } @@ -269,25 +269,25 @@ int HAL_SetupWiFiOpenAccessPoint(const char *ssid) #define APP_DRONE_DEF_NET_IP "192.168.4.1" #define APP_DRONE_DEF_NET_MASK "255.255.255.0" #define APP_DRONE_DEF_NET_GW "192.168.4.1" - #define APP_DRONE_DEF_CHANNEL 1 - + #define APP_DRONE_DEF_CHANNEL 1 + general_param_t general; ap_param_t ap_info; network_InitTypeDef_st wNetConfig; int len; unsigned char *mac; - + os_memset(&general, 0, sizeof(general_param_t)); - os_memset(&ap_info, 0, sizeof(ap_param_t)); - os_memset(&wNetConfig, 0x0, sizeof(network_InitTypeDef_st)); - + os_memset(&ap_info, 0, sizeof(ap_param_t)); + os_memset(&wNetConfig, 0x0, sizeof(network_InitTypeDef_st)); + general.role = 1, general.dhcp_enable = 1, os_strcpy((char *)wNetConfig.local_ip_addr, APP_DRONE_DEF_NET_IP); os_strcpy((char *)wNetConfig.net_mask, APP_DRONE_DEF_NET_MASK); os_strcpy((char *)wNetConfig.dns_server_ip_addr, APP_DRONE_DEF_NET_GW); - + ADDLOGF_INFO("no flash configuration, use default\r\n"); mac = (unsigned char*)&ap_info.bssid.array; @@ -298,10 +298,10 @@ int HAL_SetupWiFiOpenAccessPoint(const char *ssid) ap_info.cipher_suite = 0; //memcpy(ap_info.ssid.array, APP_DRONE_DEF_SSID, os_strlen(APP_DRONE_DEF_SSID)); memcpy(ap_info.ssid.array, ssid, os_strlen(ssid)); - + ap_info.key_len = 0; - os_memset(&ap_info.key, 0, 65); - + os_memset(&ap_info.key, 0, 65); + bk_wlan_ap_set_default_channel(ap_info.chann); @@ -309,18 +309,18 @@ int HAL_SetupWiFiOpenAccessPoint(const char *ssid) os_strncpy((char *)wNetConfig.wifi_ssid, (char *)ap_info.ssid.array, sizeof(wNetConfig.wifi_ssid)); os_strncpy((char *)wNetConfig.wifi_key, (char *)ap_info.key, sizeof(wNetConfig.wifi_key)); - + wNetConfig.wifi_mode = SOFT_AP; wNetConfig.dhcp_mode = DHCP_SERVER; wNetConfig.wifi_retry_interval = 100; - + if(1) { ADDLOGF_INFO("set ip info: %s,%s,%s\r\n", wNetConfig.local_ip_addr, wNetConfig.net_mask, wNetConfig.dns_server_ip_addr); } - + if(1) { ADDLOGF_INFO("ssid:%s key:%s mode:%d\r\n", wNetConfig.wifi_ssid, wNetConfig.wifi_key, wNetConfig.wifi_mode); } @@ -343,6 +343,6 @@ int HAL_SetupWiFiOpenAccessPoint(const char *ssid) //dhcp_server_start(0); //dhcp_server_stop(void); - return 0; + return 0; } diff --git a/src/hal/bl602/hal_pins_bl602.c b/src/hal/bl602/hal_pins_bl602.c index a8853397a..a0c1315f8 100644 --- a/src/hal/bl602/hal_pins_bl602.c +++ b/src/hal/bl602/hal_pins_bl602.c @@ -44,7 +44,7 @@ void HAL_PIN_Setup_Output(int index) { void HAL_PIN_PWM_Stop(int index) { int pwm; - + pwm = BL_FindPWMForPin(index); if(pwm == -1) { @@ -55,13 +55,13 @@ void HAL_PIN_PWM_Stop(int index) { void HAL_PIN_PWM_Start(int index) { int pwm; - + pwm = BL_FindPWMForPin(index); if(pwm == -1) { return; } - + //addLogAdv(LOG_INFO, LOG_FEATURE_MAIN,"HAL_PIN_PWM_Start: pin %i chose pwm %i\r\n",index,pwm); // Frequency must be between 2000 and 800000 bl_pwm_init(pwm, index, 2000); diff --git a/src/hal/bl602/hal_wifi_bl602.c b/src/hal/bl602/hal_wifi_bl602.c index 948bb6f46..2112eb8df 100644 --- a/src/hal/bl602/hal_wifi_bl602.c +++ b/src/hal/bl602/hal_wifi_bl602.c @@ -31,12 +31,12 @@ void HAL_ConnectToWiFi(const char *ssid, const char *psk) g_bAccessPointMode = 0; } int HAL_SetupWiFiOpenAccessPoint(const char *ssid) { - + uint8_t hidden_ssid = 0; int channel; wifi_interface_t wifi_interface; struct netif *net; - + wifi_interface = wifi_mgmr_ap_enable(); /*no password when only one param*/ wifi_mgmr_ap_start(wifi_interface, ssid, hidden_ssid, NULL, 1); @@ -188,4 +188,4 @@ const char *HAL_GetMACStr(char *macstr) { return macstr; } -#endif // PLATFORM_BL602 \ No newline at end of file +#endif // PLATFORM_BL602 diff --git a/src/hal/xr809/hal_flashConfig_xr809.c b/src/hal/xr809/hal_flashConfig_xr809.c index 8f13caecf..26f7bee3c 100644 --- a/src/hal/xr809/hal_flashConfig_xr809.c +++ b/src/hal/xr809/hal_flashConfig_xr809.c @@ -102,7 +102,7 @@ int HAL_Configuration_SaveConfigMemory(void *src, int dataLen){ ADDLOG_DEBUG(LOG_FEATURE_CFG, "HAL_Configuration_SaveConfigMemory: fdcm write failed\n"); return 0; } - + ADDLOG_DEBUG(LOG_FEATURE_CFG, "HAL_Configuration_SaveConfigMemory: saved %d bytes", dataLen); return dataLen; } diff --git a/src/hal/xr809/hal_pins_xr809.c b/src/hal/xr809/hal_pins_xr809.c index 44d2fd2eb..c06aafe5d 100644 --- a/src/hal/xr809/hal_pins_xr809.c +++ b/src/hal/xr809/hal_pins_xr809.c @@ -128,5 +128,5 @@ void HAL_PIN_PWM_Update(int index, int value) { -#endif +#endif diff --git a/src/httpclient/http_client.c b/src/httpclient/http_client.c index a8416147f..81bf0b937 100644 --- a/src/httpclient/http_client.c +++ b/src/httpclient/http_client.c @@ -608,7 +608,7 @@ int httpclient_retrieve_content_old(httpclient_t *client, char *data, int len, u http_wr_to_flash(data,len); #endif - + b_data = os_malloc((TCP_LEN_MAX+1) * sizeof(char)); //bk_http_ptr->do_data = 1; //bk_http_ptr->http_total = readLen - len; @@ -620,7 +620,7 @@ int httpclient_retrieve_content_old(httpclient_t *client, char *data, int len, u os_memcpy(client_data->response_buf+count, data, templen); client_data->response_buf_filled = count; client_data->response_buf[count] = '\0'; - client_data->retrieve_len -= templen; + client_data->retrieve_len -= templen; } else { client_data->response_buf[client_data->response_buf_len - 1] = '\0'; client_data->response_buf_filled = client_data->response_buf_len - 1; @@ -653,11 +653,11 @@ int httpclient_retrieve_content_old(httpclient_t *client, char *data, int len, u } } } while (readLen); - + //bk_http_ptr->do_data = 0; os_free(b_data); b_data = NULL; - + if (client_data->is_chunked) { if (len < 2) { int new_trf_len, ret; @@ -873,7 +873,7 @@ iotx_err_t httpclient_recv_response(httpclient_t *client, uint32_t timeout_ms, h // if is_more is true, we just need to get more data - // this will fill response_buf + // this will fill response_buf if (client_data->is_more) { client_data->response_buf[0] = '\0'; client_data->response_buf_filled = 0; @@ -882,9 +882,9 @@ iotx_err_t httpclient_recv_response(httpclient_t *client, uint32_t timeout_ms, h if (ret != 0) { return ret; } - ret = httpclient_retrieve_content(client, - buf, - reclen, + ret = httpclient_retrieve_content(client, + buf, + reclen, iotx_time_left(&timer), client_data); } @@ -1131,8 +1131,8 @@ exit: // our async stuff int HTTPClient_Async_SendGeneric(httprequest_t *request){ OSStatus err = kNoErr; - err = rtos_create_thread( NULL, BEKEN_APPLICATION_PRIORITY, - "httprequest", + err = rtos_create_thread( NULL, BEKEN_APPLICATION_PRIORITY, + "httprequest", (beken_thread_function_t)httprequest_thread, 0x800, (beken_thread_arg_t)request ); @@ -1197,10 +1197,10 @@ int HTTPClient_Async_SendGet(const char *url_in){ client_data->post_buf = ""; //Sets the user data to be posted. client_data->post_buf_len = 0; //Sets the post data length. client_data->post_content_type = "text/csv"; //Sets the content type. - request->data_callback = 0; + request->data_callback = 0; request->port = 80;//HTTP_PORT; request->url = url; - request->method = HTTPCLIENT_GET; + request->method = HTTPCLIENT_GET; request->timeout = 10000; HTTPClient_Async_SendGeneric(request); diff --git a/src/httpclient/http_client.h b/src/httpclient/http_client.h index d78853348..56bfe9e7b 100644 --- a/src/httpclient/http_client.h +++ b/src/httpclient/http_client.h @@ -134,15 +134,15 @@ typedef struct httprequest_t_tag{ * client_data->post_content_type = content_type; //Sets the content type. * request->port = HTTPS_PORT; * request->url = url; - * request->method = HTTPCLIENT_POST; + * request->method = HTTPCLIENT_POST; * request->timeout = 10000; - * request->data_callback = mydatacallback; + * request->data_callback = mydatacallback; * HTTPClient_Async_SendGeneric(request); - * - * + * + * * int mydatacallback(httprequest_t *request){ * addLog("httpclient callback state %d", request->state); - * + * * //to terminate, return 1 * return 0 * } diff --git a/src/httpclient/utils_net.c b/src/httpclient/utils_net.c index bbd63d501..1d3c3b863 100644 --- a/src/httpclient/utils_net.c +++ b/src/httpclient/utils_net.c @@ -202,7 +202,7 @@ int32_t HAL_TCP_Read(uintptr_t fd, char *buf, uint32_t len, uint32_t timeout_ms) timeout.tv_sec = t_left / 1000; timeout.tv_usec = (t_left % 1000) * 1000; - + ret = select(fd + 1, &sets, NULL, NULL, NULL); if ( FD_ISSET( fd, &sets ) ) { @@ -217,7 +217,7 @@ int32_t HAL_TCP_Read(uintptr_t fd, char *buf, uint32_t len, uint32_t timeout_ms) // { // http_data_process(buf,ret); // } - + len_recv += ret; } else if (0 == ret) { ADDLOG_ERROR(LOG_FEATURE_HTTP_CLIENT,"connection is closed"); diff --git a/src/httpclient/utils_net.h b/src/httpclient/utils_net.h index 1fcc3f289..99b6231d6 100644 --- a/src/httpclient/utils_net.h +++ b/src/httpclient/utils_net.h @@ -46,5 +46,5 @@ int iotx_net_disconnect(utils_network_pt pNetwork); int iotx_net_connect(utils_network_pt pNetwork); int iotx_net_init(utils_network_pt pNetwork, const char *host, uint16_t port, const char *ca_crt); extern void http_data_process(char *buf, uint32_t len); - + #endif /* IOTX_COMMON_NET_H */ diff --git a/src/httpserver/http_fns.c b/src/httpserver/http_fns.c index b9ef52833..bda4be016 100644 --- a/src/httpserver/http_fns.c +++ b/src/httpserver/http_fns.c @@ -73,7 +73,7 @@ template_t g_templates [] = { int g_total_templates = sizeof(g_templates)/sizeof(g_templates[0]); unsigned char hexdigit( char hex ) { - return (hex <= '9') ? hex - '0' : + return (hex <= '9') ? hex - '0' : toupper((unsigned char)hex) - 'A' + 10 ; } @@ -333,7 +333,7 @@ int http_fn_cfg_mqtt(http_request_t *request) { poststr(request,"
\
\
\
\ @@ -343,7 +343,7 @@ int http_fn_cfg_mqtt(http_request_t *request) { poststr(request,"\">

\
\
\
\ @@ -388,7 +388,7 @@ int http_fn_cfg_mqtt_set(http_request_t *request) { CFG_Save_SetupTimer(); poststr(request,"Please wait for module to connect... if there is problem, restart it from Index html page..."); - + poststr(request,"
"); poststr(request,"Return to MQTT settings"); poststr(request,"
"); @@ -410,7 +410,7 @@ int http_fn_cfg_webapp(http_request_t *request) { poststr(request,"

Use this to set the URL of the Webapp

"); poststr(request,"\
\ -
\ \ @@ -437,7 +437,7 @@ int http_fn_cfg_webapp_set(http_request_t *request) { } else { poststr(request,"Webapp url not set because you didn't specify the argument."); } - + poststr(request,"
"); poststr(request,htmlReturnToCfg); HTTP_AddBuildFooter(request); @@ -502,7 +502,7 @@ int http_fn_cfg_ping(http_request_t *request) {
\
\

\ \
"); @@ -562,7 +562,7 @@ int http_fn_cfg_wifi(http_request_t *request) { AP_IF_S *ar; uint32_t num; - + bk_printf("Scan begin...\r\n"); tuya_hal_wifi_all_ap_scan(&ar,&num); bk_printf("Scan returned %i networks\r\n",num); @@ -603,13 +603,13 @@ int http_fn_cfg_wifi(http_request_t *request) {
\
\

\ \ "); @@ -629,7 +629,7 @@ int http_fn_cfg_name(http_request_t *request) { http_setup(request, httpMimeTypeHTML); poststr(request,htmlHeader); poststr(request,g_header); - + poststr(request,"

Change device names for display.

Remember that short name is used by MQTT.
"); if(http_getArg(request->url,"shortName",tmpA,sizeof(tmpA))) { CFG_SetShortDeviceName(tmpA); @@ -643,13 +643,13 @@ int http_fn_cfg_name(http_request_t *request) {
\
\

\ \ "); @@ -684,14 +684,14 @@ int http_fn_cfg_wifi_set(http_request_t *request) { poststr(request,"Please wait for module to reset..."); RESET_ScheduleModuleReset(3); - + poststr(request,"
"); poststr(request,"Return to WiFi settings"); poststr(request,"
"); poststr(request,htmlReturnToCfg); HTTP_AddBuildFooter(request); poststr(request,htmlEnd); - + poststr(request, NULL); return 0; } @@ -712,7 +712,7 @@ int http_fn_cfg_loglevel_set(http_request_t *request) { loglevel = atoi(tmpA); #endif poststr(request,"LOG level changed."); - } + } poststr(request,"
\
\

\ \
"); - + poststr(request,"
"); poststr(request,"Return to config settings"); poststr(request,"
"); @@ -848,7 +848,7 @@ int http_fn_flash_read_tool(http_request_t *request) { poststr(request,"
"); } poststr(request,"
"); - + poststr(request,""); - + poststr(request,"
\
",cmd); @@ -988,7 +988,7 @@ int http_fn_uart_tool(http_request_t *request) { } poststr(request,""); - + poststr(request,"
\
",tmpA); @@ -1029,20 +1029,20 @@ int http_fn_cfg_quick(http_request_t *request) { poststr(request,htmlHeader); poststr(request,g_header); poststr(request,"

Quick Config

"); - + if(http_getArg(request->url,"dev",tmpA,sizeof(tmpA))) { j = atoi(tmpA); hprintf128(request,"

Set dev %i!

",j); g_templates[j].setter(); } - poststr(request,""); + poststr(request,""); poststr(request, ""); poststr(request,"
"); - + poststr(request,htmlReturnToCfg); HTTP_AddBuildFooter(request); poststr(request,htmlEnd); @@ -1068,7 +1068,7 @@ int http_fn_cfg_ha(http_request_t *request) { poststr(request,"

Paste this to configuration yaml

"); poststr(request,"
Make sure that you have \"switch:\" keyword only once! Home Assistant doesn't like dup keywords.
"); poststr(request,"
You can also use \"switch MyDeviceName:\" to avoid keyword duplication!
"); - + poststr(request,"