Browse Source

Merge branch 'FB4S_WIFI' of https://github.com/X-Dron/Marlin_FB4S into FB4S_WIFI

pull/15/head
X-Dron 4 years ago
parent
commit
02d2aeea57
  1. 6
      Marlin/src/HAL/STM32F1/eeprom_spi_w25q.cpp
  2. 5
      buildroot/share/PlatformIO/scripts/mks_robin_nano35.py

6
Marlin/src/HAL/STM32F1/eeprom_spi_w25q.cpp

@ -59,11 +59,7 @@ void eeprom_update_block(const void *__src, void *__dst, size_t __n){
}; };
void eeprom_test(void){ void eeprom_test(void){
uint16_t chip_id=0; DEBUG("SPI Flash ID %0X",W25QXX.W25QXX_ReadID());
chip_id=W25QXX.W25QXX_ReadID();
DEBUG("SPI Flash ID %0X",chip_id);
DEBUG("Read FLASH:"); DEBUG("Read FLASH:");
for(uint32_t i=0; i < 50 ; ){ for(uint32_t i=0; i < 50 ; ){
memset(spi_eeprom,0,10); memset(spi_eeprom,0,10);

5
buildroot/share/PlatformIO/scripts/mks_robin_nano35.py

@ -38,3 +38,8 @@ def encrypt(source, target, env):
firmware.close() firmware.close()
robin.close() robin.close()
env.AddPostAction("$BUILD_DIR/${PROGNAME}.bin", encrypt); env.AddPostAction("$BUILD_DIR/${PROGNAME}.bin", encrypt);
env.Replace(
UPLOADER="curl",
UPLOADCMD="$UPLOADER -v -H 'Content-Type:application/octet-stream' http://$UPLOADERFLAGS/upload?X-Filename=Robin_Nano35.bin --data-binary @$BUILD_DIR/Robin_nano35.bin"
)

Loading…
Cancel
Save