GONEC_NEW
/
GONEC_ARTERY_HttpServer
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Изменения на новые настройки пинов и устройств

This commit is contained in:
cfif 2025-05-28 15:16:06 +03:00
parent f8345d586f
commit f90235a11c
6 changed files with 10 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Inc/http_server.h
View File

@ -23,7 +23,6 @@ typedef struct {
#include "ModemLog.h"
void httpd_init(tExternal *external, tRtcIO *rtc, tTaskAdc *taskAdc, tDeviceStorageIni *storage, tFs *fs,
tSpiPorts *spiPorts,
tFirmwareLoader *firmwareMainLoader,
tFirmwareLoader *firmwareBootLoader,
tModemMain *modemMain, osMutexId_t accessHTTP, osMutexId_t accessMODEM, osMutexId_t accessLOG,

1
Inc/httpd_get.h
View File

@ -7,7 +7,6 @@
#include "httpd_types.h"
#include "DeviceStorageIni.h"
#include "SpiPorts.h"
#include "fs_interface.h"
#include "httpd_post.h"
#include "auth.h"

3
Inc/httpd_post.h
View File

@ -9,7 +9,6 @@
#include "RtcArtery.h"
#include "DeviceStorageIni.h"
#include "httpd_types.h"
#include "SpiPorts.h"
#include "fs_interface.h"
#include <FirmwareLoader.h>
#include "ModemGonec.h"
@ -46,7 +45,6 @@ typedef struct {
tRtcIO *rtc;
tDeviceStorageIni *storage;
tSpiPorts *spiPorts;
tFs *fs;
tFirmwareLoader *firmwareMainLoader;
tFirmwareLoader *firmwareBootLoader;
@ -107,7 +105,6 @@ typedef struct {
char *bufAnswer;
tRtcIO *rtc;
tDeviceStorageIni *storage;
tSpiPorts *spiPorts;
tFs *fs;
tFirmwareLoader *firmwareMainLoader;
tFirmwareLoader *firmwareBootLoader;

3
Src/httpd.c
View File

@ -3423,7 +3423,6 @@ httpd_init_pcb(struct altcp_pcb *pcb, u16_t port) {
* Initialize the httpd: set up a listening PCB and bind it to the defined port
*/
void httpd_init(tExternal *external, tRtcIO *rtc, tTaskAdc *taskAdc, tDeviceStorageIni *storage, tFs *fs,
tSpiPorts *spiPorts,
tFirmwareLoader *firmwareMainLoader,
tFirmwareLoader *firmwareBootLoader,
tModemMain *modemMain, osMutexId_t accessHTTP, osMutexId_t accessMODEM, osMutexId_t accessLOG,
@ -3434,7 +3433,6 @@ void httpd_init(tExternal *external, tRtcIO *rtc, tTaskAdc *taskAdc, tDeviceStor
httpSettings.external = external;
httpSettings.rtc = rtc;
httpSettings.storage = storage;
httpSettings.spiPorts = spiPorts;
httpSettings.fs = fs;
httpSettings.firmwareMainLoader = firmwareMainLoader;
httpSettings.firmwareBootLoader = firmwareBootLoader;
@ -3886,7 +3884,6 @@ err_t httpd_post_begin(void *connection, const char *uri, const char *http_reque
hs->settings_post.bufAnswer = bufAnswerPostGlobal;
hs->settings_post.rtc = httpSettings.rtc;
hs->settings_post.storage = httpSettings.storage;
hs->settings_post.spiPorts = httpSettings.spiPorts;
hs->settings_post.fs = httpSettings.fs;
hs->settings_post.modemMain = httpSettings.modemMain;
hs->settings_post.firmwareMainLoader = httpSettings.firmwareMainLoader;

4
Src/httpd_get.c
View File

@ -363,9 +363,9 @@ int httpd_get_begin(tHttpSetting *httpSetting, typeAuth auth, const char *uri, c
if (strcmp(uri, "/reboot_modem") == 0) {
GpioPinSet(&httpSetting->gpios->Power.gonec_reset, false);
// GpioPinSet(&httpSetting->gpios->Power.gonec_reset, false);
SystemDelayMs(1000);
GpioPinSet(&httpSetting->gpios->Power.gonec_reset, true);
// GpioPinSet(&httpSetting->gpios->Power.gonec_reset, true);
return Post_OK;
}

17
Src/httpd_post_handlers.c
View File

@ -6,7 +6,6 @@
#include "httpd_base_func.h"
#include "stdlib.h"
#include "JSONSettings.h"
#include "Flash_MT29F2G01ABAGDWB.h"
//#include "stream.h"
#include "httpd_TablesPostGet.h"
#include "stdlib.h"
@ -716,10 +715,10 @@ idPostResult_t handlerPost_Update_Init_Modem_WriteFlash(tHttpPostSetting *env) {
env->modemMain->isModemCheck = false;
GpioPinSet(&env->gpios->Power.gonec_boot, true);
GpioPinSet(&env->gpios->Power.gonec_reset, false);
SystemDelayMs(1000);
GpioPinSet(&env->gpios->Power.gonec_reset, true);
// GpioPinSet(&env->gpios->Power.gonec_boot, true);
// GpioPinSet(&env->gpios->Power.gonec_reset, false);
// SystemDelayMs(1000);
// GpioPinSet(&env->gpios->Power.gonec_reset, true);
SystemDelayMs(6000);
@ -757,10 +756,10 @@ idPostResult_t handlerPost_Update_Start_Modem(tHttpPostSetting *env) {
strcpy(versionModem, "null,null");
strcpy(versionCrypto, "null,null");
GpioPinSet(&env->gpios->Power.gonec_boot, false);
GpioPinSet(&env->gpios->Power.gonec_reset, false);
SystemDelayMs(1000);
GpioPinSet(&env->gpios->Power.gonec_reset, true);
// GpioPinSet(&env->gpios->Power.gonec_boot, false);
// GpioPinSet(&env->gpios->Power.gonec_reset, false);
// SystemDelayMs(1000);
// GpioPinSet(&env->gpios->Power.gonec_reset, true);
SystemDelayMs(6000);