pamaury

// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.

import 'dart:convert';
import 'dart:math';
import 'dart:ui';
import 'package:flutter/services.dart';
import 'package:image/image.dart' as A;
import 'package:flutter/cupertino.dart';
import 'package:flutter/material.dart';

pamaury

Comment gérer un conflit git, du type "a merge would override your changes":

1) enregistrer les modifications locales: git stash
2) faire le merge: git pull
3) réappliquer ls modifications locales: git stash pop
4) maintenant ils y a peut-être des conflicts, git dit:
auto-merge blabla
CONFLICT blabla
5) pour chacun des fichiers avec un conflit, l'ouvrir et chercher les conflits,
c'est toujours du type:

pamaury

02:32:37  ERROR: Compiling the checker for '/tmp/maze'
        In file included from check.cpp:1:
        /usr/local/france-ioi/test//_common//checkers/common.h:485:24: error: ‘constexpr’ needed for in-class initialization of static data member ‘const double DistAllRoundChecker::multipleThreshold’ of non-integral type [-fpermissive]
            const static double multipleThreshold = 1e-5;
                                ^~~~~~~~~~~~~~~~~
        In file included from /usr/local/france-ioi/test//_common//checkers/common.h:653,
                         from check.cpp:1:
        /usr/local/france-ioi/test//_common//checkers/checker_commands.h: In member function ‘virtual void CheckerCommands::successButRemains(std::__cxx11::string, int, std::__cxx11::string)’:
        /usr/local/france-ioi/test//_common//checkers/checker_commands.h:101:48: warning: unused parameter ‘msg’ [-Wunused-parameter]
         void CheckerCommands::successButRemains(string msg, int score, string cmd) {

pamaury

diff --git a/firmware/export/config/sansafuzeplus.h b/firmware/export/config/sansafuzeplus.h
index 2a57619b06..e637a148a3 100644
--- a/firmware/export/config/sansafuzeplus.h
+++ b/firmware/export/config/sansafuzeplus.h
@@ -99,8 +99,8 @@
 #define CONFIG_CODEC SWCODEC
 
 /* LCD dimensions */
-#define LCD_WIDTH  240
-#define LCD_HEIGHT 320

pamaury

/***************************************************************************
 *             __________               __   ___.                  
 *   Open      \______   \ ____   ____ |  | _\_ |__   _______  ___  
 *   Source     |       _//  _ \_/ ___\|  |/ /| __ \ /  _ \  \/  /  
 *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <   
 *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \  
 *                     \/            \/     \/    \/            \/ 
 *
 * Copyright (C) 2010 Thomas Martitz
 * Copyright (C) 2018 Amaury Pouly

pamaury

/***************************************************************************
 *             __________               __   ___.
 *   Open      \______   \ ____   ____ |  | _\_ |__   _______  ___
 *   Source     |       _//  _ \_/ ___\|  |/ /| __ \ /  _ \  \/  /
 *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
 *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
 *                     \/            \/     \/    \/            \/
 *
 * Copyright (C) 2015 by Marcin Bukat
 * Copyright (C) 2017 by Amaury Pouly

pamaury

#!/bin/bash
# check if rbclient screen is already running
if screen -S rbclient -X select .
then
    #echo "rbclient already running"
    exit 0
fi
echo "Starting rbclient..."
screen -dS rbclient -m bash -i -c "cd project/rockbox/myrockbox/; ./runclient.sh" &

pamaury

PS[0/0]=RE (tmo 0 0)
PS[0/1]=RE (tmo 1014 0)
PS[0/1]=RE (tmo 1014 0)
PS[1/1]=VI (tmo 1014 0)
PS[1/2]=VI (tmo 1022 0)
PS[1/0]=VI (tmo 1022 0)
PS[2/0]=EN (tmo 1022 0)
PS[2/0]=EN (tmo 1022 0)
PS[2/0]=EN (tmo 1022 0)
PS[3/0]=T  (tmo 1022 0)

pamaury

test_mem figures: read/write/memset/memcpy in MB/s

NOTE: I modified the code so that the DRAM buffer has size 2^16*4 = 256 KiB

AUTO-SLOW ON, unboosted: 44 / 158 / 139 / 33
AUTO-SLOW ON, boosted: 115 / 336 / 328 / 66
AUTO-SLOW OFF, unboosted: 58 / 160 / 139 / 35
AUTO-SLOW OFF, boosted: 140 / 336 / 336 / 74
AUTO-SLOW OFF, HBUS@200Mhz, boosted: 147 / 355 / 345 / 75

pamaury

extern int rand(void);

typedef long int32_t;
typedef unsigned long uint32_t;
typedef int32_t mad_fixed64hi_t;
typedef uint32_t mad_fixed64lo_t;
typedef int32_t mad_fixed_t;

int main()
{