Browse Source

update,flash

external_Interrupt
tianjialong 2 years ago
parent
commit
08269e5eb5
  1. 12
      MDK-ARM/LWIP.uvguix.29643
  2. 4
      usersrc/atcmd.c
  3. 37
      usersrc/config.c
  4. 2
      usersrc/config.h

12
MDK-ARM/LWIP.uvguix.29643
File diff suppressed because it is too large
View File

4
usersrc/atcmd.c

@ -25,7 +25,7 @@ extern ETH_HandleTypeDef heth;
ip_address[len] = 0; /* 这个必须要加,否则转换会出错 */ \
inet_aton(ip_address, &int_addr); \
_config_get = int_addr.addr; \
config_dump_config(); \
config_flash_write(); \
printf("AT+OK\r\n"); \
} \
return AT_SUCCESS; \
@ -119,7 +119,7 @@ AT_STATUS at_cmd_obtaining_ip_mode(unsigned char *p, unsigned char len)
return AT_ERR;
}
config_get()->obtaining_ip_mode = *p - 48; /* ascii码字符0十进制为48 */
config_dump_config();
config_flash_write();
printf("AT+OK\r\n");
}
return AT_SUCCESS;

37
usersrc/config.c

@ -22,30 +22,35 @@
config_flash_write_start_address += 4;
#define CONFIG_SIZE ((sizeof(config_t) / 4) + ((sizeof(config_t) % 4) > 0 ? 1 : 0))
#define COINFIG_WRITED_FLAG 0X88888888
static config_t s_config;
static bool s_is_first_init = false;
void config_init(void)
{
IP4_ADDR((ip4_addr_t *)&s_config.ip, 192, 168, 8, 10);
IP4_ADDR((ip4_addr_t *)&s_config.gw, 192, 168, 8, 1);
IP4_ADDR((ip4_addr_t *)&s_config.netmask, 255, 255, 255, 0);
s_config.localport = SERVICE_PORT;
s_config.obtaining_ip_mode = OBTAINING_IP_MODE_DHCP; // dhcp
s_config.mask = 1; //
if (config_flash_write() < 0)
{
printf("flash write config error\r\n");
}
else
config_flash_read();
if (s_config.config_writed_flag != COINFIG_WRITED_FLAG)
{
printf("flash write config success\r\n");
IP4_ADDR((ip4_addr_t *)&s_config.ip, 192, 168, 8, 10);
IP4_ADDR((ip4_addr_t *)&s_config.gw, 192, 168, 8, 1);
IP4_ADDR((ip4_addr_t *)&s_config.netmask, 255, 255, 255, 0);
s_config.localport = SERVICE_PORT;
s_config.obtaining_ip_mode = OBTAINING_IP_MODE_DHCP; // dhcp
s_config.mask = 1; //
s_config.config_writed_flag = COINFIG_WRITED_FLAG;
if (config_flash_write() < 0)
{
printf("flash write config error\r\n");
}
else
{
printf("flash write config success\r\n");
}
}
config_flash_read();
/*dumpconfig*/
config_dump_config();
}
@ -72,6 +77,7 @@ void config_flash_read(void)
FLASH_READ(s_config.gw);
FLASH_READ(s_config.netmask);
FLASH_READ(s_config.localport);
FLASH_READ(s_config.config_writed_flag);
}
config_t *config_get(void) { return &s_config; }
@ -93,6 +99,7 @@ int8_t config_flash_write(void)
FLASH_WRITE(s_config.gw);
FLASH_WRITE(s_config.netmask);
FLASH_WRITE(s_config.localport);
FLASH_WRITE(s_config.config_writed_flag);
return 0;
}

2
usersrc/config.h

@ -16,6 +16,8 @@ typedef struct
uint32_t netmask;
uint32_t localport;
uint32_t config_writed_flag;
// uint32_t
} config_t;

Loading…
Cancel
Save